diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBProcessesTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBProcessesTest.java
index 70638b0df3a..b0dd786d5f4 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBProcessesTest.java
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBProcessesTest.java
@@ -150,8 +150,15 @@ public class GDBProcessesTest extends BaseTestCase {
 	 */
 	@Test
 	public void getThreadData() throws Throwable {
-		// Start all threads, stop when they are all started
-		SyncUtil.runToLine(SOURCE_NAME, getLineForTag("LINE_MAIN_ALL_THREADS_STARTED"));
+		// Start the threads one by one to make sure they are discovered by gdb in the right
+		// order.
+		for (int i = 0; i < 5; i++) {
+			SyncUtil.runToLocation(SOURCE_NAME + ":" + getLineForTag("LINE_MAIN_AFTER_THREAD_START"));
+
+		}
+
+		// We need to get there to make sure that all the threads have their name set.
+		SyncUtil.runToLocation(SOURCE_NAME + ":" + getLineForTag("LINE_MAIN_ALL_THREADS_STARTED"));
 
 		IThreadDMData mainThreadData = SyncUtil.getThreadData(1);