diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_5/Suite_7_5.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_5/Suite_7_5.java
index c541b30eb78..ad053dda7f4 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_5/Suite_7_5.java
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_5/Suite_7_5.java
@@ -29,6 +29,7 @@ import org.junit.runners.Suite;
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
 	// We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256
+	GDBMultiNonStopRunControlTest_7_5.class,
 	MIRegistersTest_7_5.class,
 	MIRunControlTest_7_5.class,
 	MIRunControlTargetAvailableTest_7_5.class,
@@ -45,7 +46,6 @@ import org.junit.runners.Suite;
 	OperationsWhileTargetIsRunningNonStopTest_7_5.class,
 	PostMortemCoreTest_7_5.class,
 	CommandTimeoutTest_7_5.class,
-	GDBMultiNonStopRunControlTest_7_5.class,
 	Suite_Sessionless_Tests.class,
 	GDBConsoleBreakpointsTest_7_5.class,
 	/* Add your test class here */
diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_6/Suite_Remote_7_6.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_6/Suite_Remote_7_6.java
index 2a73f37ffe3..aa3edd8421e 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_6/Suite_Remote_7_6.java
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_6/Suite_Remote_7_6.java
@@ -30,6 +30,7 @@ import org.junit.runners.Suite;
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
 	// We need specific name for the tests of this suite, because of bug https://bugs.eclipse.org/172256
+	GDBMultiNonStopRunControlTest_7_6.class,
 	GDBRemoteTracepointsTest_7_6.class,
 	MIRegistersTest_7_6.class,
 	MIRunControlTest_7_6.class,
@@ -45,7 +46,6 @@ import org.junit.runners.Suite;
 	OperationsWhileTargetIsRunningTest_7_6.class,
 	OperationsWhileTargetIsRunningNonStopTest_7_6.class,
 	CommandTimeoutTest_7_6.class,
-	GDBMultiNonStopRunControlTest_7_6.class,
 	Suite_Sessionless_Tests.class,
 	GDBConsoleBreakpointsTest_7_6.class,
 	TraceFileTest_7_6.class,