diff --git a/.idea/libraries/junit5_rt.xml b/.idea/libraries/junit5_rt.xml
index 161d9c08db9d..147dce75d02b 100644
--- a/.idea/libraries/junit5_rt.xml
+++ b/.idea/libraries/junit5_rt.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="junit5_rt">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-jupiter-engine-5.0.0-M5.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-platform-commons-1.0.0-M5.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-platform-engine-1.0.0-M5.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-platform-launcher-1.0.0-M5.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-platform-runner-1.0.0-M5.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-vintage-engine-4.12.0-M5.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-platform-suite-api-1.0.0-M5.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-jupiter-engine-5.0.0-M6.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-platform-commons-1.0.0-M6.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-platform-engine-1.0.0-M6.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-platform-launcher-1.0.0-M6.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-platform-runner-1.0.0-M6.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-vintage-engine-4.12.0-M6.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-platform-suite-api-1.0.0-M6.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
index 1826c62fc363..240c69c80691 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
@@ -203,7 +203,7 @@ class CommunityRepositoryModules {
       withModule("junit5_rt", "junit5-rt.jar")
       withProjectLibrary("junit5_rt")
       withProjectLibrary("opentest4j")
-      withModuleLibrary("junit-jupiter-api-5.0.0-M5.jar", "junit5_rt_tests", "")
+      withModuleLibrary("junit-jupiter-api-5.0.0-M6.jar", "junit5_rt_tests", "")
     },
     plugin("ByteCodeViewer") {
       mainJarName = "byteCodeViewer.jar"
diff --git a/plugins/junit5_rt/lib/junit-jupiter-api-5.0.0-M5.jar b/plugins/junit5_rt/lib/junit-jupiter-api-5.0.0-M6.jar
similarity index 72%
rename from plugins/junit5_rt/lib/junit-jupiter-api-5.0.0-M5.jar
rename to plugins/junit5_rt/lib/junit-jupiter-api-5.0.0-M6.jar
index af08e296fc41..e4b141cdd76b 100644
Binary files a/plugins/junit5_rt/lib/junit-jupiter-api-5.0.0-M5.jar and b/plugins/junit5_rt/lib/junit-jupiter-api-5.0.0-M6.jar differ
diff --git a/plugins/junit5_rt/lib/junit-jupiter-engine-5.0.0-M5.jar b/plugins/junit5_rt/lib/junit-jupiter-engine-5.0.0-M5.jar
deleted file mode 100644
index 3f8240cb9961..000000000000
Binary files a/plugins/junit5_rt/lib/junit-jupiter-engine-5.0.0-M5.jar and /dev/null differ
diff --git a/plugins/junit5_rt/lib/junit-jupiter-engine-5.0.0-M6.jar b/plugins/junit5_rt/lib/junit-jupiter-engine-5.0.0-M6.jar
new file mode 100644
index 000000000000..5826a375d828
Binary files /dev/null and b/plugins/junit5_rt/lib/junit-jupiter-engine-5.0.0-M6.jar differ
diff --git a/plugins/junit5_rt/lib/junit-platform-commons-1.0.0-M5.jar b/plugins/junit5_rt/lib/junit-platform-commons-1.0.0-M6.jar
similarity index 50%
rename from plugins/junit5_rt/lib/junit-platform-commons-1.0.0-M5.jar
rename to plugins/junit5_rt/lib/junit-platform-commons-1.0.0-M6.jar
index da76b255f119..ac647a643ba1 100644
Binary files a/plugins/junit5_rt/lib/junit-platform-commons-1.0.0-M5.jar and b/plugins/junit5_rt/lib/junit-platform-commons-1.0.0-M6.jar differ
diff --git a/plugins/junit5_rt/lib/junit-platform-engine-1.0.0-M5.jar b/plugins/junit5_rt/lib/junit-platform-engine-1.0.0-M6.jar
similarity index 79%
rename from plugins/junit5_rt/lib/junit-platform-engine-1.0.0-M5.jar
rename to plugins/junit5_rt/lib/junit-platform-engine-1.0.0-M6.jar
index 2a5e612dede0..18e44255052f 100644
Binary files a/plugins/junit5_rt/lib/junit-platform-engine-1.0.0-M5.jar and b/plugins/junit5_rt/lib/junit-platform-engine-1.0.0-M6.jar differ
diff --git a/plugins/junit5_rt/lib/junit-platform-launcher-1.0.0-M5.jar b/plugins/junit5_rt/lib/junit-platform-launcher-1.0.0-M6.jar
similarity index 85%
rename from plugins/junit5_rt/lib/junit-platform-launcher-1.0.0-M5.jar
rename to plugins/junit5_rt/lib/junit-platform-launcher-1.0.0-M6.jar
index 515e3e9cf14b..b2e7f16c1267 100644
Binary files a/plugins/junit5_rt/lib/junit-platform-launcher-1.0.0-M5.jar and b/plugins/junit5_rt/lib/junit-platform-launcher-1.0.0-M6.jar differ
diff --git a/plugins/junit5_rt/lib/junit-platform-runner-1.0.0-M5.jar b/plugins/junit5_rt/lib/junit-platform-runner-1.0.0-M6.jar
similarity index 91%
rename from plugins/junit5_rt/lib/junit-platform-runner-1.0.0-M5.jar
rename to plugins/junit5_rt/lib/junit-platform-runner-1.0.0-M6.jar
index f175e0147c00..011655f7ff60 100644
Binary files a/plugins/junit5_rt/lib/junit-platform-runner-1.0.0-M5.jar and b/plugins/junit5_rt/lib/junit-platform-runner-1.0.0-M6.jar differ
diff --git a/plugins/junit5_rt/lib/junit-platform-suite-api-1.0.0-M5.jar b/plugins/junit5_rt/lib/junit-platform-suite-api-1.0.0-M6.jar
similarity index 79%
rename from plugins/junit5_rt/lib/junit-platform-suite-api-1.0.0-M5.jar
rename to plugins/junit5_rt/lib/junit-platform-suite-api-1.0.0-M6.jar
index aed01b1fc024..176d1f455938 100644
Binary files a/plugins/junit5_rt/lib/junit-platform-suite-api-1.0.0-M5.jar and b/plugins/junit5_rt/lib/junit-platform-suite-api-1.0.0-M6.jar differ
diff --git a/plugins/junit5_rt/lib/junit-vintage-engine-4.12.0-M5.jar b/plugins/junit5_rt/lib/junit-vintage-engine-4.12.0-M5.jar
deleted file mode 100644
index 35b8ca28856a..000000000000
Binary files a/plugins/junit5_rt/lib/junit-vintage-engine-4.12.0-M5.jar and /dev/null differ
diff --git a/plugins/junit5_rt/lib/junit-vintage-engine-4.12.0-M6.jar b/plugins/junit5_rt/lib/junit-vintage-engine-4.12.0-M6.jar
new file mode 100644
index 000000000000..bdf196e00102
Binary files /dev/null and b/plugins/junit5_rt/lib/junit-vintage-engine-4.12.0-M6.jar differ
diff --git a/plugins/junit5_rt/lib/opentest4j-1.0.0-M2.jar b/plugins/junit5_rt/lib/opentest4j-1.0.0-M3.jar
similarity index 78%
rename from plugins/junit5_rt/lib/opentest4j-1.0.0-M2.jar
rename to plugins/junit5_rt/lib/opentest4j-1.0.0-M3.jar
index 7543a8068ff4..0e75e84fd8a6 100644
Binary files a/plugins/junit5_rt/lib/opentest4j-1.0.0-M2.jar and b/plugins/junit5_rt/lib/opentest4j-1.0.0-M3.jar differ
diff --git a/plugins/junit5_rt_tests/junit5_rt_tests.iml b/plugins/junit5_rt_tests/junit5_rt_tests.iml
index a94ebeec6293..b32d02f7429d 100644
--- a/plugins/junit5_rt_tests/junit5_rt_tests.iml
+++ b/plugins/junit5_rt_tests/junit5_rt_tests.iml
@@ -10,7 +10,7 @@
     <orderEntry type="module-library" scope="TEST">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../junit5_rt/lib/junit-jupiter-api-5.0.0-M5.jar!/" />
+          <root url="jar://$MODULE_DIR$/../junit5_rt/lib/junit-jupiter-api-5.0.0-M6.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/plugins/junit5_rt_tests/test/com/intellij/junit4/JUnit5IntegrationTest.java b/plugins/junit5_rt_tests/test/com/intellij/junit4/JUnit5IntegrationTest.java
index dca986a9f0d3..0a0a27bce2a5 100644
--- a/plugins/junit5_rt_tests/test/com/intellij/junit4/JUnit5IntegrationTest.java
+++ b/plugins/junit5_rt_tests/test/com/intellij/junit4/JUnit5IntegrationTest.java
@@ -209,7 +209,7 @@ public class JUnit5IntegrationTest extends JUnitAbstractCompilingIntegrationTest
   @Override
   protected JpsMavenRepositoryLibraryDescriptor[] getRequiredLibs() {
     return new JpsMavenRepositoryLibraryDescriptor[] {
-      new JpsMavenRepositoryLibraryDescriptor("org.junit.jupiter", "junit-jupiter-api", "5.0.0-M5"),
+      new JpsMavenRepositoryLibraryDescriptor("org.junit.jupiter", "junit-jupiter-api", "5.0.0-M6"),
       new JpsMavenRepositoryLibraryDescriptor("junit", "junit", "4.12")
     };
   }
diff --git a/plugins/junit5_rt_tests/test/com/intellij/junit5/JUnit5EventsTest.java b/plugins/junit5_rt_tests/test/com/intellij/junit5/JUnit5EventsTest.java
index e1251cebaa33..f932e5c95427 100644
--- a/plugins/junit5_rt_tests/test/com/intellij/junit5/JUnit5EventsTest.java
+++ b/plugins/junit5_rt_tests/test/com/intellij/junit5/JUnit5EventsTest.java
@@ -19,8 +19,8 @@ import com.intellij.openapi.util.text.StringUtil;
 import jetbrains.buildServer.messages.serviceMessages.MapSerializerUtil;
 import org.junit.jupiter.api.*;
 import org.junit.jupiter.engine.descriptor.ClassTestDescriptor;
-import org.junit.jupiter.engine.descriptor.MethodTestDescriptor;
 import org.junit.jupiter.engine.descriptor.TestFactoryTestDescriptor;
+import org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.UniqueId;
@@ -70,7 +70,7 @@ class JUnit5EventsTest {
   @Test
   void multipleFailures() throws Exception {
 
-    TestDescriptor testDescriptor = new MethodTestDescriptor(UniqueId.forEngine("engine"), TestClass.class,
+    TestDescriptor testDescriptor = new TestMethodTestDescriptor(UniqueId.forEngine("engine"), TestClass.class,
                                                              TestClass.class.getDeclaredMethod("test1"));
     TestIdentifier identifier = TestIdentifier.from(testDescriptor);
     myExecutionListener.executionStarted(identifier);
diff --git a/plugins/junit5_rt_tests/test/com/intellij/junit5/JUnit5NavigationTest.java b/plugins/junit5_rt_tests/test/com/intellij/junit5/JUnit5NavigationTest.java
index fa62f8fa82e0..b9ab4ec32236 100644
--- a/plugins/junit5_rt_tests/test/com/intellij/junit5/JUnit5NavigationTest.java
+++ b/plugins/junit5_rt_tests/test/com/intellij/junit5/JUnit5NavigationTest.java
@@ -18,7 +18,7 @@ package com.intellij.junit5;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.engine.descriptor.MethodTestDescriptor;
+import org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor;
 import org.junit.platform.engine.TestSource;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.support.descriptor.*;
@@ -36,15 +36,14 @@ class JUnit5NavigationTest {
   @Test
   void methodNavigation() throws Exception {
     UniqueId uniqueId = UniqueId.parse("[class:JUnit5NavigationTest]/[method:methodNavigation]");
-    MethodTestDescriptor methodTestDescriptor =
-      new MethodTestDescriptor(uniqueId, JUnit5NavigationTest.class, JUnit5NavigationTest.class.getDeclaredMethod("methodNavigation"));
+    TestMethodTestDescriptor methodTestDescriptor =
+      new TestMethodTestDescriptor(uniqueId, JUnit5NavigationTest.class, JUnit5NavigationTest.class.getDeclaredMethod("methodNavigation"));
     TestIdentifier testIdentifier = TestIdentifier.from(methodTestDescriptor);
     Assertions.assertEquals(JUnit5NavigationTest.class.getName(), JUnit5TestExecutionListener.getClassName(testIdentifier));
     Assertions.assertEquals("methodNavigation", JUnit5TestExecutionListener.getMethodName(testIdentifier));
     //Assertions.assertEquals("methodNavigation", testIdentifier.getDisplayName()); todo methodNavigation()
   }
 
-  private final ConfigurableTestDescriptor descriptor = new ConfigurableTestDescriptor();
   private TestSource myTestSource = null;
 
   @Test
@@ -73,7 +72,6 @@ class JUnit5NavigationTest {
   @Test
   void locationHintValueForMethodSource() {
     myTestSource = new MethodSource("className", "methodName");
-    descriptor.use(myTestSource);
     String locationHintValue = locationHintValue();
 
     Assertions.assertTrue(locationHintValue.startsWith("java:"), locationHintValue);
@@ -83,7 +81,6 @@ class JUnit5NavigationTest {
   @Test
   void locationHintValueForClassSource() {
     myTestSource = new ClassSource(String.class);
-    descriptor.use(myTestSource);
     String locationHintValue = locationHintValue();
 
     Assertions.assertTrue(locationHintValue.startsWith("java:"), locationHintValue);
@@ -93,12 +90,12 @@ class JUnit5NavigationTest {
   @Test
   void deriveSuiteOrTestFromDescription() {
     myTestSource = methodOrClassSource();
-
-    descriptor.isTest(true);
-    Assertions.assertTrue(locationHintValue().startsWith("java:test:"));
-
-    descriptor.isTest(false);
     Assertions.assertTrue(locationHintValue().startsWith("java:suite:"));
+
+    ConfigurableTestDescriptor descriptor = new ConfigurableTestDescriptor(myTestSource);
+    descriptor.isTest(true);
+    Assertions.assertTrue(locationHintValue(descriptor).startsWith("java:test:"));
+
   }
 
   @Test
@@ -133,13 +130,15 @@ class JUnit5NavigationTest {
   }
 
   private String locationHint() {
-    descriptor.use(myTestSource);
-    TestIdentifier testIdentifier = TestIdentifier.from(descriptor);
+    TestIdentifier testIdentifier = TestIdentifier.from(new ConfigurableTestDescriptor(myTestSource));
     return JUnit5TestExecutionListener.getLocationHint(testIdentifier);
   }
 
   private String locationHintValue() {
-    descriptor.use(myTestSource);
+    return locationHintValue(new ConfigurableTestDescriptor(myTestSource));
+  }
+
+  private static String locationHintValue(final ConfigurableTestDescriptor descriptor) {
     TestIdentifier testIdentifier = TestIdentifier.from(descriptor);
     return JUnit5TestExecutionListener.getLocationHintValue(testIdentifier.getSource().orElseThrow(IllegalStateException::new), testIdentifier.isTest());
   }
@@ -168,16 +167,10 @@ class JUnit5NavigationTest {
   private static class ConfigurableTestDescriptor extends AbstractTestDescriptor {
     private boolean myIsTest;
 
-    public ConfigurableTestDescriptor() {
-      super(JUnit5NavigationTest.anyUniqueId(), JUnit5NavigationTest.anyDisplayName());
+    public ConfigurableTestDescriptor(TestSource testSource) {
+      super(JUnit5NavigationTest.anyUniqueId(), JUnit5NavigationTest.anyDisplayName(), testSource);
     }
 
-    public void use(TestSource testSource) {
-      if (null == testSource) {
-        return;
-      }
-      setSource(testSource);
-    }
 
     @Override
     public Type getType() {