diff --git a/org.eclipse.xtend.core/src/org/eclipse/xtend/core/validation/XtendValidator.java b/org.eclipse.xtend.core/src/org/eclipse/xtend/core/validation/XtendValidator.java
index f98f2baa237..85b89f482e4 100644
--- a/org.eclipse.xtend.core/src/org/eclipse/xtend/core/validation/XtendValidator.java
+++ b/org.eclipse.xtend.core/src/org/eclipse/xtend/core/validation/XtendValidator.java
@@ -207,7 +207,7 @@ public class XtendValidator extends XbaseWithAnnotationsValidator {
 		"org.junit.BeforeClass",
 		"org.junit.AfterClass",
 		
-		// JUnit5 annotations
+		// JUnit6 annotations
 		"org.junit.jupiter.api.Test",
 		"org.junit.jupiter.api.BeforeEach",
 		"org.junit.jupiter.api.AfterEach",
diff --git a/org.eclipse.xtend.ide.tests/longrunning/src/org/eclipse/xtend/ide/tests/quickfix/AddJunitLibToClasspathQuickfixTest.xtend b/org.eclipse.xtend.ide.tests/longrunning/src/org/eclipse/xtend/ide/tests/quickfix/AddJunitLibToClasspathQuickfixTest.xtend
index a39a94a274f..b44569f0779 100644
--- a/org.eclipse.xtend.ide.tests/longrunning/src/org/eclipse/xtend/ide/tests/quickfix/AddJunitLibToClasspathQuickfixTest.xtend
+++ b/org.eclipse.xtend.ide.tests/longrunning/src/org/eclipse/xtend/ide/tests/quickfix/AddJunitLibToClasspathQuickfixTest.xtend
@@ -9,7 +9,7 @@
 package org.eclipse.xtend.ide.tests.quickfix
 
 import org.eclipse.xtend.ide.buildpath.Junit4LibClasspathAdder
-import org.eclipse.xtend.ide.buildpath.Junit5LibClasspathAdder
+import org.eclipse.xtend.ide.buildpath.Junit6LibClasspathAdder
 import org.eclipse.xtend.ide.tests.XtendIDEInjectorProvider
 import org.eclipse.xtend.ide.tests.buildpath.AbstractJunitLibClasspathAdderTestCase
 import org.eclipse.xtext.diagnostics.Diagnostic
@@ -80,7 +80,7 @@ class AddJunitLibToClasspathQuickfixTest extends AbstractJunitLibClasspathAdderT
     }
 
     @Test
