diff --git a/core/org.eclipse.cdt.core.tests/.classpath b/core/org.eclipse.cdt.core.tests/.classpath
index ce3964a9e41..cdd6d4f884e 100644
--- a/core/org.eclipse.cdt.core.tests/.classpath
+++ b/core/org.eclipse.cdt.core.tests/.classpath
@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="model"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="src" path="/org.junit"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
+    <classpathentry kind="src" path="build/"/>
+    <classpathentry kind="src" path="failures/"/>
+    <classpathentry kind="src" path="model/"/>
+    <classpathentry kind="src" path="parser/"/>
+    <classpathentry kind="src" path="resources/"/>
+    <classpathentry kind="src" path="suite/"/>
+    <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="suite"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="src" path="build"/>
-    <classpathentry kind="src" path="parser"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="failures"/>
+    <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="output" path="bin"/>
 </classpath>
diff --git a/core/org.eclipse.cdt.core.tests/.project b/core/org.eclipse.cdt.core.tests/.project
index 7a9fcbfb69c..f64f640c06e 100644
--- a/core/org.eclipse.cdt.core.tests/.project
+++ b/core/org.eclipse.cdt.core.tests/.project
@@ -9,6 +9,7 @@
 		<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>
 		<project>org.eclipse.core.runtime</project>
diff --git a/core/org.eclipse.cdt.core.tests/build.properties b/core/org.eclipse.cdt.core.tests/build.properties
index b12f9371bcd..7b429e80c5c 100644
--- a/core/org.eclipse.cdt.core.tests/build.properties
+++ b/core/org.eclipse.cdt.core.tests/build.properties
@@ -1,11 +1,3 @@
-source.cdtuitests.jar = src/,\
-                        ui/,\
-                        core/,\
-                        model/,\
-                        build/,\
-                        parser/,\
-                        failures/,\
-                        suite/
 bin.includes = plugin.xml,\
                about.html,\
                plugin.properties,\
@@ -17,3 +9,9 @@ src.includes = plugin.xml,\
                test.xml,\
                resources/
 about.html = 
+source.cdtcoretests.jar = build/,\
+                          failures/,\
+                          model/,\
+                          parser/,\
+                          resources/,\
+                          suite/
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ParserSymbolTableTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ParserSymbolTableTest.java
index edad17dd945..b97fa8d91ba 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ParserSymbolTableTest.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ParserSymbolTableTest.java
@@ -26,7 +26,6 @@ import org.eclipse.cdt.internal.core.parser.pst.IParameterizedSymbol;
 import org.eclipse.cdt.internal.core.parser.pst.ISymbol;
 import org.eclipse.cdt.internal.core.parser.pst.ParserSymbolTable;
 import org.eclipse.cdt.internal.core.parser.pst.ParserSymbolTableException;
-import org.eclipse.cdt.internal.core.parser.pst.ParserSymbolTable.Declaration;
 import org.eclipse.cdt.internal.core.parser.pst.ParserSymbolTable.Mark;
 import org.eclipse.cdt.internal.core.parser.pst.ParserSymbolTable.TemplateInstance;
 import org.eclipse.cdt.internal.core.parser.pst.ParserSymbolTable.TypeInfo;
diff --git a/core/org.eclipse.cdt.core.tests/plugin.xml b/core/org.eclipse.cdt.core.tests/plugin.xml
index cc0eeb0b3f1..f8e3062c079 100644
--- a/core/org.eclipse.cdt.core.tests/plugin.xml
+++ b/core/org.eclipse.cdt.core.tests/plugin.xml
@@ -2,7 +2,7 @@
 <plugin
    id="org.eclipse.cdt.core.tests"
    name="org.eclipse.cdt.core.tests"
-   version="1.2.0.5"
+   version="1.1.0"
    class="org.eclipse.cdt.testplugin.CTestPlugin">
 
    <runtime>
diff --git a/core/org.eclipse.cdt.core.tests/test.xml b/core/org.eclipse.cdt.core.tests/test.xml
index ebc2be247da..baaed837370 100644
--- a/core/org.eclipse.cdt.core.tests/test.xml
+++ b/core/org.eclipse.cdt.core.tests/test.xml
@@ -30,11 +30,11 @@
     <property name="cdt-folder" 
               value="${eclipse-home}/cdt_folder"/>
     <delete dir="${cdt-folder}" quiet="true"/>
-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
+    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${cdt-folder}"/>
       <property name="plugin-name" value="${plugin-name}"/>
       <property name="classname" 
-                value="org.eclipse.cdt.core.model.tests.AllCoreTests"/>
+                value="org.eclipse.cdt.core.suite.AutomatedIntegrationSuite"/>
     </ant>
   </target>