diff --git a/plugins/junit/src/com/intellij/execution/junit/TestPackage.java b/plugins/junit/src/com/intellij/execution/junit/TestPackage.java
index 7de78f87a2a4..c2c19ef61a54 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestPackage.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestPackage.java
@@ -108,10 +108,14 @@ public class TestPackage extends TestObject {
   protected JavaParameters createJavaParameters() throws ExecutionException {
     final JavaParameters javaParameters = super.createJavaParameters();
     final JUnitConfiguration.Data data = getConfiguration().getPersistentData();
-    final DumbService dumbService = DumbService.getInstance(getConfiguration().getProject());
+    final Project project = getConfiguration().getProject();
+    final DumbService dumbService = DumbService.getInstance(project);
     try {
       dumbService.setAlternativeResolveEnabled(true);
-      getClassFilter(data);//check if junit found
+      final SourceScope sourceScope = data.getScope().getSourceScope(getConfiguration());
+      if (sourceScope == null || !JUnitUtil.isJUnit5(sourceScope.getLibrariesScope(), project)) { //check for junit 5
+        getClassFilter(data);//check if junit 4 found
+      }
     }
     finally {
       dumbService.setAlternativeResolveEnabled(false);