diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/SyncUtil.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/SyncUtil.java
index 2d1e7a34c9a..348337e7de7 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/SyncUtil.java
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/SyncUtil.java
@@ -168,13 +168,13 @@ public class SyncUtil {
 		return eventWaitor.waitForEvent(timeout);
 	}
 
-	public static MIStoppedEvent runToLine(IExecutionDMContext dmc, String fileName, String lineNo, 
-            boolean skipBreakpoints) throws Throwable {
+	public static MIStoppedEvent runToLine(final IExecutionDMContext dmc, final String fileName, final int lineNo,
+			final boolean skipBreakpoints) throws Throwable {
 		return runToLine(dmc, fileName, lineNo, skipBreakpoints, DefaultTimeouts.get(ETimeout.runToLine));
 	}
 
-	public static MIStoppedEvent runToLine(final IExecutionDMContext dmc, final String fileName, final String lineNo, 
-			                               boolean skipBreakpoints, int timeout) throws Throwable {
+	public static MIStoppedEvent runToLine(final IExecutionDMContext dmc, final String fileName, final int lineNo,
+			final boolean skipBreakpoints, final int timeout) throws Throwable {
 		
         final ServiceEventWaitor<MIStoppedEvent> eventWaitor =
             new ServiceEventWaitor<MIStoppedEvent>(
@@ -197,22 +197,22 @@ public class SyncUtil {
     	return eventWaitor.waitForEvent(timeout);	
 	}
 
-	public static MIStoppedEvent runToLine(String fileName, String lineNo, 
+	public static MIStoppedEvent runToLine(String fileName, int lineNo,
             boolean skipBreakpoints) throws Throwable {
 		return runToLine(fileName, lineNo, skipBreakpoints, DefaultTimeouts.get(ETimeout.runToLine));
 	}
 
-	public static MIStoppedEvent runToLine(String fileName, String lineNo, 
+	public static MIStoppedEvent runToLine(String fileName, int lineNo,
             boolean skipBreakpoints, int timeout) throws Throwable {
         IContainerDMContext containerDmc = SyncUtil.getContainerContext();
 		return runToLine(containerDmc, fileName, lineNo, skipBreakpoints, timeout);
 	}
 
-	public static MIStoppedEvent runToLine(String fileName, String lineNo) throws Throwable {
+	public static MIStoppedEvent runToLine(String fileName, int lineNo) throws Throwable {
 		return runToLine(fileName, lineNo, DefaultTimeouts.get(ETimeout.runToLine));
 	}
 
-	public static MIStoppedEvent runToLine(String fileName, String lineNo, int timeout) throws Throwable {
+	public static MIStoppedEvent runToLine(String fileName, int lineNo, int timeout) throws Throwable {
 		return runToLine(fileName, lineNo, false, timeout);
 	}
 
diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java
index 287c8798d99..52730259ba2 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java
@@ -402,12 +402,12 @@ public class MIRegistersTest extends BaseTestCase {
     @Test
     public void compareRegisterForMultipleExecutionContexts() throws Throwable {
 
-    	// Run past the line that creates a thread and past the sleep that
+		// Run past the line that creates a thread and past the sleep that
 		// follows it. This is a bit tricky because the code that creates the
 		// thread is conditional depending on environment. Run to the printf
 		// before it (which is common), then do step operations over the
 		// non-common code (but same number of lines)
-    	SyncUtil.runToLine(SRC_NAME, Integer.toString(MIRunControlTest.LINE_MAIN_PRINTF));
+		SyncUtil.runToLine(SRC_NAME, MIRunControlTest.LINE_MAIN_PRINTF);
 
         // Because the program is about to go multi-threaded, we have to select the thread
         // we want to keep stepping.  If we don't, we will ask GDB to step the entire process
diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTest.java
index 5325d8570bf..06d6f5aaa1a 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTest.java
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTest.java
@@ -274,7 +274,7 @@ public class MIRunControlTest extends BaseTestCase {
 		// thread is conditional depending on environment. Run to the printf
 		// before it (which is common), then do step operations over the
 		// non-common code (but same number of lines)
-        SyncUtil.runToLine(fContainerDmc, SOURCE_NAME, Integer.toString(LINE_MAIN_PRINTF), true);
+        SyncUtil.runToLine(fContainerDmc, SOURCE_NAME, LINE_MAIN_PRINTF, true);
         
         // Because the program is about to go multi-threaded, we have to select the thread
         // we want to keep stepping.  If we don't, we will ask GDB to step the entire process