diff --git a/.idea/libraries/junit5_rt.xml b/.idea/libraries/junit5_rt.xml
index bc110394ca33..2dccb586144a 100644
--- a/.idea/libraries/junit5_rt.xml
+++ b/.idea/libraries/junit5_rt.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="junit5_rt">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-jupiter-engine-5.0.0-M2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-platform-commons-1.0.0-M2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-platform-engine-1.0.0-M2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-platform-launcher-1.0.0-M2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-platform-runner-1.0.0-M2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-vintage-engine-4.12.0-M2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-jupiter-engine-5.0.0-M3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-platform-commons-1.0.0-M3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-platform-engine-1.0.0-M3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-platform-launcher-1.0.0-M3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-platform-runner-1.0.0-M3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-vintage-engine-4.12.0-M3.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 d44b5ca843eb..58e98a4d1a0a 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
@@ -210,7 +210,7 @@ class CommunityRepositoryModules {
       withModule("junit5_rt", "junit5-rt.jar")
       withProjectLibrary("junit5_rt")
       withProjectLibrary("opentest4j")
-      withModuleLibrary("junit-jupiter-api-5.0.0-M2.jar", "junit5_rt_tests", "")
+      withModuleLibrary("junit-jupiter-api-5.0.0-M3.jar", "junit5_rt_tests", "")
     },
     plugin("ByteCodeViewer") {
       mainJarName = "byteCodeViewer.jar"
diff --git a/plugins/junit5_rt/lib/junit-jupiter-api-5.0.0-M2.jar b/plugins/junit5_rt/lib/junit-jupiter-api-5.0.0-M2.jar
deleted file mode 100644
index 28f31ce8e02b..000000000000
Binary files a/plugins/junit5_rt/lib/junit-jupiter-api-5.0.0-M2.jar and /dev/null differ
diff --git a/plugins/junit5_rt/lib/junit-jupiter-api-5.0.0-M3.jar b/plugins/junit5_rt/lib/junit-jupiter-api-5.0.0-M3.jar
new file mode 100644
index 000000000000..ac895e738637
Binary files /dev/null and b/plugins/junit5_rt/lib/junit-jupiter-api-5.0.0-M3.jar differ
diff --git a/plugins/junit5_rt/lib/junit-jupiter-engine-5.0.0-M2.jar b/plugins/junit5_rt/lib/junit-jupiter-engine-5.0.0-M2.jar
deleted file mode 100644
index 18427e30b541..000000000000
Binary files a/plugins/junit5_rt/lib/junit-jupiter-engine-5.0.0-M2.jar and /dev/null differ
diff --git a/plugins/junit5_rt/lib/junit-jupiter-engine-5.0.0-M3.jar b/plugins/junit5_rt/lib/junit-jupiter-engine-5.0.0-M3.jar
new file mode 100644
index 000000000000..455d72a9f4d8
Binary files /dev/null and b/plugins/junit5_rt/lib/junit-jupiter-engine-5.0.0-M3.jar differ
diff --git a/plugins/junit5_rt/lib/junit-platform-commons-1.0.0-M2.jar b/plugins/junit5_rt/lib/junit-platform-commons-1.0.0-M2.jar
deleted file mode 100644
index b1c5a3d25d83..000000000000
Binary files a/plugins/junit5_rt/lib/junit-platform-commons-1.0.0-M2.jar and /dev/null differ
diff --git a/plugins/junit5_rt/lib/junit-platform-commons-1.0.0-M3.jar b/plugins/junit5_rt/lib/junit-platform-commons-1.0.0-M3.jar
new file mode 100644
index 000000000000..52fb3d98a481
Binary files /dev/null and b/plugins/junit5_rt/lib/junit-platform-commons-1.0.0-M3.jar differ
diff --git a/plugins/junit5_rt/lib/junit-platform-engine-1.0.0-M2.jar b/plugins/junit5_rt/lib/junit-platform-engine-1.0.0-M2.jar
deleted file mode 100644
index df0698229f0e..000000000000
Binary files a/plugins/junit5_rt/lib/junit-platform-engine-1.0.0-M2.jar and /dev/null differ
diff --git a/plugins/junit5_rt/lib/junit-platform-engine-1.0.0-M3.jar b/plugins/junit5_rt/lib/junit-platform-engine-1.0.0-M3.jar
new file mode 100644
index 000000000000..fd74110694f3
Binary files /dev/null and b/plugins/junit5_rt/lib/junit-platform-engine-1.0.0-M3.jar differ
diff --git a/plugins/junit5_rt/lib/junit-platform-launcher-1.0.0-M2.jar b/plugins/junit5_rt/lib/junit-platform-launcher-1.0.0-M2.jar
deleted file mode 100644
index 2bad6c0e937a..000000000000
Binary files a/plugins/junit5_rt/lib/junit-platform-launcher-1.0.0-M2.jar and /dev/null differ
diff --git a/plugins/junit5_rt/lib/junit-platform-launcher-1.0.0-M3.jar b/plugins/junit5_rt/lib/junit-platform-launcher-1.0.0-M3.jar
new file mode 100644
index 000000000000..6cbf6f57563d
Binary files /dev/null and b/plugins/junit5_rt/lib/junit-platform-launcher-1.0.0-M3.jar differ
diff --git a/plugins/junit5_rt/lib/junit-platform-runner-1.0.0-M2.jar b/plugins/junit5_rt/lib/junit-platform-runner-1.0.0-M2.jar
deleted file mode 100644
index a97da797470d..000000000000
Binary files a/plugins/junit5_rt/lib/junit-platform-runner-1.0.0-M2.jar and /dev/null differ
diff --git a/plugins/junit5_rt/lib/junit-platform-runner-1.0.0-M3.jar b/plugins/junit5_rt/lib/junit-platform-runner-1.0.0-M3.jar
new file mode 100644
index 000000000000..f5c1f0b51067
Binary files /dev/null and b/plugins/junit5_rt/lib/junit-platform-runner-1.0.0-M3.jar differ
diff --git a/plugins/junit5_rt/lib/junit-vintage-engine-4.12.0-M2.jar b/plugins/junit5_rt/lib/junit-vintage-engine-4.12.0-M2.jar
deleted file mode 100644
index 328ef8785b78..000000000000
Binary files a/plugins/junit5_rt/lib/junit-vintage-engine-4.12.0-M2.jar and /dev/null differ
diff --git a/plugins/junit5_rt/lib/junit-vintage-engine-4.12.0-M3.jar b/plugins/junit5_rt/lib/junit-vintage-engine-4.12.0-M3.jar
new file mode 100644
index 000000000000..8b8346cdf59d
Binary files /dev/null and b/plugins/junit5_rt/lib/junit-vintage-engine-4.12.0-M3.jar differ
diff --git a/plugins/junit5_rt/src/com/intellij/junit5/JUnit5TestExecutionListener.java b/plugins/junit5_rt/src/com/intellij/junit5/JUnit5TestExecutionListener.java
index 2117fae7dec0..b8b4aefdf5c5 100644
--- a/plugins/junit5_rt/src/com/intellij/junit5/JUnit5TestExecutionListener.java
+++ b/plugins/junit5_rt/src/com/intellij/junit5/JUnit5TestExecutionListener.java
@@ -21,8 +21,8 @@ import com.intellij.rt.execution.junit.ComparisonFailureData;
 import com.intellij.rt.execution.junit.MapSerializerUtil;
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.reporting.ReportEntry;
-import org.junit.platform.engine.support.descriptor.JavaClassSource;
-import org.junit.platform.engine.support.descriptor.JavaMethodSource;
+import org.junit.platform.engine.support.descriptor.ClassSource;
+import org.junit.platform.engine.support.descriptor.MethodSource;
 import org.junit.platform.launcher.TestExecutionListener;
 import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.launcher.TestPlan;
@@ -297,11 +297,11 @@ public class JUnit5TestExecutionListener implements TestExecutionListener {
 
   static String getClassName(TestIdentifier description) {
     return description.getSource().map(source -> {
-      if (source instanceof JavaMethodSource) {
-        return ((JavaMethodSource)source).getJavaClass().getName();
+      if (source instanceof MethodSource) {
+        return ((MethodSource)source).getClassName();
       }
-      if (source instanceof JavaClassSource) {
-        return ((JavaClassSource)source).getJavaClass().getName();
+      if (source instanceof ClassSource) {
+        return ((ClassSource)source).getClassName();
       }
       return null;
     }).orElse(null);
@@ -309,8 +309,8 @@ public class JUnit5TestExecutionListener implements TestExecutionListener {
 
   static String getMethodName(TestIdentifier testIdentifier) {
     return testIdentifier.getSource().map((source) -> {
-      if (source instanceof JavaMethodSource) {
-        return ((JavaMethodSource)source).getJavaMethodName();
+      if (source instanceof MethodSource) {
+        return ((MethodSource)source).getMethodName();
       }
       return null;
     }).orElse(null);
diff --git a/plugins/junit5_rt_tests/junit5_rt_tests.iml b/plugins/junit5_rt_tests/junit5_rt_tests.iml
index e5840541f6c3..562ebd0f6d8b 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-M2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../junit5_rt/lib/junit-jupiter-api-5.0.0-M3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />