diff --git a/tests/org.eclipse.xsemantics.dsl.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.xsemantics.dsl.tests/META-INF/MANIFEST.MF
index 1121e0ec2..89d99740d 100644
--- a/tests/org.eclipse.xsemantics.dsl.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.xsemantics.dsl.tests/META-INF/MANIFEST.MF
@@ -38,7 +38,6 @@ Export-Package: org.eclipse.xsemantics.dsl.tests;x-internal=true,
  org.eclipse.xsemantics.dsl.tests.input,
  org.eclipse.xsemantics.dsl.tests.performance,
  org.eclipse.xsemantics.dsl.tests.runtime,
- org.eclipse.xsemantics.dsl.tests.suites,
  org.eclipse.xsemantics.dsl.tests.typesystems,
  org.eclipse.xsemantics.test.ecore,
  org.eclipse.xsemantics.test.ecore.validation,
diff --git a/tests/org.eclipse.xsemantics.dsl.tests/XsemanticsAllTests.launch b/tests/org.eclipse.xsemantics.dsl.tests/XsemanticsAllTests.launch
index deef269de..baee48af4 100644
--- a/tests/org.eclipse.xsemantics.dsl.tests/XsemanticsAllTests.launch
+++ b/tests/org.eclipse.xsemantics.dsl.tests/XsemanticsAllTests.launch
@@ -2,12 +2,12 @@
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
     <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-        <listEntry value="/org.eclipse.xsemantics.dsl.tests/src/org/eclipse/xsemantics/dsl/tests/suites/XsemanticsAllTests.java"/>
+        <listEntry value="/org.eclipse.xsemantics.dsl.tests"/>
     </listAttribute>
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-        <listEntry value="1"/>
+        <listEntry value="4"/>
     </listAttribute>
-    <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+    <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.xsemantics.dsl.tests"/>
     <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
     <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
     <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
@@ -15,6 +15,6 @@
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
-    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.xsemantics.dsl.tests.suites.XsemanticsAllTests"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.xsemantics.dsl.tests"/>
 </launchConfiguration>
diff --git a/tests/org.eclipse.xsemantics.dsl.tests/src/org/eclipse/xsemantics/dsl/tests/suites/XsemanticsAllTests.java b/tests/org.eclipse.xsemantics.dsl.tests/old-suites/suites/XsemanticsAllTests.java
similarity index 100%
rename from tests/org.eclipse.xsemantics.dsl.tests/src/org/eclipse/xsemantics/dsl/tests/suites/XsemanticsAllTests.java
rename to tests/org.eclipse.xsemantics.dsl.tests/old-suites/suites/XsemanticsAllTests.java
diff --git a/tests/org.eclipse.xsemantics.dsl.tests/src/org/eclipse/xsemantics/dsl/tests/suites/XsemanticsCachedTypeSystemsAllTests.java b/tests/org.eclipse.xsemantics.dsl.tests/old-suites/suites/XsemanticsCachedTypeSystemsAllTests.java
similarity index 100%
rename from tests/org.eclipse.xsemantics.dsl.tests/src/org/eclipse/xsemantics/dsl/tests/suites/XsemanticsCachedTypeSystemsAllTests.java
rename to tests/org.eclipse.xsemantics.dsl.tests/old-suites/suites/XsemanticsCachedTypeSystemsAllTests.java
diff --git a/tests/org.eclipse.xsemantics.dsl.tests/src/org/eclipse/xsemantics/dsl/tests/suites/XsemanticsDslAllTests.java b/tests/org.eclipse.xsemantics.dsl.tests/old-suites/suites/XsemanticsDslAllTests.java
similarity index 100%
rename from tests/org.eclipse.xsemantics.dsl.tests/src/org/eclipse/xsemantics/dsl/tests/suites/XsemanticsDslAllTests.java
rename to tests/org.eclipse.xsemantics.dsl.tests/old-suites/suites/XsemanticsDslAllTests.java
diff --git a/tests/org.eclipse.xsemantics.dsl.tests/src/org/eclipse/xsemantics/dsl/tests/suites/XsemanticsGeneratedTypeSystemsAllTests.java b/tests/org.eclipse.xsemantics.dsl.tests/old-suites/suites/XsemanticsGeneratedTypeSystemsAllTests.java
similarity index 100%
rename from tests/org.eclipse.xsemantics.dsl.tests/src/org/eclipse/xsemantics/dsl/tests/suites/XsemanticsGeneratedTypeSystemsAllTests.java
rename to tests/org.eclipse.xsemantics.dsl.tests/old-suites/suites/XsemanticsGeneratedTypeSystemsAllTests.java
diff --git a/tests/org.eclipse.xsemantics.dsl.tests/src/org/eclipse/xsemantics/dsl/tests/suites/XsemanticsGeneratorAllTests.java b/tests/org.eclipse.xsemantics.dsl.tests/old-suites/suites/XsemanticsGeneratorAllTests.java
similarity index 100%
rename from tests/org.eclipse.xsemantics.dsl.tests/src/org/eclipse/xsemantics/dsl/tests/suites/XsemanticsGeneratorAllTests.java
rename to tests/org.eclipse.xsemantics.dsl.tests/old-suites/suites/XsemanticsGeneratorAllTests.java
diff --git a/tests/org.eclipse.xsemantics.dsl.tests/src/org/eclipse/xsemantics/dsl/tests/suites/XsemanticsRuntimeAllTests.java b/tests/org.eclipse.xsemantics.dsl.tests/old-suites/suites/XsemanticsRuntimeAllTests.java
similarity index 100%
rename from tests/org.eclipse.xsemantics.dsl.tests/src/org/eclipse/xsemantics/dsl/tests/suites/XsemanticsRuntimeAllTests.java
rename to tests/org.eclipse.xsemantics.dsl.tests/old-suites/suites/XsemanticsRuntimeAllTests.java