diff --git a/core/org.eclipse.cdt.core.tests/.classpath b/core/org.eclipse.cdt.core.tests/.classpath
index f02faaec060..fddbf010494 100644
--- a/core/org.eclipse.cdt.core.tests/.classpath
+++ b/core/org.eclipse.cdt.core.tests/.classpath
@@ -6,21 +6,17 @@
     <classpathentry kind="src" path="parser/"/>
     <classpathentry kind="src" path="resources/"/>
     <classpathentry kind="src" path="suite/"/>
-    <classpathentry kind="src" path="indexer"/>
+    <classpathentry kind="src" path="indexer/"/>
+    <classpathentry kind="src" path="search/"/>
     <classpathentry kind="src" path="/org.apache.xerces"/>
     <classpathentry kind="src" path="/org.eclipse.core.resources"/>
     <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
     <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.linux"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.qnx"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.solaris"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.win32"/>
     <classpathentry kind="src" path="/org.eclipse.cdt.ui"/>
     <classpathentry kind="src" path="/org.eclipse.swt"/>
     <classpathentry kind="src" path="/org.eclipse.ui"/>
     <classpathentry kind="src" path="/org.junit"/>
     <classpathentry kind="src" path="/org.eclipse.core.boot"/>
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="src" path="search"/>
     <classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/org.eclipse.cdt.core.tests/.project b/core/org.eclipse.cdt.core.tests/.project
index f64f640c06e..a0121139f31 100644
--- a/core/org.eclipse.cdt.core.tests/.project
+++ b/core/org.eclipse.cdt.core.tests/.project
@@ -5,10 +5,6 @@
 	<projects>
 		<project>org.apache.xerces</project>
 		<project>org.eclipse.cdt.core</project>
-		<project>org.eclipse.cdt.core.linux</project>
-		<project>org.eclipse.cdt.core.qnx</project>
-		<project>org.eclipse.cdt.core.solaris</project>
-		<project>org.eclipse.cdt.core.win32</project>
 		<project>org.eclipse.cdt.ui</project>
 		<project>org.eclipse.core.boot</project>
 		<project>org.eclipse.core.resources</project>