diff --git a/.idea/libraries/junit5_rt.xml b/.idea/libraries/junit5_rt.xml
index 5a0fe646a47b..cd50f3b02c68 100644
--- a/.idea/libraries/junit5_rt.xml
+++ b/.idea/libraries/junit5_rt.xml
@@ -4,6 +4,9 @@
       <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-commons-5.0.0-ALPHA.jar!/" />
       <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-engine-api-5.0.0-ALPHA.jar!/" />
       <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-launcher-5.0.0-ALPHA.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit4-engine-5.0.0-ALPHA.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit4-runner-5.0.0-ALPHA.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit5-engine-5.0.0-ALPHA.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/plugins/junit/junit.iml b/plugins/junit/junit.iml
index 103c9789465b..e5382a2ae789 100644
--- a/plugins/junit/junit.iml
+++ b/plugins/junit/junit.iml
@@ -23,6 +23,7 @@
     <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
     <orderEntry type="module" module-name="debugger-impl" />
     <orderEntry type="module" module-name="junit5_rt" />
+    <orderEntry type="library" name="junit5_rt" level="project" />
   </component>
   <component name="copyright">
     <Base>
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestObject.java b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
index 2a25b1a0145f..831dccc6babd 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestObject.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
@@ -61,9 +61,11 @@ import com.intellij.rt.execution.junit.RepeatCount;
 import com.intellij.rt.execution.testFrameworks.ForkedDebuggerHelper;
 import com.intellij.util.Function;
 import com.intellij.util.PathUtil;
+import com.intellij.util.PathsList;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.junit.gen5.launcher.TestExecutionListener;
 
 import java.io.File;
 import java.io.IOException;
@@ -163,6 +165,20 @@ public abstract class TestObject extends JavaTestFrameworkRunnableState<JUnitCon
     if (JUnitUtil.isJUnit5(GlobalSearchScope.allScope(project), project)) {
       javaParameters.getProgramParametersList().add(JUnitStarter.JUNIT5_PARAMETER);
       javaParameters.getClassPath().add(PathUtil.getJarPathForClass(JUnit5IdeaTestRunner.class));
+
+      final PathsList classPath = javaParameters.getClassPath();
+      final List<String> paths = classPath.getPathList();
+      final String pathForClass = PathUtil.getJarPathForClass(TestExecutionListener.class);
+      final File libDirectory = new File(pathForClass).getParentFile();
+      final File[] libJars = libDirectory.listFiles();
+      if (libJars != null) {
+        for (File jarFile : libJars) {
+          final String filePath = jarFile.getAbsolutePath();
+          if (!paths.contains(filePath)) {
+            classPath.add(filePath);
+          }
+        }
+      }
     }
     
     return javaParameters;
diff --git a/plugins/junit5_rt/lib/junit4-engine-5.0.0-ALPHA.jar b/plugins/junit5_rt/lib/junit4-engine-5.0.0-ALPHA.jar
new file mode 100644
index 000000000000..4145054622a5
Binary files /dev/null and b/plugins/junit5_rt/lib/junit4-engine-5.0.0-ALPHA.jar differ
diff --git a/plugins/junit5_rt/lib/junit4-runner-5.0.0-ALPHA.jar b/plugins/junit5_rt/lib/junit4-runner-5.0.0-ALPHA.jar
new file mode 100644
index 000000000000..5f6acbef2f1b
Binary files /dev/null and b/plugins/junit5_rt/lib/junit4-runner-5.0.0-ALPHA.jar differ
diff --git a/plugins/junit5_rt/lib/junit5-engine-5.0.0-ALPHA.jar b/plugins/junit5_rt/lib/junit5-engine-5.0.0-ALPHA.jar
new file mode 100644
index 000000000000..582288aa96ec
Binary files /dev/null and b/plugins/junit5_rt/lib/junit5-engine-5.0.0-ALPHA.jar differ