-    def void addJUnit5LibToPluginProjectClasspath() {
+    def void addJUnit6LibToPluginProjectClasspath() {
         val content = '''
             import org.junit.jupiter.api|.Test
             
@@ -91,14 +91,14 @@ class AddJunitLibToClasspathQuickfixTest extends AbstractJunitLibClasspathAdderT
         '''
         create('FooTest2.xtend', content)
             .assertIssueCodes(Diagnostic.LINKING_DIAGNOSTIC)
-            .assertResolutionLabels('Add JUnit 5 lib to classpath')
+            .assertResolutionLabels('Add JUnit 6 lib to classpath')
             .assertModelAfterQuickfix(content.replace('|', ''))
-       assertImportPackages(#["org.junit.jupiter.api;version=\"[5.1.0,6.0.0)\""]) // just test 1
+       assertImportPackages(#["org.junit.jupiter.api;version=\"[6.0.0,7.0.0)\""]) // just test 1
     }
     
     
     @Test
-    def void addJUnit5LibToProjectClasspath() {
+    def void addJUnit6LibToProjectClasspath() {
         removePluginNature
         val content = '''
             import org.junit.jupiter.api|.Test
@@ -110,11 +110,11 @@ class AddJunitLibToClasspathQuickfixTest extends AbstractJunitLibClasspathAdderT
         '''
         create('FooTest.xtend', content)
             .assertIssueCodes(Diagnostic.LINKING_DIAGNOSTIC)
-            .assertResolutionLabels('Add JUnit 5 lib to classpath')
+            .assertResolutionLabels('Add JUnit 6 lib to classpath')
             .assertModelAfterQuickfix(content.replace('|', ''))
         assertClasspath(
-            'classpath should contain a JUnit 5 container entry', 
-            Junit5LibClasspathAdder.JUNIT5_LIBRARY_PATH
+            'classpath should contain a JUnit 6 container entry',
+            Junit6LibClasspathAdder.JUNIT6_LIBRARY_PATH
         )
     }
 
diff --git a/org.eclipse.xtend.ide.tests/src/org/eclipse/xtend/ide/tests/buildpath/JunitLibClasspathAdderTest.xtend b/org.eclipse.xtend.ide.tests/src/org/eclipse/xtend/ide/tests/buildpath/JunitLibClasspathAdderTest.xtend
index cf1e5de916f..ee68b509e73 100644
--- a/org.eclipse.xtend.ide.tests/src/org/eclipse/xtend/ide/tests/buildpath/JunitLibClasspathAdderTest.xtend
+++ b/org.eclipse.xtend.ide.tests/src/org/eclipse/xtend/ide/tests/buildpath/JunitLibClasspathAdderTest.xtend
@@ -11,7 +11,7 @@ package org.eclipse.xtend.ide.tests.buildpath
 import org.eclipse.core.runtime.NullProgressMonitor
 import org.eclipse.jdt.core.JavaCore
 import org.eclipse.xtend.ide.buildpath.Junit4LibClasspathAdder
-import org.eclipse.xtend.ide.buildpath.Junit5LibClasspathAdder
+import org.eclipse.xtend.ide.buildpath.Junit6LibClasspathAdder
 import org.eclipse.xtend.ide.tests.XtendIDEInjectorProvider
 import org.eclipse.xtext.testing.InjectWith
 import org.eclipse.xtext.testing.XtextRunner
@@ -28,7 +28,7 @@ class JunitLibClasspathAdderTest extends AbstractJunitLibClasspathAdderTestCase
 
     @Inject Junit4LibClasspathAdder junit4LibAdder
 
-    @Inject Junit5LibClasspathAdder junit5LibAdder
+    @Inject Junit6LibClasspathAdder junit6LibAdder
 
     @Test
     def void addJUnit4LibToPluginProjectClasspath() {
@@ -48,18 +48,18 @@ class JunitLibClasspathAdderTest extends AbstractJunitLibClasspathAdderTestCase
     }
 
     @Test
-    def void addJUnit5LibToPluginProjectClasspath() {
-        junit5LibAdder.addLibsToClasspath(JavaCore.create(project), new NullProgressMonitor)
-        assertRequireBundles(Junit5LibClasspathAdder.BUNDLE_IDS)
+    def void addJUnit6LibToPluginProjectClasspath() {
+        junit6LibAdder.addLibsToClasspath(JavaCore.create(project), new NullProgressMonitor)
+        assertRequireBundles(Junit6LibClasspathAdder.BUNDLE_IDS)
     }
 
     @Test
-    def void addJUnit5LibToProjectClasspath() {
+    def void addJUnit6LibToProjectClasspath() {
         removePluginNature
-        junit5LibAdder.addLibsToClasspath(JavaCore.create(project), new NullProgressMonitor)
+        junit6LibAdder.addLibsToClasspath(JavaCore.create(project), new NullProgressMonitor)
         assertClasspath(
-            'classpath should contain a JUnit 5 container entry',
-            Junit5LibClasspathAdder.JUNIT5_LIBRARY_PATH
+            'classpath should contain a JUnit 6 container entry',
+            Junit6LibClasspathAdder.JUNIT6_LIBRARY_PATH
         )
     }
 
diff --git a/org.eclipse.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/buildpath/JunitLibClasspathAdderTest.java b/org.eclipse.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/buildpath/JunitLibClasspathAdderTest.java
index 98c4fcb6af7..6490cf905d9 100644
--- a/org.eclipse.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/buildpath/JunitLibClasspathAdderTest.java
+++ b/org.eclipse.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/buildpath/JunitLibClasspathAdderTest.java
@@ -17,7 +17,7 @@
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.xtend.ide.buildpath.Junit4LibClasspathAdder;
-import org.eclipse.xtend.ide.buildpath.Junit5LibClasspathAdder;
+import org.eclipse.xtend.ide.buildpath.Junit6LibClasspathAdder;
 import org.eclipse.xtend.ide.tests.XtendIDEInjectorProvider;
 import org.eclipse.xtext.testing.InjectWith;
 import org.eclipse.xtext.testing.XtextRunner;
@@ -38,7 +38,7 @@ public class JunitLibClasspathAdderTest extends AbstractJunitLibClasspathAdderTe
   private Junit4LibClasspathAdder junit4LibAdder;
 
   @Inject
-  private Junit5LibClasspathAdder junit5LibAdder;
+  private Junit6LibClasspathAdder junit6LibAdder;
 
   @Test
   public void addJUnit4LibToPluginProjectClasspath() {
@@ -68,21 +68,21 @@ public void addJUnit4LibToProjectClasspath() {
   }
 
   @Test
-  public void addJUnit5LibToPluginProjectClasspath() {
+  public void addJUnit6LibToPluginProjectClasspath() {
     IJavaProject _create = JavaCore.create(this.workbenchHelper.getProject());
     NullProgressMonitor _nullProgressMonitor = new NullProgressMonitor();
-    this.junit5LibAdder.addLibsToClasspath(_create, _nullProgressMonitor);
-    this.assertRequireBundles(Junit5LibClasspathAdder.BUNDLE_IDS);
+    this.junit6LibAdder.addLibsToClasspath(_create, _nullProgressMonitor);
+    this.assertRequireBundles(Junit6LibClasspathAdder.BUNDLE_IDS);
   }
 
   @Test
-  public void addJUnit5LibToProjectClasspath() {
+  public void addJUnit6LibToProjectClasspath() {
     this.removePluginNature();
     IJavaProject _create = JavaCore.create(this.workbenchHelper.getProject());
     NullProgressMonitor _nullProgressMonitor = new NullProgressMonitor();
-    this.junit5LibAdder.addLibsToClasspath(_create, _nullProgressMonitor);
+    this.junit6LibAdder.addLibsToClasspath(_create, _nullProgressMonitor);
     this.assertClasspath(
-      "classpath should contain a JUnit 5 container entry", 
-      Junit5LibClasspathAdder.JUNIT5_LIBRARY_PATH);
+      "classpath should contain a JUnit 6 container entry",
+      Junit6LibClasspathAdder.JUNIT6_LIBRARY_PATH);
   }
 }
diff --git a/org.eclipse.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/quickfix/AddJunitLibToClasspathQuickfixTest.java b/org.eclipse.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/quickfix/AddJunitLibToClasspathQuickfixTest.java
index aab55176bad..117f4d88a7c 100644
--- a/org.eclipse.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/quickfix/AddJunitLibToClasspathQuickfixTest.java
+++ b/org.eclipse.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/quickfix/AddJunitLibToClasspathQuickfixTest.java
@@ -10,7 +10,7 @@
 
 import com.google.inject.Inject;
 import org.eclipse.xtend.ide.buildpath.Junit4LibClasspathAdder;
-import org.eclipse.xtend.ide.buildpath.Junit5LibClasspathAdder;
+import org.eclipse.xtend.ide.buildpath.Junit6LibClasspathAdder;
 import org.eclipse.xtend.ide.tests.XtendIDEInjectorProvider;
 import org.eclipse.xtend.ide.tests.buildpath.AbstractJunitLibClasspathAdderTestCase;
 import org.eclipse.xtend2.lib.StringConcatenation;
@@ -92,7 +92,7 @@ public void addJUnit4LibToProjectClasspath() {
   }
 
   @Test
-  public void addJUnit5LibToPluginProjectClasspath() {
+  public void addJUnit6LibToPluginProjectClasspath() {
     StringConcatenation _builder = new StringConcatenation();
     _builder.append("import org.junit.jupiter.api|.Test");
     _builder.newLine();
@@ -108,12 +108,12 @@ public void addJUnit5LibToPluginProjectClasspath() {
     _builder.append("}");
     _builder.newLine();
     final String content = _builder.toString();
-    this.builder.create("FooTest2.xtend", content).assertIssueCodes(Diagnostic.LINKING_DIAGNOSTIC).assertResolutionLabels("Add JUnit 5 lib to classpath").assertModelAfterQuickfix(content.replace("|", ""));
-    this.assertImportPackages(new String[] { "org.junit.jupiter.api;version=\"[5.1.0,6.0.0)\"" });
+    this.builder.create("FooTest2.xtend", content).assertIssueCodes(Diagnostic.LINKING_DIAGNOSTIC).assertResolutionLabels("Add JUnit 6 lib to classpath").assertModelAfterQuickfix(content.replace("|", ""));
+    this.assertImportPackages(new String[] { "org.junit.jupiter.api;version=\"[6.0.0,7.0.0)\"" });
   }
 
   @Test
-  public void addJUnit5LibToProjectClasspath() {
+  public void addJUnit6LibToProjectClasspath() {
     this.removePluginNature();
     StringConcatenation _builder = new StringConcatenation();
     _builder.append("import org.junit.jupiter.api|.Test");
@@ -130,9 +130,9 @@ public void addJUnit5LibToProjectClasspath() {
     _builder.append("}");
     _builder.newLine();
     final String content = _builder.toString();
-    this.builder.create("FooTest.xtend", content).assertIssueCodes(Diagnostic.LINKING_DIAGNOSTIC).assertResolutionLabels("Add JUnit 5 lib to classpath").assertModelAfterQuickfix(content.replace("|", ""));
+    this.builder.create("FooTest.xtend", content).assertIssueCodes(Diagnostic.LINKING_DIAGNOSTIC).assertResolutionLabels("Add JUnit 6 lib to classpath").assertModelAfterQuickfix(content.replace("|", ""));
     this.assertClasspath(
-      "classpath should contain a JUnit 5 container entry", 
-      Junit5LibClasspathAdder.JUNIT5_LIBRARY_PATH);
+      "classpath should contain a JUnit 6 container entry",
+      Junit6LibClasspathAdder.JUNIT6_LIBRARY_PATH);
   }
 }
diff --git a/org.eclipse.xtend.ide/src/org/eclipse/xtend/ide/buildpath/Junit5LibClasspathAdder.java b/org.eclipse.xtend.ide/src/org/eclipse/xtend/ide/buildpath/Junit6LibClasspathAdder.java
similarity index 63%
rename from org.eclipse.xtend.ide/src/org/eclipse/xtend/ide/buildpath/Junit5LibClasspathAdder.java
rename to org.eclipse.xtend.ide/src/org/eclipse/xtend/ide/buildpath/Junit6LibClasspathAdder.java
index 9c7f1a84408..5757d7bf0fe 100644
--- a/org.eclipse.xtend.ide/src/org/eclipse/xtend/ide/buildpath/Junit5LibClasspathAdder.java
+++ b/org.eclipse.xtend.ide/src/org/eclipse/xtend/ide/buildpath/Junit6LibClasspathAdder.java
@@ -16,9 +16,9 @@
 /**
  * @author vivienjovet - Initial contribution and API
  */
-public class Junit5LibClasspathAdder extends AbstractLibClasspathAdder {
+public class Junit6LibClasspathAdder extends AbstractLibClasspathAdder {
 
-	public static final IPath JUNIT5_LIBRARY_PATH = new Path("org.eclipse.jdt.junit.JUNIT_CONTAINER/5");
+	public static final IPath JUNIT6_LIBRARY_PATH = new Path("org.eclipse.jdt.junit.JUNIT_CONTAINER/6");
 	public static final String[] BUNDLE_IDS = new String[] { 
 			"org.junit",
 			"org.hamcrest.core",
@@ -27,7 +27,7 @@ public class Junit5LibClasspathAdder extends AbstractLibClasspathAdder {
 
 	@Override
 	protected IClasspathEntry createContainerClasspathEntry() {
-		return JavaCore.newContainerEntry(JUNIT5_LIBRARY_PATH);
+		return JavaCore.newContainerEntry(JUNIT6_LIBRARY_PATH);
 	}
 
 	@Override
@@ -38,13 +38,13 @@ protected String[] getBundleIds() {
 	@Override
 	protected String[] getImportedPackages() {
 		return new String[] {
-			"org.junit.jupiter.api;version=\"[5.1.0,6.0.0)\"",
-			"org.junit.jupiter.api.condition;version=\"[5.1.0,6.0.0)\"",
-			"org.junit.jupiter.api.extension;version=\"[5.1.0,6.0.0)\"",
-			"org.junit.jupiter.api.function;version=\"[5.1.0,6.0.0)\"",
-			"org.junit.jupiter.api.io;version=\"[5.1.0,6.0.0)\"",
-			"org.junit.jupiter.api.parallel;version=\"[5.1.0,6.0.0)\"",
-			"org.junit.platform.commons.support;version=\"[1.0.0,2.0.0)\";resolution:=optional"
+			"org.junit.jupiter.api;version=\"[6.0.0,7.0.0)\"",
+			"org.junit.jupiter.api.condition;version=\"[6.0.0,7.0.0)\"",
+			"org.junit.jupiter.api.extension;version=\"[6.0.0,7.0.0)\"",
+			"org.junit.jupiter.api.function;version=\"[6.0.0,7.0.0)\"",
+			"org.junit.jupiter.api.io;version=\"[6.0.0,7.0.0)\"",
+			"org.junit.jupiter.api.parallel;version=\"[6.0.0,7.0.0)\"",
+			"org.junit.platform.commons.support;version=\"[6.0.0,7.0.0)\";resolution:=optional"
 		};
 	}
 
diff --git a/org.eclipse.xtend.ide/src/org/eclipse/xtend/ide/quickfix/XtendQuickfixProvider.java b/org.eclipse.xtend.ide/src/org/eclipse/xtend/ide/quickfix/XtendQuickfixProvider.java
index 83c962031af..d265483857a 100644
--- a/org.eclipse.xtend.ide/src/org/eclipse/xtend/ide/quickfix/XtendQuickfixProvider.java
+++ b/org.eclipse.xtend.ide/src/org/eclipse/xtend/ide/quickfix/XtendQuickfixProvider.java
@@ -52,7 +52,7 @@
 import org.eclipse.xtend.core.xtend.XtendPackage;
 import org.eclipse.xtend.core.xtend.XtendTypeDeclaration;
 import org.eclipse.xtend.ide.buildpath.Junit4LibClasspathAdder;
-import org.eclipse.xtend.ide.buildpath.Junit5LibClasspathAdder;
+import org.eclipse.xtend.ide.buildpath.Junit6LibClasspathAdder;
 import org.eclipse.xtend.ide.buildpath.XtendLibClasspathAdder;
 import org.eclipse.xtend.ide.codebuilder.InsertionOffsets;
 import org.eclipse.xtend.ide.codebuilder.MemberFromSuperImplementor;
@@ -139,7 +139,7 @@ public class XtendQuickfixProvider extends XbaseQuickfixProvider {
 	
 	@Inject private Junit4LibClasspathAdder junit4LibAdder;
 	
-	@Inject private Junit5LibClasspathAdder junit5LibAdder;
+	@Inject private Junit6LibClasspathAdder junit6LibAdder;
 	
 	@Inject private IJavaProjectProvider projectProvider;
 
@@ -217,13 +217,13 @@ public void fixJunitNotOnClasspath(final Issue issue, final IssueResolutionAccep
 			String type = issue.getData()[0];
 			
 			if (type.startsWith("org.junit.jupiter.")) {
-				acceptor.accept(issue, "Add JUnit 5 lib to classpath", "Add JUnit 5 lib to classpath", "julaunch.gif",
+				acceptor.accept(issue, "Add JUnit 6 lib to classpath", "Add JUnit 6 lib to classpath", "julaunch.gif",
 						new ISemanticModification() {
 							@Override
 							public void apply(EObject element, IModificationContext context) throws Exception {
 								ResourceSet resourceSet = element.eResource().getResourceSet();
 								IJavaProject javaProject = projectProvider.getJavaProject(resourceSet);
-								junit5LibAdder.addLibsToClasspath(javaProject, new NullProgressMonitor());
+								junit6LibAdder.addLibsToClasspath(javaProject, new NullProgressMonitor());
 							}
 						});
 			} else if (type.startsWith("org.junit.")) {
diff --git a/org.eclipse.xtext.dev-bom/pom.xml b/org.eclipse.xtext.dev-bom/pom.xml
index 1def94f4b43..3280816f350 100644
--- a/org.eclipse.xtext.dev-bom/pom.xml
+++ b/org.eclipse.xtext.dev-bom/pom.xml
@@ -125,8 +125,8 @@
 		<url>git@github.com:eclipse-xtext/xtext.git</url>
 	</scm>
 	<properties>
-		<junit-platform-version>1.14.0</junit-platform-version>
-		<junit-jupiter-version>5.14.0</junit-jupiter-version>
+		<junit-platform-version>6.0.1</junit-platform-version>
+		<junit-jupiter-version>6.0.1</junit-jupiter-version>
 		<org.eclipse.emf.mwe2-version>2.25.0</org.eclipse.emf.mwe2-version>
 		<org.eclipse.emf.mwe-version>1.19.0</org.eclipse.emf.mwe-version>
 		<org.eclipse.lsp4j-version>1.0.0</org.eclipse.lsp4j-version>
@@ -440,11 +440,6 @@
 				<artifactId>junit-platform-launcher</artifactId>
 				<version>${junit-platform-version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.junit.platform</groupId>
-				<artifactId>junit-platform-runner</artifactId>
-				<version>${junit-platform-version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.junit.platform</groupId>
 				<artifactId>junit-platform-suite-api</artifactId>
diff --git a/org.eclipse.xtext.doc/contents/103_domainmodelnextsteps.html b/org.eclipse.xtext.doc/contents/103_domainmodelnextsteps.html
index 839664061d6..19e27b1cb66 100644
--- a/org.eclipse.xtext.doc/contents/103_domainmodelnextsteps.html
+++ b/org.eclipse.xtext.doc/contents/103_domainmodelnextsteps.html
@@ -268,7 +268,7 @@ <h2 id="tutorial-unit-tests">Unit Testing the Language</h2>
  }
 </code></pre>
 
-    <p><em>Note</em>: When using JUnit 5 the <a href="https://github.com/eclipse-xtext/xtext/blob/main/org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/extensions/InjectionExtension.java">InjectionExtension</a> is used instead of the XtextRunner. The Xtext code generator generates the example slightly different, depending on which option you have chosen in the <em>New Xtext Project</em> wizard.</p>
+    <p><em>Note</em>: When using JUnit 6 the <a href="https://github.com/eclipse-xtext/xtext/blob/main/org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/extensions/InjectionExtension.java">InjectionExtension</a> is used instead of the XtextRunner. The Xtext code generator generates the example slightly different, depending on which option you have chosen in the <em>New Xtext Project</em> wizard.</p>
   </li>
   <li>
     <p>The utility class <a href="https://github.com/eclipse-xtext/xtext/blob/main/org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/util/ParseHelper.java">ParseHelper</a> allows to parse an arbitrary string into a <em>Domainmodel</em>. The model itself can be traversed and checked afterwards. A static import of <a href="https://junit.org/junit4/javadoc/4.13/org/junit/Assert.html">Assert</a> leads to concise and readable test cases. You can rewrite the generated test case as follows:</p>
diff --git a/org.eclipse.xtext.doc/contents/303_runtime_concepts.html b/org.eclipse.xtext.doc/contents/303_runtime_concepts.html
index 7b2ecf5b9c2..536d41f06fc 100644
--- a/org.eclipse.xtext.doc/contents/303_runtime_concepts.html
+++ b/org.eclipse.xtext.doc/contents/303_runtime_concepts.html
@@ -806,7 +806,7 @@ <h3 id="encoding-of-an-xtextresource">Encoding of an XtextResource</h3>
 
 <h2 id="testing">Unit Testing</h2>
 
-<p>Automated tests are crucial for the maintainability and the quality of a software product. That is why it is strongly recommended to write unit tests for your language, too. The Xtext project wizard creates test projects for that purpose, which simplify the setup procedure for the basic language implementation as well as platform-specific integrations. It supports an option to either create your tests for JUnit 4 or JUnit 5. Depending on your choice your test layout will vary in some details.</p>
+<p>Automated tests are crucial for the maintainability and the quality of a software product. That is why it is strongly recommended to write unit tests for your language, too. The Xtext project wizard creates test projects for that purpose, which simplify the setup procedure for the basic language implementation as well as platform-specific integrations. It supports an option to either create your tests for JUnit 4 or JUnit 6. Depending on your choice your test layout will vary in some details.</p>
 
 <h3 id="creating-a-simple-test-class">Creating a Simple Test Class</h3>
 
@@ -830,7 +830,7 @@ <h3 id="creating-a-simple-test-class">Creating a Simple Test Class</h3>
 
 <p>This configuration will make sure that you can use dependency injection in your test class, and that the global EMF registries are properly populated before and cleaned up after each test.</p>
 
-<p>A test class for JUnit 5 looks quite similar. Instead of runners JUnit 5 has a notion of <a href="https://junit.org/junit5/docs/current/user-guide/#extensions">Extensions</a>. While there can only be one runner per test class for JUnit 4 there could be multiple extensions for JUnit 5. The replacement for the XtextRunner is the new <a href="https://github.com/eclipse-xtext/xtext/blob/main/org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/extensions/InjectionExtension.java">InjectionExtension</a>. Still needed is the language specific <a href="https://github.com/eclipse-xtext/xtext/blob/main/org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/IInjectorProvider.java">IInjectorProvider</a>. Instead of <code>org.junit.Test</code> you have to annotate your cases with <a href="https://github.com/junit-team/junit5/blob/master/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Test.java">org.junit.jupiter.api.Test</a> and import the methods from <a href="https://github.com/junit-team/junit5/blob/master/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java">org.junit.jupiter.api.Assertions</a>. A simple test class for JUnit 5 will then look like this:</p>
+<p>A test class for JUnit 6 looks quite similar. Instead of runners JUnit 6 has a notion of <a href="https://junit.org/junit5/docs/current/user-guide/#extensions">Extensions</a>. While there can only be one runner per test class for JUnit 4 there could be multiple extensions for JUnit 6. The replacement for the XtextRunner is the new <a href="https://github.com/eclipse-xtext/xtext/blob/main/org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/extensions/InjectionExtension.java">InjectionExtension</a>. Still needed is the language specific <a href="https://github.com/eclipse-xtext/xtext/blob/main/org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/IInjectorProvider.java">IInjectorProvider</a>. Instead of <code>org.junit.Test</code> you have to annotate your cases with <a href="https://github.com/junit-team/junit5/blob/master/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Test.java">org.junit.jupiter.api.Test</a> and import the methods from <a href="https://github.com/junit-team/junit5/blob/master/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java">org.junit.jupiter.api.Assertions</a>. A simple test class for JUnit 6 will then look like this:</p>
 
 <pre><code class="language-xtend">import org.eclipse.xtext.testing.InjectWith
 import org.eclipse.xtext.testing.extensions.InjectionExtension
@@ -903,7 +903,7 @@ <h3 id="testing-multiple-languages">Testing Multiple Languages</h3>
 }
 
 // @RunWith(XtextRunner.class) // JUnit 4
-@ExtendWith(InjectionExtension.class) // JUnit 5
+@ExtendWith(InjectionExtension.class) // JUnit 6
 @InjectWith(MyLanguageWithDependenciesInjectorProvider.class)
 public class YourTest {
     ...
diff --git a/org.eclipse.xtext.full.releng/pom.xml b/org.eclipse.xtext.full.releng/pom.xml
index 4233ff378d4..a2fc99396b9 100644
--- a/org.eclipse.xtext.full.releng/pom.xml
+++ b/org.eclipse.xtext.full.releng/pom.xml
@@ -43,10 +43,10 @@
 
 		<!-- xtext-core -->
 		<module>../org.eclipse.xtext.testing.tests</module>
-		<module>../org.eclipse.xtext.testing.junit5.tests</module>
+		<module>../org.eclipse.xtext.testing.junit6.tests</module>
 		<module>../org.eclipse.xtext.tests</module>
 		<module>../org.eclipse.xtext.ide.tests</module>
-		<module>../org.eclipse.xtext.junit5.tests</module>
+		<module>../org.eclipse.xtext.junit6.tests</module>
 		<module>../org.eclipse.xtext.testlanguages.ide</module>
 		<module>../org.eclipse.xtext.xtext.bootstrap</module>
 
diff --git a/org.eclipse.xtext.junit5.tests/.classpath b/org.eclipse.xtext.junit6.tests/.classpath
similarity index 100%
rename from org.eclipse.xtext.junit5.tests/.classpath
rename to org.eclipse.xtext.junit6.tests/.classpath
diff --git a/org.eclipse.xtext.junit5.tests/.gitignore b/org.eclipse.xtext.junit6.tests/.gitignore
similarity index 100%
rename from org.eclipse.xtext.junit5.tests/.gitignore
rename to org.eclipse.xtext.junit6.tests/.gitignore
diff --git a/org.eclipse.xtext.junit5.tests/.project b/org.eclipse.xtext.junit6.tests/.project
similarity index 95%
rename from org.eclipse.xtext.junit5.tests/.project
rename to org.eclipse.xtext.junit6.tests/.project
index fda755b9d18..15a22870f43 100644
--- a/org.eclipse.xtext.junit5.tests/.project
+++ b/org.eclipse.xtext.junit6.tests/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.xtext.junit5.tests</name>
+	<name>org.eclipse.xtext.junit6.tests</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.eclipse.xtext.junit5.tests/.settings/org.eclipse.core.resources.prefs b/org.eclipse.xtext.junit6.tests/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.xtext.junit5.tests/.settings/org.eclipse.core.resources.prefs
rename to org.eclipse.xtext.junit6.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.xtext.junit5.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.junit6.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.xtext.junit5.tests/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipse.xtext.junit6.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.xtext.junit5.tests/.settings/org.eclipse.jdt.launching.prefs b/org.eclipse.xtext.junit6.tests/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
rename from org.eclipse.xtext.junit5.tests/.settings/org.eclipse.jdt.launching.prefs
rename to org.eclipse.xtext.junit6.tests/.settings/org.eclipse.jdt.launching.prefs
diff --git a/org.eclipse.xtext.junit5.tests/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.xtext.junit6.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from org.eclipse.xtext.junit5.tests/.settings/org.eclipse.jdt.ui.prefs
rename to org.eclipse.xtext.junit6.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/org.eclipse.xtext.junit5.tests/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.xtext.junit6.tests/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from org.eclipse.xtext.junit5.tests/.settings/org.eclipse.m2e.core.prefs
rename to org.eclipse.xtext.junit6.tests/.settings/org.eclipse.m2e.core.prefs
diff --git a/org.eclipse.xtext.junit5.tests/.settings/org.eclipse.pde.prefs b/org.eclipse.xtext.junit6.tests/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from org.eclipse.xtext.junit5.tests/.settings/org.eclipse.pde.prefs
rename to org.eclipse.xtext.junit6.tests/.settings/org.eclipse.pde.prefs
diff --git a/org.eclipse.xtext.junit5.tests/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.xtext.junit6.tests/.settings/org.eclipse.xtend.core.Xtend.prefs
similarity index 100%
rename from org.eclipse.xtext.junit5.tests/.settings/org.eclipse.xtend.core.Xtend.prefs
rename to org.eclipse.xtext.junit6.tests/.settings/org.eclipse.xtend.core.Xtend.prefs
diff --git a/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.junit6.tests/META-INF/MANIFEST.MF
similarity index 74%
rename from org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF
rename to org.eclipse.xtext.junit6.tests/META-INF/MANIFEST.MF
index b2960b09ddc..ab2490f019e 100644
--- a/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.junit6.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.xtext.junit5.tests;singleton:=true
+Bundle-SymbolicName: org.eclipse.xtext.junit6.tests;singleton:=true
 Bundle-Version: 2.43.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -27,11 +27,11 @@ Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
 Import-Package: org.apache.commons.logging;version="1.2.0",
  org.apache.log4j;version="1.2.26",
- org.junit.jupiter.api;version="[5.1.0,6.0.0)",
- org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)",
- org.junit.jupiter.api.function;version="[5.1.0,6.0.0)",
- org.junit.jupiter.api.io;version="[5.1.0,6.0.0)",
- org.junit.jupiter.params;version="[5.1.0,6.0.0)",
- org.junit.jupiter.params.provider;version="[5.1.0,6.0.0)",
- org.junit.platform.commons.support;version="[1.0.0,2.0.0)"
+ org.junit.jupiter.api;version="[6.0.0,7.0.0)",
+ org.junit.jupiter.api.extension;version="[6.0.0,7.0.0)",
+ org.junit.jupiter.api.function;version="[6.0.0,7.0.0)",
+ org.junit.jupiter.api.io;version="[6.0.0,7.0.0)",
+ org.junit.jupiter.params;version="[6.0.0,7.0.0)",
+ org.junit.jupiter.params.provider;version="[6.0.0,7.0.0)",
+ org.junit.platform.commons.support;version="[6.0.0,7.0.0)"
 Automatic-Module-Name: org.eclipse.xtext.tests
diff --git a/org.eclipse.xtext.junit5.tests/about.html b/org.eclipse.xtext.junit6.tests/about.html
similarity index 100%
rename from org.eclipse.xtext.junit5.tests/about.html
rename to org.eclipse.xtext.junit6.tests/about.html
diff --git a/org.eclipse.xtext.junit5.tests/build.properties b/org.eclipse.xtext.junit6.tests/build.properties
similarity index 100%
rename from org.eclipse.xtext.junit5.tests/build.properties
rename to org.eclipse.xtext.junit6.tests/build.properties
diff --git a/org.eclipse.xtext.junit5.tests/plugin.properties b/org.eclipse.xtext.junit6.tests/plugin.properties
similarity index 73%
rename from org.eclipse.xtext.junit5.tests/plugin.properties
rename to org.eclipse.xtext.junit6.tests/plugin.properties
index 748f533509b..6f507b875f2 100644
--- a/org.eclipse.xtext.junit5.tests/plugin.properties
+++ b/org.eclipse.xtext.junit6.tests/plugin.properties
@@ -4,5 +4,5 @@
 #
 # $Id: plugin.properties,v 1.1 2010/02/04 09:24:52 sefftinge Exp $
 
-pluginName = Xtext Core Runtime JUnit 5 Tests
+pluginName = Xtext Core Runtime JUnit 6 Tests
 providerName = Eclipse Xtext
diff --git a/org.eclipse.xtext.junit5.tests/pom.xml b/org.eclipse.xtext.junit6.tests/pom.xml
similarity index 81%
rename from org.eclipse.xtext.junit5.tests/pom.xml
rename to org.eclipse.xtext.junit6.tests/pom.xml
index 7ab8fa62f1c..6c07d84d93d 100644
--- a/org.eclipse.xtext.junit5.tests/pom.xml
+++ b/org.eclipse.xtext.junit6.tests/pom.xml
@@ -6,11 +6,11 @@
 		<version>2.43.0-SNAPSHOT</version>
 		<relativePath>../org.eclipse.xtext.nodeploy.parent</relativePath>
 	</parent>
-	<artifactId>org.eclipse.xtext.junit5.tests</artifactId>
+	<artifactId>org.eclipse.xtext.junit6.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
 
-	<name>Xtext Core Runtime JUnit5 Tests</name>
-	<description>Xtext Core Runtime Junit5 Tests.</description>
+	<name>Xtext Core Runtime JUnit6 Tests</name>
+	<description>Xtext Core Runtime Junit6 Tests.</description>
 
 	<dependencies>
 		<dependency>
@@ -26,7 +26,7 @@
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
-					<providerHint>junit5</providerHint>
+					<providerHint>junit6</providerHint>
 				</configuration>
 			</plugin>
 		</plugins>
diff --git a/org.eclipse.xtext.junit5.tests/src/log4j.properties b/org.eclipse.xtext.junit6.tests/src/log4j.properties
similarity index 100%
rename from org.eclipse.xtext.junit5.tests/src/log4j.properties
rename to org.eclipse.xtext.junit6.tests/src/log4j.properties
diff --git a/org.eclipse.xtext.junit5.tests/src/org/eclipse/xtext/validation/junit5/FileAwareTestLanguageValidationJunit5Test.java b/org.eclipse.xtext.junit6.tests/src/org/eclipse/xtext/validation/junit6/FileAwareTestLanguageValidationJunit6Test.java
similarity index 89%
rename from org.eclipse.xtext.junit5.tests/src/org/eclipse/xtext/validation/junit5/FileAwareTestLanguageValidationJunit5Test.java
rename to org.eclipse.xtext.junit6.tests/src/org/eclipse/xtext/validation/junit6/FileAwareTestLanguageValidationJunit6Test.java
index 1cf79b3d309..24d60d30ed4 100644
--- a/org.eclipse.xtext.junit5.tests/src/org/eclipse/xtext/validation/junit5/FileAwareTestLanguageValidationJunit5Test.java
+++ b/org.eclipse.xtext.junit6.tests/src/org/eclipse/xtext/validation/junit6/FileAwareTestLanguageValidationJunit6Test.java
@@ -6,7 +6,7 @@
  * 
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package org.eclipse.xtext.validation.junit5;
+package org.eclipse.xtext.validation.junit6;
 
 import org.eclipse.xtext.testing.InjectWith;
 import org.eclipse.xtext.testing.extensions.InjectionExtension;
@@ -26,7 +26,7 @@
  */
 @ExtendWith(InjectionExtension.class)
 @InjectWith(FileAwareTestLanguageInjectorProvider.class)
-public class FileAwareTestLanguageValidationJunit5Test {
+public class FileAwareTestLanguageValidationJunit6Test {
 
 	@Inject
 	private ParseHelper<PackageDeclaration> parseHelper;
@@ -35,13 +35,13 @@ public class FileAwareTestLanguageValidationJunit5Test {
 	private ValidationTestHelper validationTestHelper;
 
 	@Test
-	public void testWithJunit5_01() throws Exception {
+	public void testWithJunit6_01() throws Exception {
 		PackageDeclaration model = parseHelper.parse("package x element Y {}");
 		validationTestHelper.assertNoIssues(model);
 	}
 
 	@Test
-	public void testWithJunit5_02() throws Exception {
+	public void testWithJunit6_02() throws Exception {
 		PackageDeclaration model = parseHelper.parse("package x element LetItFail {}");
 		validationTestHelper.assertWarning(model.eResource(), FileAwarePackage.Literals.ELEMENT,
 				FileAwareTestLanguageValidator.INVALID_NAME);
diff --git a/org.eclipse.xtext.junit5.tests/xtext.junit5.tests.launch b/org.eclipse.xtext.junit6.tests/xtext.junit6.tests.launch
similarity index 87%
rename from org.eclipse.xtext.junit5.tests/xtext.junit5.tests.launch
rename to org.eclipse.xtext.junit6.tests/xtext.junit6.tests.launch
index c7ba2d4b3b3..c85a499a92e 100644
--- a/org.eclipse.xtext.junit5.tests/xtext.junit5.tests.launch
+++ b/org.eclipse.xtext.junit6.tests/xtext.junit6.tests.launch
@@ -2,27 +2,27 @@
 <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.xtext.junit5.tests/src"/>
+        <listEntry value="/org.eclipse.xtext.junit6.tests/src"/>
     </listAttribute>
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
         <listEntry value="2"/>
     </listAttribute>
-    <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.xtext.junit5.tests/src=/test=/true=/"/>
+    <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.xtext.junit6.tests/src=/test=/true=/"/>
     <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.junit5"/>
+    <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit6"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
     <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"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
     <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry path=&quot;5&quot; projectName=&quot;org.eclipse.xtext.junit5.tests&quot; type=&quot;1&quot;/&gt;&#10;"/>
-        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.pde.core.requiredPlugins&quot; javaProject=&quot;org.eclipse.xtext.junit5.tests&quot; path=&quot;5&quot; type=&quot;4&quot;/&gt;&#10;"/>
+        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry path=&quot;5&quot; projectName=&quot;org.eclipse.xtext.junit6.tests&quot; type=&quot;1&quot;/&gt;&#10;"/>
+        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.pde.core.requiredPlugins&quot; javaProject=&quot;org.eclipse.xtext.junit6.tests&quot; path=&quot;5&quot; type=&quot;4&quot;/&gt;&#10;"/>
     </listAttribute>
     <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
     <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
     <listAttribute key="org.eclipse.jdt.launching.MODULEPATH"/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.xtext.junit5.tests"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.xtext.junit6.tests"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 </launchConfiguration>
diff --git a/org.eclipse.xtext.testing.junit5.tests/.classpath b/org.eclipse.xtext.testing.junit6.tests/.classpath
similarity index 100%
rename from org.eclipse.xtext.testing.junit5.tests/.classpath
rename to org.eclipse.xtext.testing.junit6.tests/.classpath
diff --git a/org.eclipse.xtext.testing.junit5.tests/.project b/org.eclipse.xtext.testing.junit6.tests/.project
similarity index 94%
rename from org.eclipse.xtext.testing.junit5.tests/.project
rename to org.eclipse.xtext.testing.junit6.tests/.project
index 0b56debe3b9..c8ae3a0b684 100644
--- a/org.eclipse.xtext.testing.junit5.tests/.project
+++ b/org.eclipse.xtext.testing.junit6.tests/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.xtext.testing.junit5.tests</name>
+	<name>org.eclipse.xtext.testing.junit6.tests</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.eclipse.xtext.testing.junit5.tests/.settings/org.eclipse.core.resources.prefs b/org.eclipse.xtext.testing.junit6.tests/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.xtext.testing.junit5.tests/.settings/org.eclipse.core.resources.prefs
rename to org.eclipse.xtext.testing.junit6.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.xtext.testing.junit5.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.testing.junit6.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.xtext.testing.junit5.tests/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipse.xtext.testing.junit6.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.xtext.testing.junit5.tests/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.xtext.testing.junit6.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from org.eclipse.xtext.testing.junit5.tests/.settings/org.eclipse.jdt.ui.prefs
rename to org.eclipse.xtext.testing.junit6.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/org.eclipse.xtext.testing.junit5.tests/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.xtext.testing.junit6.tests/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from org.eclipse.xtext.testing.junit5.tests/.settings/org.eclipse.m2e.core.prefs
rename to org.eclipse.xtext.testing.junit6.tests/.settings/org.eclipse.m2e.core.prefs
diff --git a/org.eclipse.xtext.testing.junit5.tests/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.xtext.testing.junit6.tests/.settings/org.eclipse.xtend.core.Xtend.prefs
similarity index 100%
rename from org.eclipse.xtext.testing.junit5.tests/.settings/org.eclipse.xtend.core.Xtend.prefs
rename to org.eclipse.xtext.testing.junit6.tests/.settings/org.eclipse.xtend.core.Xtend.prefs
diff --git a/org.eclipse.xtext.testing.junit5.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.testing.junit6.tests/META-INF/MANIFEST.MF
similarity index 62%
rename from org.eclipse.xtext.testing.junit5.tests/META-INF/MANIFEST.MF
rename to org.eclipse.xtext.testing.junit6.tests/META-INF/MANIFEST.MF
index 011684cc190..551d6d3c9e7 100644
--- a/org.eclipse.xtext.testing.junit5.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.testing.junit6.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Xtext Testing Infrastructure Junit 5 tests
-Bundle-SymbolicName: org.eclipse.xtext.testing.junit5.tests;singleton:=true
+Bundle-Name: Xtext Testing Infrastructure Junit 6 tests
+Bundle-SymbolicName: org.eclipse.xtext.testing.junit6.tests;singleton:=true
 Bundle-Version: 2.43.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Xtext
@@ -15,13 +15,13 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0";visibility:=reexport,
 Import-Package: jakarta.inject;version="2.0.1",
  org.apache.log4j;version="1.2.26",
  org.apache.log4j.spi;version="1.2.26",
- org.junit.jupiter.api;version="[5.1.0,6.0.0)",
- org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)",
- org.junit.jupiter.api.function;version="[5.1.0,6.0.0)",
- org.junit.jupiter.api.io;version="[5.1.0,6.0.0)",
- org.junit.jupiter.params;version="[5.1.0,6.0.0)",
- org.junit.jupiter.params.provider;version="[5.1.0,6.0.0)",
- org.junit.platform.commons.support;version="[1.0.0,2.0.0)";resolution:=optional
+ org.junit.jupiter.api;version="[6.0.0,7.0.0)",
+ org.junit.jupiter.api.extension;version="[6.0.0,7.0.0)",
+ org.junit.jupiter.api.function;version="[6.0.0,7.0.0)",
+ org.junit.jupiter.api.io;version="[6.0.0,7.0.0)",
+ org.junit.jupiter.params;version="[6.0.0,7.0.0)",
+ org.junit.jupiter.params.provider;version="[6.0.0,7.0.0)",
+ org.junit.platform.commons.support;version="[6.0.0,7.0.0)";resolution:=optional
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.xtext.testing
 Eclipse-SourceReferences: eclipseSourceReferences
diff --git a/org.eclipse.xtext.testing.junit5.tests/about.html b/org.eclipse.xtext.testing.junit6.tests/about.html
similarity index 100%
rename from org.eclipse.xtext.testing.junit5.tests/about.html
rename to org.eclipse.xtext.testing.junit6.tests/about.html
diff --git a/org.eclipse.xtext.testing.junit5.tests/build.properties b/org.eclipse.xtext.testing.junit6.tests/build.properties
similarity index 100%
rename from org.eclipse.xtext.testing.junit5.tests/build.properties
rename to org.eclipse.xtext.testing.junit6.tests/build.properties
diff --git a/org.eclipse.xtext.testing.junit5.tests/org.eclipse.xtext.testing.junit5.tests.launch b/org.eclipse.xtext.testing.junit6.tests/org.eclipse.xtext.testing.junit6.tests.launch
similarity index 88%
rename from org.eclipse.xtext.testing.junit5.tests/org.eclipse.xtext.testing.junit5.tests.launch
rename to org.eclipse.xtext.testing.junit6.tests/org.eclipse.xtext.testing.junit6.tests.launch
index 058b6b7f4bd..ec25422c09a 100644
--- a/org.eclipse.xtext.testing.junit5.tests/org.eclipse.xtext.testing.junit5.tests.launch
+++ b/org.eclipse.xtext.testing.junit6.tests/org.eclipse.xtext.testing.junit6.tests.launch
@@ -2,22 +2,22 @@
 <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.xtext.testing.junit5.tests"/>
+        <listEntry value="/org.eclipse.xtext.testing.junit6.tests"/>
     </listAttribute>
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
         <listEntry value="4"/>
     </listAttribute>
-    <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.xtext.testing.junit5.tests"/>
+    <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.xtext.testing.junit6.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.junit5"/>
+    <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit6"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
     <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"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
     <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.xtext.testing.junit5.tests"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.xtext.testing.junit6.tests"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
     <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
 </launchConfiguration>
diff --git a/org.eclipse.xtext.testing.junit5.tests/pom.xml b/org.eclipse.xtext.testing.junit6.tests/pom.xml
similarity index 88%
rename from org.eclipse.xtext.testing.junit5.tests/pom.xml
rename to org.eclipse.xtext.testing.junit6.tests/pom.xml
index 409dcbe6a13..abee25190db 100644
--- a/org.eclipse.xtext.testing.junit5.tests/pom.xml
+++ b/org.eclipse.xtext.testing.junit6.tests/pom.xml
@@ -8,10 +8,10 @@
 		<version>2.43.0-SNAPSHOT</version>
 		<relativePath>../org.eclipse.xtext.nodeploy.parent</relativePath>
 	</parent>
-	<artifactId>org.eclipse.xtext.testing.junit5.tests</artifactId>
+	<artifactId>org.eclipse.xtext.testing.junit6.tests</artifactId>
 	<packaging>eclipse-plugin</packaging>
 
-	<name>Junit 5 Tests for Xtext Testing Library</name>
+	<name>Junit 6 Tests for Xtext Testing Library</name>
 
 	<dependencies>
 		<dependency>
@@ -30,7 +30,7 @@
 					<failIfNoTests>true</failIfNoTests>
 				</configuration>
 				<dependencies>
-					<!-- force to run with JUnit5 -->
+					<!-- force to run with JUnit6 -->
 					<dependency>
 						<groupId>org.apache.maven.surefire</groupId>
 						<artifactId>surefire-junit-platform</artifactId>
diff --git a/org.eclipse.xtext.testing.junit5.tests/src/org/eclipse/xtext/testing/tests/junit5/AbstractJUnitIntegrationTest.java b/org.eclipse.xtext.testing.junit6.tests/src/org/eclipse/xtext/testing/tests/junit6/AbstractJUnitIntegrationTest.java
similarity index 95%
rename from org.eclipse.xtext.testing.junit5.tests/src/org/eclipse/xtext/testing/tests/junit5/AbstractJUnitIntegrationTest.java
rename to org.eclipse.xtext.testing.junit6.tests/src/org/eclipse/xtext/testing/tests/junit6/AbstractJUnitIntegrationTest.java
index 9a90e75a84f..1533fd7bedd 100644
--- a/org.eclipse.xtext.testing.junit5.tests/src/org/eclipse/xtext/testing/tests/junit5/AbstractJUnitIntegrationTest.java
+++ b/org.eclipse.xtext.testing.junit6.tests/src/org/eclipse/xtext/testing/tests/junit6/AbstractJUnitIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.eclipse.xtext.testing.tests.junit5;
+package org.eclipse.xtext.testing.tests.junit6;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -17,7 +17,7 @@
 
 /**
  * Base class for testing JUnit specific integration. For JUnit 4 this is the Test Runner {@link XtextRunner},
- * while JUnit 5 uses extensions, here the {@link InjectionExtension}.
+ * while JUnit 6 uses extensions, here the {@link InjectionExtension}.
  * <p>
  * Copied from initial XtextRunnerTest.
  * 
diff --git a/org.eclipse.xtext.testing.junit5.tests/src/org/eclipse/xtext/testing/tests/junit5/ComposedInject.java b/org.eclipse.xtext.testing.junit6.tests/src/org/eclipse/xtext/testing/tests/junit6/ComposedInject.java
similarity index 96%
rename from org.eclipse.xtext.testing.junit5.tests/src/org/eclipse/xtext/testing/tests/junit5/ComposedInject.java
rename to org.eclipse.xtext.testing.junit6.tests/src/org/eclipse/xtext/testing/tests/junit6/ComposedInject.java
index 016d789e355..38be229188f 100644
--- a/org.eclipse.xtext.testing.junit5.tests/src/org/eclipse/xtext/testing/tests/junit5/ComposedInject.java
+++ b/org.eclipse.xtext.testing.junit6.tests/src/org/eclipse/xtext/testing/tests/junit6/ComposedInject.java
@@ -6,7 +6,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package org.eclipse.xtext.testing.tests.junit5;
+package org.eclipse.xtext.testing.tests.junit6;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/org.eclipse.xtext.testing.junit5.tests/src/org/eclipse/xtext/testing/tests/junit5/ComposedInjectAnnotationTest.java b/org.eclipse.xtext.testing.junit6.tests/src/org/eclipse/xtext/testing/tests/junit6/ComposedInjectAnnotationTest.java
similarity index 95%
rename from org.eclipse.xtext.testing.junit5.tests/src/org/eclipse/xtext/testing/tests/junit5/ComposedInjectAnnotationTest.java
rename to org.eclipse.xtext.testing.junit6.tests/src/org/eclipse/xtext/testing/tests/junit6/ComposedInjectAnnotationTest.java
index 01f3bf1bd39..0a7b54c582c 100644
--- a/org.eclipse.xtext.testing.junit5.tests/src/org/eclipse/xtext/testing/tests/junit5/ComposedInjectAnnotationTest.java
+++ b/org.eclipse.xtext.testing.junit6.tests/src/org/eclipse/xtext/testing/tests/junit6/ComposedInjectAnnotationTest.java
@@ -6,7 +6,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package org.eclipse.xtext.testing.tests.junit5;
+package org.eclipse.xtext.testing.tests.junit6;
 
 import org.eclipse.xtext.testing.extensions.InjectionExtension;
 import org.junit.jupiter.api.Assertions;
diff --git a/org.eclipse.xtext.testing.junit5.tests/src/org/eclipse/xtext/testing/tests/junit5/InjectionExtensionNested2Test.java b/org.eclipse.xtext.testing.junit6.tests/src/org/eclipse/xtext/testing/tests/junit6/InjectionExtensionNested2Test.java
similarity index 97%
rename from org.eclipse.xtext.testing.junit5.tests/src/org/eclipse/xtext/testing/tests/junit5/InjectionExtensionNested2Test.java
rename to org.eclipse.xtext.testing.junit6.tests/src/org/eclipse/xtext/testing/tests/junit6/InjectionExtensionNested2Test.java
index 65f4c82d6c7..f84e708e732 100644
--- a/org.eclipse.xtext.testing.junit5.tests/src/org/eclipse/xtext/testing/tests/junit5/InjectionExtensionNested2Test.java
+++ b/org.eclipse.xtext.testing.junit6.tests/src/org/eclipse/xtext/testing/tests/junit6/InjectionExtensionNested2Test.java
@@ -6,7 +6,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package org.eclipse.xtext.testing.tests.junit5;
+package org.eclipse.xtext.testing.tests.junit6;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/org.eclipse.xtext.testing.junit5.tests/src/org/eclipse/xtext/testing/tests/junit5/InjectionExtensionNested3Test.java b/org.eclipse.xtext.testing.junit6.tests/src/org/eclipse/xtext/testing/tests/junit6/InjectionExtensionNested3Test.java
similarity index 97%
rename from org.eclipse.xtext.testing.junit5.tests/src/org/eclipse/xtext/testing/tests/junit5/InjectionExtensionNested3Test.java
rename to org.eclipse.xtext.testing.junit6.tests/src/org/eclipse/xtext/testing/tests/junit6/InjectionExtensionNested3Test.java
index 8dc6312d5d2..d7d18d326d8 100644
--- a/org.eclipse.xtext.testing.junit5.tests/src/org/eclipse/xtext/testing/tests/junit5/InjectionExtensionNested3Test.java
+++ b/org.eclipse.xtext.testing.junit6.tests/src/org/eclipse/xtext/testing/tests/junit6/InjectionExtensionNested3Test.java
@@ -6,7 +6,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package org.eclipse.xtext.testing.tests.junit5;
+package org.eclipse.xtext.testing.tests.junit6;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/org.eclipse.xtext.testing.junit5.tests/src/org/eclipse/xtext/testing/tests/junit5/InjectionExtensionNestedTest.java b/org.eclipse.xtext.testing.junit6.tests/src/org/eclipse/xtext/testing/tests/junit6/InjectionExtensionNestedTest.java
similarity index 97%
rename from org.eclipse.xtext.testing.junit5.tests/src/org/eclipse/xtext/testing/tests/junit5/InjectionExtensionNestedTest.java
rename to org.eclipse.xtext.testing.junit6.tests/src/org/eclipse/xtext/testing/tests/junit6/InjectionExtensionNestedTest.java
index f138fc0e5cc..d2ee91fb801 100644
--- a/org.eclipse.xtext.testing.junit5.tests/src/org/eclipse/xtext/testing/tests/junit5/InjectionExtensionNestedTest.java
+++ b/org.eclipse.xtext.testing.junit6.tests/src/org/eclipse/xtext/testing/tests/junit6/InjectionExtensionNestedTest.java
@@ -6,7 +6,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package org.eclipse.xtext.testing.tests.junit5;
+package org.eclipse.xtext.testing.tests.junit6;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -84,4 +84,4 @@ void innerTest() {
 			assertEquals(INJECTED, testValue2);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.xtext.testing.junit5.tests/src/org/eclipse/xtext/testing/tests/junit5/InjectionExtensionStaticInnerClassesTest.java b/org.eclipse.xtext.testing.junit6.tests/src/org/eclipse/xtext/testing/tests/junit6/InjectionExtensionStaticInnerClassesTest.java
similarity index 97%
rename from org.eclipse.xtext.testing.junit5.tests/src/org/eclipse/xtext/testing/tests/junit5/InjectionExtensionStaticInnerClassesTest.java
rename to org.eclipse.xtext.testing.junit6.tests/src/org/eclipse/xtext/testing/tests/junit6/InjectionExtensionStaticInnerClassesTest.java
index aa7c628aa3f..020fabaf84d 100644
--- a/org.eclipse.xtext.testing.junit5.tests/src/org/eclipse/xtext/testing/tests/junit5/InjectionExtensionStaticInnerClassesTest.java
+++ b/org.eclipse.xtext.testing.junit6.tests/src/org/eclipse/xtext/testing/tests/junit6/InjectionExtensionStaticInnerClassesTest.java
@@ -6,7 +6,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package org.eclipse.xtext.testing.tests.junit5;
+package org.eclipse.xtext.testing.tests.junit6;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -65,4 +65,4 @@ public Injector getInjector() {
 	
 	@Inject 
 	String testValue1 = NOT_INJECTED;
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.xtext.testing.junit5.tests/src/org/eclipse/xtext/testing/tests/junit5/InjectionExtensionTest.java b/org.eclipse.xtext.testing.junit6.tests/src/org/eclipse/xtext/testing/tests/junit6/InjectionExtensionTest.java
similarity index 97%
rename from org.eclipse.xtext.testing.junit5.tests/src/org/eclipse/xtext/testing/tests/junit5/InjectionExtensionTest.java
rename to org.eclipse.xtext.testing.junit6.tests/src/org/eclipse/xtext/testing/tests/junit6/InjectionExtensionTest.java
index 0483417ed87..070496681cc 100644
--- a/org.eclipse.xtext.testing.junit5.tests/src/org/eclipse/xtext/testing/tests/junit5/InjectionExtensionTest.java
+++ b/org.eclipse.xtext.testing.junit6.tests/src/org/eclipse/xtext/testing/tests/junit6/InjectionExtensionTest.java
@@ -6,7 +6,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package org.eclipse.xtext.testing.tests.junit5;
+package org.eclipse.xtext.testing.tests.junit6;
 
 import org.eclipse.xtext.testing.InjectWith;
 import org.eclipse.xtext.testing.extensions.InjectionExtension;
diff --git a/org.eclipse.xtext.testing.tests/src/org/eclipse/xtext/testing/tests/AbstractJUnitIntegrationTest.java b/org.eclipse.xtext.testing.tests/src/org/eclipse/xtext/testing/tests/AbstractJUnitIntegrationTest.java
index 3cfe604bd16..57534b4c335 100644
--- a/org.eclipse.xtext.testing.tests/src/org/eclipse/xtext/testing/tests/AbstractJUnitIntegrationTest.java
+++ b/org.eclipse.xtext.testing.tests/src/org/eclipse/xtext/testing/tests/AbstractJUnitIntegrationTest.java
@@ -25,7 +25,7 @@
 
 /**
  * Base class for testing JUnit specific integration. For JUnit 4 this is the Test Runner {@link XtextRunner},
- * while JUnit 5 uses extensions, here the {@link InjectionExtension}.
+ * while JUnit 6 uses extensions, here the {@link InjectionExtension}.
  * <p>
  * Copied from initial XtextRunnerTest.
  * 
diff --git a/org.eclipse.xtext.testing/META-INF/MANIFEST.MF b/org.eclipse.xtext.testing/META-INF/MANIFEST.MF
index 63e1d6c2a05..77233b24ff8 100644
--- a/org.eclipse.xtext.testing/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.testing/META-INF/MANIFEST.MF
@@ -26,13 +26,13 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0";visibility:=reexport,
  org.eclipse.xtend.lib;bundle-version="2.43.0"
 Import-Package: org.apache.log4j;version="1.2.26",
  org.apache.log4j.spi;version="1.2.26",
- org.junit.jupiter.api;version="[5.1.0,6.0.0)",
- org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)",
- org.junit.jupiter.api.function;version="[5.1.0,6.0.0)",
- org.junit.jupiter.api.io;version="[5.1.0,6.0.0)",
- org.junit.jupiter.params;version="[5.1.0,6.0.0)",
- org.junit.jupiter.params.provider;version="[5.1.0,6.0.0)",
- org.junit.platform.commons.support;version="[1.0.0,2.0.0)";resolution:=optional
+ org.junit.jupiter.api;version="[6.0.0,7.0.0)",
+ org.junit.jupiter.api.extension;version="[6.0.0,7.0.0)",
+ org.junit.jupiter.api.function;version="[6.0.0,7.0.0)",
+ org.junit.jupiter.api.io;version="[6.0.0,7.0.0)",
+ org.junit.jupiter.params;version="[6.0.0,7.0.0)",
+ org.junit.jupiter.params.provider;version="[6.0.0,7.0.0)",
+ org.junit.platform.commons.support;version="[6.0.0,7.0.0)";resolution:=optional
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.xtext.testing
 Eclipse-SourceReferences: eclipseSourceReferences
diff --git a/org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/AbstractXtextTests.java b/org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/AbstractXtextTests.java
index 1c203bed67c..273f8f6d7dd 100644
--- a/org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/AbstractXtextTests.java
+++ b/org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/AbstractXtextTests.java
@@ -71,7 +71,7 @@
  * New tests should be implemented using the {@link InjectWith} annotation, and
  * the generated {@link IInjectorProvider} and {@link RunWith} with
  * {@link XtextRunner}, for JUnit 4, and {@link ExtendWith} with
- * {@link InjectionExtension}, for JUnit 5.
+ * {@link InjectionExtension}, for JUnit 6.
  * 
  * @author Sven Efftinge - Initial contribution and API
  * @since 2.35
diff --git a/org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/extensions/InjectionExtension.java b/org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/extensions/InjectionExtension.java
index 9c1805eaa95..0396eaea0dd 100644
--- a/org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/extensions/InjectionExtension.java
+++ b/org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/extensions/InjectionExtension.java
@@ -29,13 +29,13 @@
 import com.google.inject.Injector;
 
 /**
- * Use this extension together with {@link InjectWith} for JUnit 5 based Xtext
+ * Use this extension together with {@link InjectWith} for JUnit 6 based Xtext
  * tests.
  * <p>
  * The extension retrieves an {@link Injector} to inject members in the instance
  * under test before best execution and resets registries after execution.
  * </p>
- * It takes care about JUnit5 {@link Nested nested} test classes. They are inner classes that might
+ * It takes care about JUnit6 {@link Nested nested} test classes. They are inner classes that might
  * be annotated as well and must be handled for injection.
  * </p>
  * 
diff --git a/org.eclipse.xtext.tests/pom.xml b/org.eclipse.xtext.tests/pom.xml
index 232ffdb2f2f..d770b9165e3 100644
--- a/org.eclipse.xtext.tests/pom.xml
+++ b/org.eclipse.xtext.tests/pom.xml
@@ -17,7 +17,7 @@
 	(configured in the parent POM).
 	In Tycho 2.7.5, no further configuration is needed besides marking the
 	folders containing tests as test source folders.
-	(you can still force JUnit5 as done below)
+	(you can still force JUnit6 as done below)
 	Moreover, the packaging type must be "eclipse-plugin".
 	-->
 
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/cli/CliWizardIntegrationTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/cli/CliWizardIntegrationTest.java
index 6ca9a7a2c45..11d5822ac15 100644
--- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/cli/CliWizardIntegrationTest.java
+++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/cli/CliWizardIntegrationTest.java
@@ -139,7 +139,7 @@ public static void main(String[] args) {
 				project.getIdeProject().setEnabled(true);
 				project.getWebProject().setEnabled(true);
 			}), CliWizardIntegrationTest.newProjectConfig(project -> {
-				project.setBaseName("mavenTychoJUnit5");
+				project.setBaseName("mavenTychoJUnit6");
 				project.setPreferredBuildSystem(BuildSystem.MAVEN);
 				project.setSourceLayout(SourceLayout.PLAIN);
 				project.setProjectLayout(ProjectLayout.HIERARCHICAL);
@@ -148,7 +148,7 @@ public static void main(String[] args) {
 				project.getUiProject().getTestProject().setEnabled(true);
 				project.getIdeProject().setEnabled(true);
 				project.getWebProject().setEnabled(true);
-				project.setJunitVersion(JUnitVersion.JUNIT_5);
+				project.setJunitVersion(JUnitVersion.JUNIT_6);
 			}), CliWizardIntegrationTest.newProjectConfig(project -> {
 				project.setBaseName("gradle");
 				project.setPreferredBuildSystem(BuildSystem.GRADLE);
@@ -157,7 +157,7 @@ public static void main(String[] args) {
 				project.getRuntimeProject().getTestProject().setEnabled(true);
 				project.getIdeProject().setEnabled(true);
 				project.getWebProject().setEnabled(true);
-				project.setJunitVersion(JUnitVersion.JUNIT_5);
+				project.setJunitVersion(JUnitVersion.JUNIT_6);
 			}), CliWizardIntegrationTest.newProjectConfig(project -> {
 				project.setBaseName("eclipsePlugin");
 				project.setPreferredBuildSystem(BuildSystem.NONE);
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/gradle/src/main/java/mydsl/GenerateMyDsl.mwe2 b/org.eclipse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/gradle/src/main/java/mydsl/GenerateMyDsl.mwe2
index e57fcadce77..cadf4534e7d 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/gradle/src/main/java/mydsl/GenerateMyDsl.mwe2
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/gradle/src/main/java/mydsl/GenerateMyDsl.mwe2
@@ -47,7 +47,7 @@ Workflow {
 				generateXtendStub = true
 			}
 			junitSupport = {
-				junitVersion = "5"
+				junitVersion = "6"
 			}
 		}
 	}
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 9c4fc45f374..00000000000
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: mavenTychoJUnit5.tests
-Bundle-Vendor: My Company
-Bundle-Version: 1.0.0.qualifier
-Bundle-SymbolicName: mavenTychoJUnit5.tests; singleton:=true
-Bundle-ActivationPolicy: lazy
-Require-Bundle: mavenTychoJUnit5,
- org.eclipse.xtext.testing,
- org.eclipse.xtext.xbase.testing
-Import-Package: org.junit.jupiter.api;version="[5.1.0,6.0.0)",
- org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
-Automatic-Module-Name: mavenTychoJUnit5.tests
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.ide/META-INF/MANIFEST.MF
similarity index 57%
rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ide/META-INF/MANIFEST.MF
rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.ide/META-INF/MANIFEST.MF
index 695e14bfbf5..42e35e51a48 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ide/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.ide/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: mavenTychoJUnit5.ide
+Bundle-Name: mavenTychoJUnit6.ide
 Bundle-Vendor: My Company
 Bundle-Version: 1.0.0.qualifier
-Bundle-SymbolicName: mavenTychoJUnit5.ide; singleton:=true
+Bundle-SymbolicName: mavenTychoJUnit6.ide; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: mavenTychoJUnit5,
+Require-Bundle: mavenTychoJUnit6,
  org.eclipse.xtext.ide,
  org.eclipse.xtext.xbase.ide
 Bundle-RequiredExecutionEnvironment: JavaSE-21
-Automatic-Module-Name: mavenTychoJUnit5.ide
+Automatic-Module-Name: mavenTychoJUnit6.ide
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ide/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.ide/build.properties
similarity index 100%
rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ide/build.properties
rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.ide/build.properties
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ide/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.ide/pom.xml
similarity index 78%
rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ide/pom.xml
rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.ide/pom.xml
index 25f2b004c64..8f3df8f2004 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ide/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.ide/pom.xml
@@ -2,11 +2,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>mavenTychoJUnit5</groupId>
-		<artifactId>mavenTychoJUnit5.parent</artifactId>
+		<groupId>mavenTychoJUnit6</groupId>
+		<artifactId>mavenTychoJUnit6.parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>mavenTychoJUnit5.ide</artifactId>
+	<artifactId>mavenTychoJUnit6.ide</artifactId>
 	<packaging>eclipse-plugin</packaging>
 
 	<build>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.target/mavenTychoJUnit5.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.target/mavenTychoJUnit6.target.target
similarity index 75%
rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.target/mavenTychoJUnit5.target.target
rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.target/mavenTychoJUnit6.target.target
index 3ea9a5150a8..c999e3f01dd 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.target/mavenTychoJUnit5.target.target
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.target/mavenTychoJUnit6.target.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="mavenTychoJUnit5.target" sequenceNumber="1">
+<target name="mavenTychoJUnit6.target" sequenceNumber="1">
 	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -29,17 +29,15 @@
 			<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
 			<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
 			<unit id="org.apiguardian.api" version="0.0.0"/>
-			<unit id="junit-jupiter-api" version="[5.0.0,6.0.0)"/>
-			<unit id="junit-jupiter-engine" version="[5.0.0,6.0.0)"/>
-			<unit id="junit-jupiter-migrationsupport" version="[5.0.0,6.0.0)"/>
-			<unit id="junit-jupiter-params" version="[5.0.0,6.0.0)"/>
-			<unit id="junit-platform-commons" version="[1.0.0,2.0.0)"/>
-			<unit id="junit-platform-engine" version="[1.0.0,2.0.0)"/>
-			<unit id="junit-platform-launcher" version="[1.0.0,2.0.0)"/>
-			<unit id="junit-platform-runner" version="[1.0.0,2.0.0)"/>
-			<unit id="junit-platform-suite-api" version="[1.0.0,2.0.0)"/>
-			<unit id="junit-platform-suite-commons" version="[1.0.0,2.0.0)"/>
-			<unit id="junit-vintage-engine" version="[5.0.0,6.0.0)"/>
+			<unit id="junit-jupiter-api" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-jupiter-engine" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-jupiter-migrationsupport" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-jupiter-params" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-platform-commons" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-platform-engine" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-platform-launcher" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-platform-suite-api" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-vintage-engine" version="[6.0.0,7.0.0)"/>
 			<unit id="org.opentest4j" version="0.0.0"/>
 			<unit id="org.objectweb.asm" version="9.9.1"/>
 			<unit id="io.github.classgraph.classgraph" version="0.0.0"/>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.target/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.target/pom.xml
similarity index 73%
rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.target/pom.xml
rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.target/pom.xml
index 96846a124a0..01406169313 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.target/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.target/pom.xml
@@ -2,11 +2,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>mavenTychoJUnit5</groupId>
-		<artifactId>mavenTychoJUnit5.parent</artifactId>
+		<groupId>mavenTychoJUnit6</groupId>
+		<artifactId>mavenTychoJUnit6.parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>mavenTychoJUnit5.target</artifactId>
+	<artifactId>mavenTychoJUnit6.target</artifactId>
 	<packaging>eclipse-target-definition</packaging>
 
 
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.tests/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..3769e1fb264
--- /dev/null
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: mavenTychoJUnit6.tests
+Bundle-Vendor: My Company
+Bundle-Version: 1.0.0.qualifier
+Bundle-SymbolicName: mavenTychoJUnit6.tests; singleton:=true
+Bundle-ActivationPolicy: lazy
+Require-Bundle: mavenTychoJUnit6,
+ org.eclipse.xtext.testing,
+ org.eclipse.xtext.xbase.testing
+Import-Package: org.junit.jupiter.api;version="[6.0.0,7.0.0)",
+ org.junit.jupiter.api.extension;version="[6.0.0,7.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-21
+Automatic-Module-Name: mavenTychoJUnit6.tests
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.tests/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.tests/build.properties
similarity index 100%
rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.tests/build.properties
rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.tests/build.properties
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.tests/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.tests/pom.xml
similarity index 78%
rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.tests/pom.xml
rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.tests/pom.xml
index 85ee5154ba1..efdce1f66b3 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.tests/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.tests/pom.xml
@@ -2,11 +2,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>mavenTychoJUnit5</groupId>
-		<artifactId>mavenTychoJUnit5.parent</artifactId>
+		<groupId>mavenTychoJUnit6</groupId>
+		<artifactId>mavenTychoJUnit6.parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>mavenTychoJUnit5.tests</artifactId>
+	<artifactId>mavenTychoJUnit6.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.ui.tests/META-INF/MANIFEST.MF
similarity index 50%
rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui.tests/META-INF/MANIFEST.MF
rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.ui.tests/META-INF/MANIFEST.MF
index 04e6a7877ca..f01d7373ad7 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.ui.tests/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: mavenTychoJUnit5.ui.tests
+Bundle-Name: mavenTychoJUnit6.ui.tests
 Bundle-Vendor: My Company
 Bundle-Version: 1.0.0.qualifier
-Bundle-SymbolicName: mavenTychoJUnit5.ui.tests; singleton:=true
+Bundle-SymbolicName: mavenTychoJUnit6.ui.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: mavenTychoJUnit5.ui,
+Require-Bundle: mavenTychoJUnit6.ui,
  org.eclipse.xtext.testing,
  org.eclipse.xtext.ui.testing,
  org.eclipse.xtext.xbase.testing,
  org.eclipse.xtext.xbase.ui.testing
-Import-Package: org.junit.jupiter.api;version="[5.1.0,6.0.0)",
- org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)"
+Import-Package: org.junit.jupiter.api;version="[6.0.0,7.0.0)",
+ org.junit.jupiter.api.extension;version="[6.0.0,7.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-21
-Automatic-Module-Name: mavenTychoJUnit5.ui.tests
+Automatic-Module-Name: mavenTychoJUnit6.ui.tests
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui.tests/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.ui.tests/build.properties
similarity index 100%
rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui.tests/build.properties
rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.ui.tests/build.properties
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui.tests/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.ui.tests/pom.xml
similarity index 83%
rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui.tests/pom.xml
rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.ui.tests/pom.xml
index 2c9112eb5d0..5187d2d24af 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui.tests/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.ui.tests/pom.xml
@@ -2,11 +2,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>mavenTychoJUnit5</groupId>
-		<artifactId>mavenTychoJUnit5.parent</artifactId>
+		<groupId>mavenTychoJUnit6</groupId>
+		<artifactId>mavenTychoJUnit6.parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>mavenTychoJUnit5.ui.tests</artifactId>
+	<artifactId>mavenTychoJUnit6.ui.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.ui/META-INF/MANIFEST.MF
similarity index 68%
rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui/META-INF/MANIFEST.MF
rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.ui/META-INF/MANIFEST.MF
index 2d61f05627a..57ea9286835 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.ui/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: mavenTychoJUnit5.ui
+Bundle-Name: mavenTychoJUnit6.ui
 Bundle-Vendor: My Company
 Bundle-Version: 1.0.0.qualifier
-Bundle-SymbolicName: mavenTychoJUnit5.ui; singleton:=true
+Bundle-SymbolicName: mavenTychoJUnit6.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: mavenTychoJUnit5,
- mavenTychoJUnit5.ide,
+Require-Bundle: mavenTychoJUnit6,
+ mavenTychoJUnit6.ide,
  org.eclipse.xtext.ui,
  org.eclipse.xtext.ui.shared,
  org.eclipse.xtext.ui.codetemplates.ui,
@@ -14,4 +14,4 @@ Require-Bundle: mavenTychoJUnit5,
  org.eclipse.ui.ide;bundle-version="3.18.500"
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-21
-Automatic-Module-Name: mavenTychoJUnit5.ui
+Automatic-Module-Name: mavenTychoJUnit6.ui
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.ui/build.properties
similarity index 100%
rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui/build.properties
rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.ui/build.properties
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.ui/pom.xml
similarity index 79%
rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui/pom.xml
rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.ui/pom.xml
index f86770252aa..4c95fbd21e6 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.ui/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.ui/pom.xml
@@ -2,11 +2,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>mavenTychoJUnit5</groupId>
-		<artifactId>mavenTychoJUnit5.parent</artifactId>
+		<groupId>mavenTychoJUnit6</groupId>
+		<artifactId>mavenTychoJUnit6.parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>mavenTychoJUnit5.ui</artifactId>
+	<artifactId>mavenTychoJUnit6.ui</artifactId>
 	<packaging>eclipse-plugin</packaging>
 
 	<build>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.web/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.web/pom.xml
similarity index 93%
rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.web/pom.xml
rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.web/pom.xml
index 23752492afc..90e1270a488 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.web/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.web/pom.xml
@@ -2,11 +2,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>mavenTychoJUnit5</groupId>
-		<artifactId>mavenTychoJUnit5.parent</artifactId>
+		<groupId>mavenTychoJUnit6</groupId>
+		<artifactId>mavenTychoJUnit6.parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>mavenTychoJUnit5.web</artifactId>
+	<artifactId>mavenTychoJUnit6.web</artifactId>
 	<packaging>war</packaging>
 
 	<build>
@@ -76,12 +76,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>mavenTychoJUnit5</artifactId>
+			<artifactId>mavenTychoJUnit6</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>mavenTychoJUnit5.ide</artifactId>
+			<artifactId>mavenTychoJUnit6.ide</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch
similarity index 63%
rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch
rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch
index 168c8ee3568..ea1ca9a0dbe 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch	
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.emf.mwe2.launch.Mwe2LaunchConfigurationType">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/mavenTychoJUnit5"/>
+<listEntry value="/mavenTychoJUnit6"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>
@@ -10,9 +10,9 @@
 <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit5.parent&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit5&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit5.ide&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit5.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit5.web&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit5.target&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit5.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit5.ui.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit5.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit5.ui.tests&quot; type=&quot;4&quot;/&gt;&#10;;&lt;/resources&gt;}"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit6.parent&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit6&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit6.ide&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit6.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit6.web&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit6.target&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit6.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit6.ui.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit6.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/mavenTychoJUnit6.ui.tests&quot; type=&quot;4&quot;/&gt;&#10;;&lt;/resources&gt;}"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="mydsl.GenerateMyDsl"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="mavenTychoJUnit5"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="mavenTychoJUnit6"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/>
 </launchConfiguration>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/.launch/Launch Runtime Eclipse.launch b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6/.launch/Launch Runtime Eclipse.launch
similarity index 99%
rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/.launch/Launch Runtime Eclipse.launch
rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6/.launch/Launch Runtime Eclipse.launch
index 7a7dad28edb..9cb491e979a 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/.launch/Launch Runtime Eclipse.launch	
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6/.launch/Launch Runtime Eclipse.launch	
@@ -4,7 +4,7 @@
 <booleanAttribute key="askclear" value="true"/>
 <booleanAttribute key="automaticAdd" value="true"/>
 <booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bad_container_name" value="/mavenTychoJUnit5/.launch/"/>
+<stringAttribute key="bad_container_name" value="/mavenTychoJUnit6/.launch/"/>
 <stringAttribute key="bootstrap" value=""/>
 <stringAttribute key="checked" value="[NONE]"/>
 <booleanAttribute key="clearConfig" value="true"/>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6/META-INF/MANIFEST.MF
similarity index 70%
rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/META-INF/MANIFEST.MF
rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6/META-INF/MANIFEST.MF
index ccaef190593..502f7aaed75 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: mavenTychoJUnit5
+Bundle-Name: mavenTychoJUnit6
 Bundle-Vendor: My Company
 Bundle-Version: 1.0.0.qualifier
-Bundle-SymbolicName: mavenTychoJUnit5; singleton:=true
+Bundle-SymbolicName: mavenTychoJUnit6; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext,
  org.eclipse.xtext.xbase,
  org.eclipse.equinox.common;bundle-version="3.19.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-21
-Automatic-Module-Name: mavenTychoJUnit5
+Automatic-Module-Name: mavenTychoJUnit6
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6/build.properties
similarity index 100%
rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/build.properties
rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6/build.properties
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6/pom.xml
similarity index 83%
rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/pom.xml
rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6/pom.xml
index 9962f0541fc..1319a536ba5 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6/pom.xml
@@ -2,11 +2,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>mavenTychoJUnit5</groupId>
-		<artifactId>mavenTychoJUnit5.parent</artifactId>
+		<groupId>mavenTychoJUnit6</groupId>
+		<artifactId>mavenTychoJUnit6.parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>mavenTychoJUnit5</artifactId>
+	<artifactId>mavenTychoJUnit6</artifactId>
 	<packaging>eclipse-plugin</packaging>
 
 	<build>
@@ -55,37 +55,37 @@
 				<configuration>
 					<filesets combine.children="append">
 						<fileset>
-							<directory>${basedir}/../mavenTychoJUnit5/src-gen/</directory>
+							<directory>${basedir}/../mavenTychoJUnit6/src-gen/</directory>
 							<includes>
 								<include>**/*</include>
 							</includes>
 						</fileset>
 						<fileset>
-							<directory>${basedir}/../mavenTychoJUnit5.tests/src-gen/</directory>
+							<directory>${basedir}/../mavenTychoJUnit6.tests/src-gen/</directory>
 							<includes>
 								<include>**/*</include>
 							</includes>
 						</fileset>
 						<fileset>
-							<directory>${basedir}/../mavenTychoJUnit5.ide/src-gen/</directory>
+							<directory>${basedir}/../mavenTychoJUnit6.ide/src-gen/</directory>
 							<includes>
 								<include>**/*</include>
 							</includes>
 						</fileset>
 						<fileset>
-							<directory>${basedir}/../mavenTychoJUnit5.ui/src-gen/</directory>
+							<directory>${basedir}/../mavenTychoJUnit6.ui/src-gen/</directory>
 							<includes>
 								<include>**/*</include>
 							</includes>
 						</fileset>
 						<fileset>
-							<directory>${basedir}/../mavenTychoJUnit5.ui.tests/src-gen/</directory>
+							<directory>${basedir}/../mavenTychoJUnit6.ui.tests/src-gen/</directory>
 							<includes>
 								<include>**/*</include>
 							</includes>
 						</fileset>
 						<fileset>
-							<directory>${basedir}/../mavenTychoJUnit5.web/src-gen/</directory>
+							<directory>${basedir}/../mavenTychoJUnit6.web/src-gen/</directory>
 							<includes>
 								<include>**/*</include>
 							</includes>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/src/mydsl/GenerateMyDsl.mwe2 b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6/src/mydsl/GenerateMyDsl.mwe2
similarity index 95%
rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/src/mydsl/GenerateMyDsl.mwe2
rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6/src/mydsl/GenerateMyDsl.mwe2
index 2e292080ce6..4d08563e246 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/src/mydsl/GenerateMyDsl.mwe2
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6/src/mydsl/GenerateMyDsl.mwe2
@@ -10,7 +10,7 @@ Workflow {
 	component = XtextGenerator {
 		configuration = {
 			project = StandardProjectConfig {
-				baseName = "mavenTychoJUnit5"
+				baseName = "mavenTychoJUnit6"
 				rootPath = rootPath
 				runtimeTest = {
 					enabled = true
@@ -53,7 +53,7 @@ Workflow {
 				generateXtendStub = true
 			}
 			junitSupport = {
-				junitVersion = "5"
+				junitVersion = "6"
 			}
 		}
 	}
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/src/mydsl/MyDsl.xtext b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6/src/mydsl/MyDsl.xtext
similarity index 100%
rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5/src/mydsl/MyDsl.xtext
rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6/src/mydsl/MyDsl.xtext
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/pom.xml
similarity index 94%
rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/pom.xml
rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/pom.xml
index bec94807c41..7eb3efcb909 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/pom.xml
@@ -1,9 +1,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>mavenTychoJUnit5</groupId>
+	<groupId>mavenTychoJUnit6</groupId>
 	<version>1.0.0-SNAPSHOT</version>
-	<artifactId>mavenTychoJUnit5.parent</artifactId>
+	<artifactId>mavenTychoJUnit6.parent</artifactId>
 	<packaging>pom</packaging>
 
 	<properties>
@@ -20,13 +20,13 @@
 		<additionalTestArguments></additionalTestArguments>
 	</properties>
 	<modules>
-		<module>mavenTychoJUnit5</module>
-		<module>mavenTychoJUnit5.ide</module>
-		<module>mavenTychoJUnit5.ui</module>
-		<module>mavenTychoJUnit5.web</module>
-		<module>mavenTychoJUnit5.target</module>
-		<module>mavenTychoJUnit5.tests</module>
-		<module>mavenTychoJUnit5.ui.tests</module>
+		<module>mavenTychoJUnit6</module>
+		<module>mavenTychoJUnit6.ide</module>
+		<module>mavenTychoJUnit6.ui</module>
+		<module>mavenTychoJUnit6.web</module>
+		<module>mavenTychoJUnit6.target</module>
+		<module>mavenTychoJUnit6.tests</module>
+		<module>mavenTychoJUnit6.ui.tests</module>
 	</modules>
 	<dependencyManagement>
 		<dependencies>
@@ -54,8 +54,8 @@
 				<configuration>
 					<target>
 						<artifact>
-							<groupId>mavenTychoJUnit5</groupId>
-							<artifactId>mavenTychoJUnit5.target</artifactId>
+							<groupId>mavenTychoJUnit6</groupId>
+							<artifactId>mavenTychoJUnit6.target</artifactId>
 							<version>${project.version}</version>
 						</artifact>
 					</target>
diff --git a/org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF
index b891162c04f..18b78629b80 100644
--- a/org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Import-Package: org.apache.log4j;version="1.2.26";resolution:=optional,
  org.junit;version="4.13.2",
  org.junit.internal;version="4.13.2",
  org.junit.internal.builders;version="4.13.2",
- org.junit.jupiter.api;version="[5.0.0,6.0.0)";resolution:=optional,
+ org.junit.jupiter.api;version="[6.0.0,7.0.0)";resolution:=optional,
  org.junit.rules;version="4.13.2";resolution:=optional,
  org.junit.runner;version="4.13.2",
  org.junit.runner.manipulation;version="4.13.2",
diff --git a/org.eclipse.xtext.util/src/org/eclipse/xtext/util/JUnitVersion.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/JUnitVersion.java
index 092ae9a77b9..042ccfde3af 100644
--- a/org.eclipse.xtext.util/src/org/eclipse/xtext/util/JUnitVersion.java
+++ b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/JUnitVersion.java
@@ -13,7 +13,7 @@
  * @since 2.14
  */
 public enum JUnitVersion {
-	JUNIT_4 (4), JUNIT_5 (5);
+	JUNIT_4 (4), JUNIT_6 (6);
 	
 	public static JUnitVersion DEFAULT = JUNIT_4;
 	
@@ -30,7 +30,7 @@ public int getVersion () {
 	public static JUnitVersion fromString (String version) {
 		switch (version) {
 		case "4": return JUNIT_4;
-		case "5": return JUNIT_5;
+		case "6": return JUNIT_6;
 		}
 		throw new IllegalArgumentException(version);
 	}
diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/JUnitFragment.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/JUnitFragment.xtend
index 31f0c703e57..3df92e6b271 100644
--- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/JUnitFragment.xtend
+++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/JUnitFragment.xtend
@@ -116,18 +116,18 @@ class JUnitFragment extends AbstractStubGeneratingFragment {
 		val parseHelper = new TypeReference(testingPackage + ".util.ParseHelper")
 		val test = switch (junitVersion) {
 			case JUnitVersion.JUNIT_4: new TypeReference("org.junit.Test")
-			case JUnitVersion.JUNIT_5: new TypeReference("org.junit.jupiter.api.Test")
+			case JUnitVersion.JUNIT_6: new TypeReference("org.junit.jupiter.api.Test")
 		}
 		val assert = switch (junitVersion) {
 			case JUnitVersion.JUNIT_4: new TypeReference("org.junit.Assert")
-			case JUnitVersion.JUNIT_5: new TypeReference("org.junit.jupiter.api.Assertions")
+			case JUnitVersion.JUNIT_6: new TypeReference("org.junit.jupiter.api.Assertions")
 		}
 		val rootType = new TypeReference(grammar.rules.head.type.classifier as EClass, grammar.eResource.resourceSet)
 		return fileAccessFactory.createXtendFile(exampleRuntimeTest, '''
 			�IF junitVersion==JUnitVersion.JUNIT_4�
 				@�runWith�(�xtextRunner�)
 			�ENDIF�
-			�IF junitVersion==JUnitVersion.JUNIT_5�
+			�IF junitVersion==JUnitVersion.JUNIT_6�
 				@�extendWith�(�injectionExtension�)
 			�ENDIF�
 			@�injectWith�(�injectorProvider�)
@@ -145,7 +145,7 @@ class JUnitFragment extends AbstractStubGeneratingFragment {
 					�IF junitVersion==JUnitVersion.JUNIT_4�
 						�assert�.assertTrue(''��'Unexpected errors: �"\u00AB"�errors.join(", ")�"\u00BB"�''��', errors.isEmpty)
 					�ENDIF�
-					�IF junitVersion==JUnitVersion.JUNIT_5�
+					�IF junitVersion==JUnitVersion.JUNIT_6�
 						�assert�.assertTrue(errors.isEmpty, ''��'Unexpected errors: �"\u00AB"�errors.join(", ")�"\u00BB"�''��')
 					�ENDIF�
 				}
@@ -162,11 +162,11 @@ class JUnitFragment extends AbstractStubGeneratingFragment {
 		val parseHelper = new TypeReference(testingPackage + ".util.ParseHelper")
 		val test = switch (junitVersion) {
 			case JUnitVersion.JUNIT_4: new TypeReference("org.junit.Test")
-			case JUnitVersion.JUNIT_5: new TypeReference("org.junit.jupiter.api.Test")
+			case JUnitVersion.JUNIT_6: new TypeReference("org.junit.jupiter.api.Test")
 		}
 		val assert = switch (junitVersion) {
 			case JUnitVersion.JUNIT_4: new TypeReference("org.junit.Assert")
-			case JUnitVersion.JUNIT_5: new TypeReference("org.junit.jupiter.api.Assertions")
+			case JUnitVersion.JUNIT_6: new TypeReference("org.junit.jupiter.api.Assertions")
 		}
 		val rootType = new TypeReference(grammar.rules.head.type.classifier as EClass, grammar.eResource.resourceSet)
 		val list = new TypeReference("java.util.List")
@@ -176,7 +176,7 @@ class JUnitFragment extends AbstractStubGeneratingFragment {
 			�IF junitVersion==JUnitVersion.JUNIT_4�
 				@�runWith�(�xtextRunner�.class)
 			�ENDIF�
-			�IF junitVersion==JUnitVersion.JUNIT_5�
+			�IF junitVersion==JUnitVersion.JUNIT_6�
 				@�extendWith�(�injectionExtension�.class)
 			�ENDIF�
 			@�injectWith�(�injectorProvider�.class)
@@ -192,7 +192,7 @@ class JUnitFragment extends AbstractStubGeneratingFragment {
 					�IF junitVersion==JUnitVersion.JUNIT_4�
 						�assert�.assertTrue("Unexpected errors: " + �iterableExtensions�.join(errors, ", "), errors.isEmpty());
 					�ENDIF�
-					�IF junitVersion==JUnitVersion.JUNIT_5�
+					�IF junitVersion==JUnitVersion.JUNIT_6�
 						�assert�.assertTrue(errors.isEmpty(), "Unexpected errors: " + �iterableExtensions�.join(errors, ", "));
 					�ENDIF�
 				}
diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/JUnitFragment.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/JUnitFragment.java
index 759f290ec77..20601bb1ad1 100644
--- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/JUnitFragment.java
+++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/JUnitFragment.java
@@ -162,7 +162,7 @@ protected JavaFileAccess generateExampleRuntimeTest() {
         case JUNIT_4:
           _switchResult = new TypeReference("org.junit.Test");
           break;
-        case JUNIT_5:
+        case JUNIT_6:
           _switchResult = new TypeReference("org.junit.jupiter.api.Test");
           break;
         default:
@@ -177,7 +177,7 @@ protected JavaFileAccess generateExampleRuntimeTest() {
         case JUNIT_4:
           _switchResult_1 = new TypeReference("org.junit.Assert");
           break;
-        case JUNIT_5:
+        case JUNIT_6:
           _switchResult_1 = new TypeReference("org.junit.jupiter.api.Assertions");
           break;
         default:
@@ -204,7 +204,7 @@ protected void appendTo(StringConcatenationClient.TargetStringConcatenation _bui
           }
         }
         {
-          boolean _equals_1 = Objects.equals(JUnitFragment.this.junitVersion, JUnitVersion.JUNIT_5);
+          boolean _equals_1 = Objects.equals(JUnitFragment.this.junitVersion, JUnitVersion.JUNIT_6);
           if (_equals_1) {
             _builder.append("@");
             _builder.append(extendWith);
@@ -279,7 +279,7 @@ protected void appendTo(StringConcatenationClient.TargetStringConcatenation _bui
           }
         }
         {
-          boolean _equals_3 = Objects.equals(JUnitFragment.this.junitVersion, JUnitVersion.JUNIT_5);
+          boolean _equals_3 = Objects.equals(JUnitFragment.this.junitVersion, JUnitVersion.JUNIT_6);
           if (_equals_3) {
             _builder.append("\t\t");
             _builder.append(assert_, "\t\t");
@@ -323,7 +323,7 @@ protected JavaFileAccess generateJavaExampleRuntimeTest() {
         case JUNIT_4:
           _switchResult = new TypeReference("org.junit.Test");
           break;
-        case JUNIT_5:
+        case JUNIT_6:
           _switchResult = new TypeReference("org.junit.jupiter.api.Test");
           break;
         default:
@@ -338,7 +338,7 @@ protected JavaFileAccess generateJavaExampleRuntimeTest() {
         case JUNIT_4:
           _switchResult_1 = new TypeReference("org.junit.Assert");
           break;
-        case JUNIT_5:
+        case JUNIT_6:
           _switchResult_1 = new TypeReference("org.junit.jupiter.api.Assertions");
           break;
         default:
@@ -368,7 +368,7 @@ protected void appendTo(StringConcatenationClient.TargetStringConcatenation _bui
           }
         }
         {
-          boolean _equals_1 = Objects.equals(JUnitFragment.this.junitVersion, JUnitVersion.JUNIT_5);
+          boolean _equals_1 = Objects.equals(JUnitFragment.this.junitVersion, JUnitVersion.JUNIT_6);
           if (_equals_1) {
             _builder.append("@");
             _builder.append(extendWith);
@@ -435,7 +435,7 @@ protected void appendTo(StringConcatenationClient.TargetStringConcatenation _bui
           }
         }
         {
-          boolean _equals_3 = Objects.equals(JUnitFragment.this.junitVersion, JUnitVersion.JUNIT_5);
+          boolean _equals_3 = Objects.equals(JUnitFragment.this.junitVersion, JUnitVersion.JUNIT_6);
           if (_equals_3) {
             _builder.append("\t\t");
             _builder.append(assert_, "\t\t");
diff --git a/org.eclipse.xtext.xtext.ui/src/org/eclipse/xtext/xtext/ui/wizard/project/AdvancedNewProjectPage.java b/org.eclipse.xtext.xtext.ui/src/org/eclipse/xtext/xtext/ui/wizard/project/AdvancedNewProjectPage.java
index 403080105fa..8aaaebfe1e9 100644
--- a/org.eclipse.xtext.xtext.ui/src/org/eclipse/xtext/xtext/ui/wizard/project/AdvancedNewProjectPage.java
+++ b/org.eclipse.xtext.xtext.ui/src/org/eclipse/xtext/xtext/ui/wizard/project/AdvancedNewProjectPage.java
@@ -56,7 +56,7 @@ public class AdvancedNewProjectPage extends WizardPage {
 
 	private Button junitVersion4;
 
-	private Button junitVersion5;
+	private Button junitVersion6;
 
 	private Combo preferredBuildSystem;
 
@@ -122,9 +122,9 @@ public void createControl(Composite parent) {
 				button.setSelection(false);
 			});
 
-			junitVersion5 = Radio(childComposite, (button) -> {
+			junitVersion6 = Radio(childComposite, (button) -> {
 				button.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
-				button.setText("5");
+				button.setText("6");
 				button.setSelection(true);
 			});
 		});
@@ -239,7 +239,7 @@ public void widgetSelected(SelectionEvent e) {
 			public void widgetSelected(SelectionEvent e) {
 				boolean enabled = createTestProject.getSelection() == true;
 				junitVersion4.setEnabled(enabled);
-				junitVersion5.setEnabled(enabled);
+				junitVersion6.setEnabled(enabled);
 				validate(e);
 			}
 		});
@@ -483,8 +483,8 @@ public LanguageServer getLanguageServer() {
 	public JUnitVersion getSelectedJUnitVersion() {
 		if (junitVersion4.getSelection()) {
 			return JUnitVersion.JUNIT_4;
-		} else if (junitVersion5.getSelection()) {
-			return JUnitVersion.JUNIT_5;
+		} else if (junitVersion6.getSelection()) {
+			return JUnitVersion.JUNIT_6;
 		} else {
 			throw new IllegalStateException("JUnit version could not be determined");
 		}
diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend
index 6d31c5439f4..0ab4979fca1 100644
--- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend
+++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend
@@ -263,9 +263,9 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
 						generator = {
 							generateXtendStub = true
 						}
-						�IF config.junitVersion == JUnitVersion.JUNIT_5�
+						�IF config.junitVersion == JUnitVersion.JUNIT_6�
 							junitSupport = {
-								junitVersion = "5"
+								junitVersion = "6"
 							}
 						�ENDIF�
 					}
diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend
index eff12b23210..cc3412ccee1 100644
--- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend
+++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend
@@ -95,19 +95,17 @@ class TargetPlatformProject extends ProjectDescriptor {
 					<unit id="org.hamcrest" version="2.2.0"/>
 					<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
 					<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
-					�IF config.junitVersion == JUnitVersion.JUNIT_5�
+					�IF config.junitVersion == JUnitVersion.JUNIT_6�
 						<unit id="org.apiguardian.api" version="0.0.0"/>
-						<unit id="junit-jupiter-api" version="[5.0.0,6.0.0)"/>
-						<unit id="junit-jupiter-engine" version="[5.0.0,6.0.0)"/>
-						<unit id="junit-jupiter-migrationsupport" version="[5.0.0,6.0.0)"/>
-						<unit id="junit-jupiter-params" version="[5.0.0,6.0.0)"/>
-						<unit id="junit-platform-commons" version="[1.0.0,2.0.0)"/>
-						<unit id="junit-platform-engine" version="[1.0.0,2.0.0)"/>
-						<unit id="junit-platform-launcher" version="[1.0.0,2.0.0)"/>
-						<unit id="junit-platform-runner" version="[1.0.0,2.0.0)"/>
-						<unit id="junit-platform-suite-api" version="[1.0.0,2.0.0)"/>
-						<unit id="junit-platform-suite-commons" version="[1.0.0,2.0.0)"/>
-						<unit id="junit-vintage-engine" version="[5.0.0,6.0.0)"/>
+						<unit id="junit-jupiter-api" version="[6.0.0,7.0.0)"/>
+						<unit id="junit-jupiter-engine" version="[6.0.0,7.0.0)"/>
+						<unit id="junit-jupiter-migrationsupport" version="[6.0.0,7.0.0)"/>
+						<unit id="junit-jupiter-params" version="[6.0.0,7.0.0)"/>
+						<unit id="junit-platform-commons" version="[6.0.0,7.0.0)"/>
+						<unit id="junit-platform-engine" version="[6.0.0,7.0.0)"/>
+						<unit id="junit-platform-launcher" version="[6.0.0,7.0.0)"/>
+						<unit id="junit-platform-suite-api" version="[6.0.0,7.0.0)"/>
+						<unit id="junit-vintage-engine" version="[6.0.0,7.0.0)"/>
 						<unit id="org.opentest4j" version="0.0.0"/>
 					�ENDIF�
 					<unit id="org.objectweb.asm" version="9.9.1"/>
diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TestProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TestProjectDescriptor.xtend
index 51db4d986e3..521354c6c24 100644
--- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TestProjectDescriptor.xtend
+++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TestProjectDescriptor.xtend
@@ -58,13 +58,13 @@ abstract class TestProjectDescriptor extends ProjectDescriptor {
 				maven.scope = Scope.TESTCOMPILE
 			]
 		}
-		if (config.junitVersion == JUnitVersion.JUNIT_5) {
+		if (config.junitVersion == JUnitVersion.JUNIT_6) {
 			deps += new ExternalDependency()=>[
 				p2.packages = Sets.newLinkedHashSet => [
-					it += 'org.junit.jupiter.api;version="[5.1.0,6.0.0)"'
-					it += 'org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)"'
+					it += 'org.junit.jupiter.api;version="[6.0.0,7.0.0)"'
+					it += 'org.junit.jupiter.api.extension;version="[6.0.0,7.0.0)"'
 				]
-				p2.version = "[5.1.0,6.0.0)"
+				p2.version = "[6.0.0,7.0.0)"
 				maven.groupId = "org.junit.jupiter"
 				maven.artifactId = "junit-jupiter-api"
 				maven.scope = Scope.TESTCOMPILE
@@ -158,7 +158,7 @@ abstract class TestProjectDescriptor extends ProjectDescriptor {
 	
 	override buildGradle() {
 		super.buildGradle => [
-			if (config.junitVersion == JUnitVersion.JUNIT_5) {
+			if (config.junitVersion == JUnitVersion.JUNIT_6) {
 				additionalContent = '''
 					test {
 						useJUnitPlatform()
diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/cli/CliProjectsCreatorMain.java b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/cli/CliProjectsCreatorMain.java
index 91afe7f7e28..3b56fc598e8 100644
--- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/cli/CliProjectsCreatorMain.java
+++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/cli/CliProjectsCreatorMain.java
@@ -80,7 +80,7 @@ public enum ProjectType {
 	private JavaVersion javaVersion = JavaVersion.JAVA21;
 
 	@Option(name = "-junitVersion", usage = "JUnit Version", handler = OptionHandlers.JUnitVersionOptionHandler.class)
-	private JUnitVersion junitVersion = JUnitVersion.JUNIT_5;
+	private JUnitVersion junitVersion = JUnitVersion.JUNIT_6;
 
 	@Option(name = "-lineDelimiter", usage = "Line delimiter style", handler = OptionHandlers.LineDelimiterOptionHandler.class)
 	private LineDelimiter delimiter = LineDelimiter.UNIX;
diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java
index a4ba260df62..fb058411ce9 100644
--- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java
+++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java
@@ -548,7 +548,7 @@ public CharSequence workflow() {
     _builder.newLine();
     {
       JUnitVersion _junitVersion = this.getConfig().getJunitVersion();
-      boolean _equals_1 = Objects.equals(_junitVersion, JUnitVersion.JUNIT_5);
+      boolean _equals_1 = Objects.equals(_junitVersion, JUnitVersion.JUNIT_6);
       if (_equals_1) {
         _builder.append("\t\t\t");
         _builder.append("junitSupport = {");
diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java
index 4e1241fca27..83f7ce9e0d3 100644
--- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java
+++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java
@@ -213,43 +213,37 @@ public CharSequence target() {
     _builder.newLine();
     {
       JUnitVersion _junitVersion = this.getConfig().getJunitVersion();
-      boolean _equals = Objects.equals(_junitVersion, JUnitVersion.JUNIT_5);
+      boolean _equals = Objects.equals(_junitVersion, JUnitVersion.JUNIT_6);
       if (_equals) {
         _builder.append("\t\t\t");
         _builder.append("<unit id=\"org.apiguardian.api\" version=\"0.0.0\"/>");
         _builder.newLine();
         _builder.append("\t\t\t");
-        _builder.append("<unit id=\"junit-jupiter-api\" version=\"[5.0.0,6.0.0)\"/>");
+        _builder.append("<unit id=\"junit-jupiter-api\" version=\"[6.0.0,7.0.0)\"/>");
         _builder.newLine();
         _builder.append("\t\t\t");
-        _builder.append("<unit id=\"junit-jupiter-engine\" version=\"[5.0.0,6.0.0)\"/>");
+        _builder.append("<unit id=\"junit-jupiter-engine\" version=\"[6.0.0,7.0.0)\"/>");
         _builder.newLine();
         _builder.append("\t\t\t");
-        _builder.append("<unit id=\"junit-jupiter-migrationsupport\" version=\"[5.0.0,6.0.0)\"/>");
+        _builder.append("<unit id=\"junit-jupiter-migrationsupport\" version=\"[6.0.0,7.0.0)\"/>");
         _builder.newLine();
         _builder.append("\t\t\t");
-        _builder.append("<unit id=\"junit-jupiter-params\" version=\"[5.0.0,6.0.0)\"/>");
+        _builder.append("<unit id=\"junit-jupiter-params\" version=\"[6.0.0,7.0.0)\"/>");
         _builder.newLine();
         _builder.append("\t\t\t");
-        _builder.append("<unit id=\"junit-platform-commons\" version=\"[1.0.0,2.0.0)\"/>");
+        _builder.append("<unit id=\"junit-platform-commons\" version=\"[6.0.0,7.0.0)\"/>");
         _builder.newLine();
         _builder.append("\t\t\t");
-        _builder.append("<unit id=\"junit-platform-engine\" version=\"[1.0.0,2.0.0)\"/>");
+        _builder.append("<unit id=\"junit-platform-engine\" version=\"[6.0.0,7.0.0)\"/>");
         _builder.newLine();
         _builder.append("\t\t\t");
-        _builder.append("<unit id=\"junit-platform-launcher\" version=\"[1.0.0,2.0.0)\"/>");
+        _builder.append("<unit id=\"junit-platform-launcher\" version=\"[6.0.0,7.0.0)\"/>");
         _builder.newLine();
         _builder.append("\t\t\t");
-        _builder.append("<unit id=\"junit-platform-runner\" version=\"[1.0.0,2.0.0)\"/>");
+        _builder.append("<unit id=\"junit-platform-suite-api\" version=\"[6.0.0,7.0.0)\"/>");
         _builder.newLine();
         _builder.append("\t\t\t");
-        _builder.append("<unit id=\"junit-platform-suite-api\" version=\"[1.0.0,2.0.0)\"/>");
-        _builder.newLine();
-        _builder.append("\t\t\t");
-        _builder.append("<unit id=\"junit-platform-suite-commons\" version=\"[1.0.0,2.0.0)\"/>");
-        _builder.newLine();
-        _builder.append("\t\t\t");
-        _builder.append("<unit id=\"junit-vintage-engine\" version=\"[5.0.0,6.0.0)\"/>");
+        _builder.append("<unit id=\"junit-vintage-engine\" version=\"[6.0.0,7.0.0)\"/>");
         _builder.newLine();
         _builder.append("\t\t\t");
         _builder.append("<unit id=\"org.opentest4j\" version=\"0.0.0\"/>");
diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TestProjectDescriptor.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TestProjectDescriptor.java
index 89b0c75fb3e..a48d4867998 100644
--- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TestProjectDescriptor.java
+++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TestProjectDescriptor.java
@@ -94,20 +94,20 @@ public Set<ExternalDependency> getExternalDependencies() {
       deps.add(_doubleArrow);
     }
     JUnitVersion _junitVersion_1 = this.getConfig().getJunitVersion();
-    boolean _equals_1 = Objects.equals(_junitVersion_1, JUnitVersion.JUNIT_5);
+    boolean _equals_1 = Objects.equals(_junitVersion_1, JUnitVersion.JUNIT_6);
     if (_equals_1) {
       ExternalDependency _externalDependency_1 = new ExternalDependency();
       final Procedure1<ExternalDependency> _function_1 = (ExternalDependency it) -> {
         ExternalDependency.P2Coordinates _p2 = it.getP2();
         LinkedHashSet<String> _newLinkedHashSet = Sets.<String>newLinkedHashSet();
         final Procedure1<LinkedHashSet<String>> _function_2 = (LinkedHashSet<String> it_1) -> {
-          it_1.add("org.junit.jupiter.api;version=\"[5.1.0,6.0.0)\"");
-          it_1.add("org.junit.jupiter.api.extension;version=\"[5.1.0,6.0.0)\"");
+          it_1.add("org.junit.jupiter.api;version=\"[6.0.0,7.0.0)\"");
+          it_1.add("org.junit.jupiter.api.extension;version=\"[6.0.0,7.0.0)\"");
         };
         LinkedHashSet<String> _doubleArrow_1 = ObjectExtensions.<LinkedHashSet<String>>operator_doubleArrow(_newLinkedHashSet, _function_2);
         _p2.setPackages(_doubleArrow_1);
         ExternalDependency.P2Coordinates _p2_1 = it.getP2();
-        _p2_1.setVersion("[5.1.0,6.0.0)");
+        _p2_1.setVersion("[6.0.0,7.0.0)");
         ExternalDependency.MavenCoordinates _maven = it.getMaven();
         _maven.setGroupId("org.junit.jupiter");
         ExternalDependency.MavenCoordinates _maven_1 = it.getMaven();
@@ -397,7 +397,7 @@ public GradleBuildFile buildGradle() {
     GradleBuildFile _buildGradle = super.buildGradle();
     final Procedure1<GradleBuildFile> _function = (GradleBuildFile it) -> {
       JUnitVersion _junitVersion = this.getConfig().getJunitVersion();
-      boolean _equals = Objects.equals(_junitVersion, JUnitVersion.JUNIT_5);
+      boolean _equals = Objects.equals(_junitVersion, JUnitVersion.JUNIT_6);
       if (_equals) {
         StringConcatenation _builder = new StringConcatenation();
         _builder.append("test {");
diff --git a/pom.xml b/pom.xml
index e5966922a6b..69eb076c39f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -500,7 +500,7 @@
 									org.eclipse.xtext.java.tests
 								</excludeArtifact>
 								<excludeArtifact>
-									org.eclipse.xtext.junit5.tests
+									org.eclipse.xtext.junit6.tests
 								</excludeArtifact>
 								<excludeArtifact>
 									org.eclipse.xtext.logging
@@ -539,7 +539,7 @@
 									org.eclipse.xtext.sdk
 								</excludeArtifact>
 								<excludeArtifact>
-									org.eclipse.xtext.testing.junit5.tests
+									org.eclipse.xtext.testing.junit6.tests
 								</excludeArtifact>
 								<excludeArtifact>
 									org.eclipse.xtext.testing.tests
@@ -799,7 +799,7 @@
 					<configuration>
 						<!--
 						The Surefire Plugin excludes nested classes by default: http://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#excludes
-						By removing all default exclusions the nested classes get executed too, JUnit 4 and JUnit 5.
+						By removing all default exclusions the nested classes get executed too, JUnit 4 and JUnit 6.
 						-->
 						<excludes>
 							<exclude />
@@ -908,7 +908,7 @@
 					<configuration>
 						<!--
 						The Tycho Surefire Plugin excludes nested classes by default: https://tycho.eclipseprojects.io/doc/latest/tycho-surefire-plugin/test-mojo.html#excludes
-						By removing all default exclusions the nested classes get executed too, JUnit 4 and JUnit 5.
+						By removing all default exclusions the nested classes get executed too, JUnit 4 and JUnit 6.
 						-->
 						<excludes>
 							<exclude />
diff --git a/xtext-latest.target b/xtext-latest.target
index 4f0e8a403dc..72f8b5b4640 100644
--- a/xtext-latest.target
+++ b/xtext-latest.target
@@ -64,17 +64,15 @@
 			<unit id="org.hamcrest" version="2.2.0"/>
 			<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
 			<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
-			<unit id="junit-jupiter-api" version="[5.0.0,6.0.0)"/>
-			<unit id="junit-jupiter-engine" version="[5.0.0,6.0.0)"/>
-			<unit id="junit-jupiter-migrationsupport" version="[5.0.0,6.0.0)"/>
-			<unit id="junit-jupiter-params" version="[5.0.0,6.0.0)"/>
-			<unit id="junit-platform-commons" version="[1.0.0,2.0.0)"/>
-			<unit id="junit-platform-engine" version="[1.0.0,2.0.0)"/>
-			<unit id="junit-platform-launcher" version="[1.0.0,2.0.0)"/>
-			<unit id="junit-platform-runner" version="[1.0.0,2.0.0)"/>
-			<unit id="junit-platform-suite-api" version="[1.0.0,2.0.0)"/>
-			<unit id="junit-platform-suite-commons" version="[1.0.0,2.0.0)"/>
-			<unit id="junit-vintage-engine" version="[5.0.0,6.0.0)"/>
+			<unit id="junit-jupiter-api" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-jupiter-engine" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-jupiter-migrationsupport" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-jupiter-params" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-platform-commons" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-platform-engine" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-platform-launcher" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-platform-suite-api" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-vintage-engine" version="[6.0.0,7.0.0)"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
diff --git a/xtext-r202512.target b/xtext-r202512.target
index 159a3f37ec4..65acb01dc7e 100644
--- a/xtext-r202512.target
+++ b/xtext-r202512.target
@@ -61,17 +61,15 @@
 			<unit id="org.hamcrest" version="2.2.0"/>
 			<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
 			<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
-			<unit id="junit-jupiter-api" version="[5.0.0,6.0.0)"/>
-			<unit id="junit-jupiter-engine" version="[5.0.0,6.0.0)"/>
-			<unit id="junit-jupiter-migrationsupport" version="[5.0.0,6.0.0)"/>
-			<unit id="junit-jupiter-params" version="[5.0.0,6.0.0)"/>
-			<unit id="junit-platform-commons" version="[1.0.0,2.0.0)"/>
-			<unit id="junit-platform-engine" version="[1.0.0,2.0.0)"/>
-			<unit id="junit-platform-launcher" version="[1.0.0,2.0.0)"/>
-			<unit id="junit-platform-runner" version="[1.0.0,2.0.0)"/>
-			<unit id="junit-platform-suite-api" version="[1.0.0,2.0.0)"/>
-			<unit id="junit-platform-suite-commons" version="[1.0.0,2.0.0)"/>
-			<unit id="junit-vintage-engine" version="[5.0.0,6.0.0)"/>
+			<unit id="junit-jupiter-api" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-jupiter-engine" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-jupiter-migrationsupport" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-jupiter-params" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-platform-commons" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-platform-engine" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-platform-launcher" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-platform-suite-api" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-vintage-engine" version="[6.0.0,7.0.0)"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
diff --git a/xtext-r202603.target b/xtext-r202603.target
index b66d4fcfc2b..ce927dfac82 100644
--- a/xtext-r202603.target
+++ b/xtext-r202603.target
@@ -61,17 +61,15 @@
 			<unit id="org.hamcrest" version="2.2.0"/>
 			<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
 			<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
-			<unit id="junit-jupiter-api" version="[5.0.0,6.0.0)"/>
-			<unit id="junit-jupiter-engine" version="[5.0.0,6.0.0)"/>
-			<unit id="junit-jupiter-migrationsupport" version="[5.0.0,6.0.0)"/>
-			<unit id="junit-jupiter-params" version="[5.0.0,6.0.0)"/>
-			<unit id="junit-platform-commons" version="[1.0.0,2.0.0)"/>
-			<unit id="junit-platform-engine" version="[1.0.0,2.0.0)"/>
-			<unit id="junit-platform-launcher" version="[1.0.0,2.0.0)"/>
-			<unit id="junit-platform-runner" version="[1.0.0,2.0.0)"/>
-			<unit id="junit-platform-suite-api" version="[1.0.0,2.0.0)"/>
-			<unit id="junit-platform-suite-commons" version="[1.0.0,2.0.0)"/>
-			<unit id="junit-vintage-engine" version="[5.0.0,6.0.0)"/>
+			<unit id="junit-jupiter-api" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-jupiter-engine" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-jupiter-migrationsupport" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-jupiter-params" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-platform-commons" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-platform-engine" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-platform-launcher" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-platform-suite-api" version="[6.0.0,7.0.0)"/>
+			<unit id="junit-vintage-engine" version="[6.0.0,7.0.0)"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>