diff --git a/plugins/junit/src/com/intellij/execution/ConfigurationUtil.java b/plugins/junit/src/com/intellij/execution/ConfigurationUtil.java
index 844d98ce0cc1..1b65c6c513f6 100644
--- a/plugins/junit/src/com/intellij/execution/ConfigurationUtil.java
+++ b/plugins/junit/src/com/intellij/execution/ConfigurationUtil.java
@@ -46,13 +46,16 @@ public class ConfigurationUtil {
     GlobalSearchScope projectScopeWithoutLibraries = GlobalSearchScope.projectScope(project);
     final GlobalSearchScope scope = projectScopeWithoutLibraries.intersectWith(testClassFilter.getScope());
 
-    ClassInheritorsSearch.search(testClassFilter.getBase(), scope, true, true, false).forEach(new ReadActionProcessor<PsiClass>() {
-      @Override
-      public boolean processInReadAction(PsiClass aClass) {
-        if (testClassFilter.isAccepted(aClass)) found.add(aClass);
-        return true;
-      }
-    });
+    final PsiClass base = testClassFilter.getBase();
+    if (base != null) {
+      ClassInheritorsSearch.search(base, scope, true, true, false).forEach(new ReadActionProcessor<PsiClass>() {
+        @Override
+        public boolean processInReadAction(PsiClass aClass) {
+          if (testClassFilter.isAccepted(aClass)) found.add(aClass);
+          return true;
+        }
+      });
+    }
 
     // classes having suite() method
     final PsiMethod[] suiteMethods = ApplicationManager.getApplication().runReadAction(
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestPackage.java b/plugins/junit/src/com/intellij/execution/junit/TestPackage.java
index 687c7139e416..dea96fd8adde 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestPackage.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestPackage.java
@@ -65,7 +65,9 @@ public class TestPackage extends TestObject {
         SourceScope sourceScope = getSourceScope();
         if (sourceScope != null && !ReadAction.compute(() -> JUnitUtil.isJUnit5(sourceScope.getGlobalSearchScope(), myProject))) {
           try {
-            ConfigurationUtil.findAllTestClasses(getClassFilter(data), myClasses);
+            final TestClassFilter classFilter = getClassFilter(data);
+            LOG.assertTrue(classFilter.getBase() != null);
+            ConfigurationUtil.findAllTestClasses(classFilter, myClasses);
           }
           catch (CantRunException ignored) {}
         }