--- a/builder/com.nokia.carbide.cdt.builder.test/META-INF/MANIFEST.MF	Fri Feb 12 11:55:42 2010 -0600
+++ b/builder/com.nokia.carbide.cdt.builder.test/META-INF/MANIFEST.MF	Fri Feb 12 14:41:28 2010 -0600
@@ -6,15 +6,12 @@
 Bundle-Activator: com.nokia.carbide.cdt.builder.test.TestPlugin
 Bundle-Vendor: NOKIA
 Bundle-Localization: plugin
-Require-Bundle: abbot,
- abbot.swt,
- abbot.swt.eclipse,
+Require-Bundle: 
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.junit,
  com.nokia.carbide.cpp.sdk.core,
  com.nokia.carbide.cpp.project.core,
- com.nokia.carbide.automation.utils,
  com.nokia.carbide.cdt.builder,
  com.nokia.carbide.cpp.epoc.engine,
  com.nokia.cpp.utils.core,

--- a/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/ErrorParserRegressionGenerator.java	Fri Feb 12 11:55:42 2010 -0600
+++ b/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/ErrorParserRegressionGenerator.java	Fri Feb 12 14:41:28 2010 -0600
@@ -21,10 +21,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import junit.framework.TestCase;
+
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.NullProgressMonitor;
 
-import com.nokia.carbide.automation.utils.UITestCase;
 import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin;
 import com.nokia.carbide.cdt.builder.builder.CarbideCPPBuilder;
 import com.nokia.carbide.cdt.builder.project.ICarbideBuildConfiguration;
@@ -36,13 +37,13 @@
 import com.nokia.carbide.cpp.sdk.core.SDKCorePlugin;
 import com.nokia.cpp.internal.api.utils.core.FileUtils;
 
-public class ErrorParserRegressionGenerator extends UITestCase {
+public class ErrorParserRegressionGenerator extends TestCase {
 	public ErrorParserRegressionGenerator(String name) {
 		super(name);
-		// TODO Auto-generated constructor stub
 	}
 
-	//private static final String PROJECT_NAME = "TestErrorParser";
+	private static final String PROJECT_NAME = "TestErrorParser";
+
 	// Platform matters, set this before you build
 	private static final String PLATFORM_STRING = ISymbianBuildContext.GCCE_PLATFORM;
 

--- a/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/TestGcceErrorParser.java	Fri Feb 12 11:55:42 2010 -0600
+++ b/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/TestGcceErrorParser.java	Fri Feb 12 14:41:28 2010 -0600
@@ -25,7 +25,6 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.NullProgressMonitor;
 
-import com.nokia.carbide.automation.utils.debugger.DebuggerTestCaseParameters;
 import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin;
 import com.nokia.carbide.cdt.builder.builder.CarbideCPPBuilder;
 import com.nokia.carbide.cdt.builder.project.ICarbideBuildConfiguration;
@@ -37,11 +36,10 @@
 import com.nokia.carbide.cpp.sdk.core.SDKCorePlugin;
 import com.nokia.cpp.internal.api.utils.core.FileUtils;
 
-public class TestGcceErrorParser extends TestCase implements DebuggerTestCaseParameters {
+public class TestGcceErrorParser extends TestCase {
 
 	public TestGcceErrorParser(String name) {
 		super(name);
-		// TODO Auto-generated constructor stub
 	}
 
 	private static final String PROJECT_NAME = "TestGcceErrorParser";