diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java
index 9e03b8b4f9..b9474b5f00 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java
@@ -184,7 +184,7 @@ public abstract class AbstractDebugTest extends TestCase implements  IEvaluation
 	public static final String BOUND_JRE_PROJECT_NAME = "BoundJRE";
 	public static final String CLONE_SUFFIX = "Clone";
 
-	final String[] LAUNCH_CONFIG_NAMES_1_4 = { "java.io.File", "LargeSourceFile", "LotsOfFields",
+	final String[] LAUNCH_CONFIG_NAMES_1_4 = { "LargeSourceFile", "LotsOfFields",
 			"Breakpoints",
 			"InstanceVariablesTests",
 			"LocalVariablesTests", "LocalVariableTests2", "StaticVariablesTests",
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/ConditionalBreakpointsWithFileClass.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/ConditionalBreakpointsWithFileClass.java
index 8f5e4a0d15..0079b5f88e 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/ConditionalBreakpointsWithFileClass.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/ConditionalBreakpointsWithFileClass.java
@@ -12,20 +12,19 @@ public ConditionalBreakpointsWithFileClass(String name) {
 
 	public void testFileConditionalBreakpointForTrue() throws Exception {
 		String typeName = "FileConditionSnippet2";
-		createConditionalLineBreakpoint(374, "java.io.File", "true", true);
+		IJavaLineBreakpoint bp = createConditionalLineBreakpoint(374, "java.io.File", "true", true);
 		IJavaThread mainThread = null;
 		try {
-			synchronized (this) {
-				Thread.sleep(10);
-				mainThread = launchToBreakpoint(typeName);
-				int hitLine = 0;
-				assertTrue("Thread should be suspended", mainThread.isSuspended());
-				hitLine = mainThread.getStackFrames()[0].getLineNumber();
-				assertEquals("Should've hit", 374, hitLine);
-				mainThread.resume();
-				mainThread.terminate();
-				// bp.delete();
-			}
+			Thread.sleep(10);
+			mainThread = launchToBreakpoint(typeName);
+			int hitLine = 0;
+			assertTrue("Thread should be suspended", mainThread.isSuspended());
+			hitLine = mainThread.getStackFrames()[0].getLineNumber();
+			assertEquals("Should've hit", 374, hitLine);
+			mainThread.resume();
+			mainThread.terminate();
+			bp.delete();
+
 		} finally {
 			terminateAndRemove(mainThread);
 			removeAllBreakpoints();