diff --git a/core/org.eclipse.cdt.core.tests/pom.xml b/core/org.eclipse.cdt.core.tests/pom.xml
index 0c3699a0a19..348e188df82 100644
--- a/core/org.eclipse.cdt.core.tests/pom.xml
+++ b/core/org.eclipse.cdt.core.tests/pom.xml
@@ -15,6 +15,14 @@
 	<artifactId>org.eclipse.cdt.core.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
 
+	<repositories>
+		<repository>
+			<id>cdt.repo</id>
+			<url>file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository</url>
+			<layout>p2</layout>
+		</repository>
+	</repositories>
+
 	<build>
 		<plugins>
 			<plugin>
@@ -28,31 +36,15 @@
 						<include>**/AutomatedIntegrationSuite.*</include>
 					</includes>
 					<testFailureIgnore>true</testFailureIgnore>
+					<dependencies>
+						<dependency>
+							<artifactId>org.eclipse.cdt.feature.group</artifactId>
+							<version>8.0.0.${buildQualifier}</version>
+							<type>p2-installable-unit</type>
+						</dependency>
+					</dependencies>
 				</configuration>
 			</plugin>
 		</plugins>
-		<!-- pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>tycho-surefire-plugin</artifactId>
-					<version>${tycho-version}</version>
-					<configuration>
-						<dependencies>
-							<dependency>
-								<artifactId>org.eclipse.cdt.core.linux.x86</artifactId>
-								<version>5.2.0</version>
-								<type>eclipse-plugin</type>
-							</dependency>
-							<dependency>
-								<artifactId>org.eclipse.cdt.core.linux.x86_64</artifactId>
-								<version>5.2.0</version>
-								<type>eclipse-plugin</type>
-							</dependency>
-						</dependencies>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement -->
 	</build>
 </project>
diff --git a/pom.xml b/pom.xml
index d95c11aa363..ce12fd108ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,6 +149,8 @@
 		<module>dsf/org.eclipse.cdt.examples.dsf.pda.ui</module>
 		<module>dsf/org.eclipse.cdt.examples.dsf-feature</module>
 
+		<module>releng/org.eclipse.cdt.repo</module>
+
 		<module>core/org.eclipse.cdt.core.tests</module>
 		<module>core/org.eclipse.cdt.ui.tests</module>
 		<module>build/org.eclipse.cdt.managedbuilder.core.tests</module>
@@ -161,7 +163,6 @@
 		<module>debug/org.eclipse.cdt.debug.ui.tests</module>
 -->
 		
-		<module>releng/org.eclipse.cdt.repo</module>
 	</modules>
 
 	<repositories>