diff --git a/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/RegressionTestSuite.java b/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/RegressionTestSuite.java
index 05e7853a033..c112b9adffc 100644
--- a/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/RegressionTestSuite.java
+++ b/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/RegressionTestSuite.java
@@ -41,9 +41,8 @@ public class RegressionTestSuite extends TestSuite {
 		final RegressionTestSuite suite = new RegressionTestSuite();
 
 		suite.addTest( SearchRegressionTests.suite( false ) );
-		suite.addTest( ContentAssistRegressionTests.suite( false ) );
 		
-		suite.addTest( new ContentAssistRegressionTests("cleanupProject") ); //$NON-NLS-1$
+		suite.addTest( new SearchRegressionTests("cleanupProject") ); //$NON-NLS-1$
 		return suite;
 	}
 }
diff --git a/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/ContentAssistRegressionTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistRegressionTests.java
similarity index 97%
rename from core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/ContentAssistRegressionTests.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistRegressionTests.java
index 6a3d685519b..28bc832dd83 100644
--- a/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/ContentAssistRegressionTests.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistRegressionTests.java
@@ -12,7 +12,7 @@
 /*
  * Created on Oct 4, 2004
  */
-package org.eclipse.cdt.core.tests;
+package org.eclipse.cdt.ui.tests.text.contentassist;
 
 import java.io.StringWriter;
 
@@ -20,6 +20,7 @@ import org.eclipse.cdt.core.model.CModelException;
 import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.model.ITranslationUnit;
 import org.eclipse.cdt.core.model.IWorkingCopy;
+import org.eclipse.cdt.core.tests.BaseTestFramework;
 import org.eclipse.cdt.internal.ui.text.contentassist.CCompletionProcessor;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.jface.text.Document;