diff --git a/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/BreakpointTests.java b/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/BreakpointTests.java
index da82fa72845..841e426948c 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/BreakpointTests.java
+++ b/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/BreakpointTests.java
@@ -535,9 +535,9 @@ public class BreakpointTests extends AbstractDebugTest {
 		 * Create a break point on a generic function with an valid condition
 		 **********************************************************************/
 		cond = cdiTarget.createCondition(0, "x<10");
-		location = cdiTarget.createFunctionLocation(null, "func1");
+		ICDILineLocation location2 = cdiTarget.createLineLocation("main.c", 9);
 		assertNotNull(location);
-		cdiTarget.setFunctionBreakpoint(0, location, cond, false);
+		cdiTarget.setLineBreakpoint(0, location2, cond, false);
 	}
 	
 	public void testCondBreakError() {
@@ -566,7 +566,7 @@ public class BreakpointTests extends AbstractDebugTest {
 		resumeCurrentTarget();
 		waitSuspend(currentTarget);
 	}
-	public void testHitCondWithError_xfail() throws CoreException, MIException, IOException, CDIException, InterruptedException {
+	public void testHitCondWithError() throws CoreException, MIException, IOException, CDIException, InterruptedException {
 		// this currently fails sometimes - after set bad breakpoint it does not hit any
 		// only reproducible when setting invalid condition breakpoint, reason unknown
 		setBreakOnMain();