diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/Suite_Sessionless_Tests.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/Suite_Sessionless_Tests.java
index 570260c12bf..0480c2f776b 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/Suite_Sessionless_Tests.java
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/Suite_Sessionless_Tests.java
@@ -11,7 +11,8 @@
 package org.eclipse.cdt.dsf.mi.service.command.commands;
 
 import org.eclipse.cdt.dsf.mi.service.command.output.MIThreadTests;
-import org.eclipse.cdt.tests.dsf.gdb.tests.OnceOnlySuite;
+import org.eclipse.cdt.tests.dsf.gdb.framework.OnceOnlySuite;
+import org.eclipse.cdt.tests.dsf.gdb.tests.LaunchUtilsTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
@@ -25,7 +26,8 @@ import org.junit.runners.Suite;
 @Suite.SuiteClasses({
         TestMIBreakInsertCommand.class,
         TestMICommandConstructCommand.class,
-        MIThreadTests.class
+        MIThreadTests.class,
+        LaunchUtilsTest.class
         /* Add your test class here */
         })
 public class Suite_Sessionless_Tests {
diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/OnceOnlySuite.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/OnceOnlySuite.java
similarity index 97%
rename from dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/OnceOnlySuite.java
rename to dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/OnceOnlySuite.java
index eded8ba7b26..cc575b7eeaf 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/OnceOnlySuite.java
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/OnceOnlySuite.java
@@ -1,4 +1,4 @@
-package org.eclipse.cdt.tests.dsf.gdb.tests;
+package org.eclipse.cdt.tests.dsf.gdb.framework;
 
 import java.util.HashSet;
 import java.util.Set;