diff --git a/plugins/junit/src/com/intellij/execution/junit/TestDirectory.java b/plugins/junit/src/com/intellij/execution/junit/TestDirectory.java
index 1fc20804ab82..5d0ff089dfd2 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestDirectory.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestDirectory.java
@@ -110,13 +110,15 @@ class TestDirectory extends TestPackage {
 
   @Override
   protected void searchTests5(Module module, TestClassFilter classFilter, Set<PsiClass> classes) throws CantRunException {
-    PsiDirectory directory = getDirectory(getConfiguration().getPersistentData());
-    PsiPackage aPackage = JavaRuntimeConfigurationProducerBase.checkPackage(directory);
-    if (aPackage != null && module != null) {
-      PsiDirectory[] directories =
-        aPackage.getDirectories(module.getModuleScope(true).intersectWith(GlobalSearchScopesCore.projectTestScope(getConfiguration().getProject())));
-      if (directories.length > 1) {//need to enumerate classes in one of multiple test source roots
-        collectClassesRecursively(directory, Condition.TRUE, classes);
+    if (module != null) {
+      PsiDirectory directory = getDirectory(getConfiguration().getPersistentData());
+      PsiPackage aPackage = JavaRuntimeConfigurationProducerBase.checkPackage(directory);
+      if (aPackage != null) {
+        PsiDirectory[] directories =
+          aPackage.getDirectories(module.getModuleScope(true).intersectWith(GlobalSearchScopesCore.projectTestScope(getConfiguration().getProject())));
+        if (directories.length > 1) {//need to enumerate classes in one of multiple test source roots
+          collectClassesRecursively(directory, Condition.TRUE, classes);
+        }
       }
     }
   }
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestPackage.java b/plugins/junit/src/com/intellij/execution/junit/TestPackage.java
index d55ce3916cf4..39e4b99996a6 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestPackage.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestPackage.java
@@ -95,7 +95,7 @@ public class TestPackage extends TestObject {
         try {
           String packageName = getPackageName(data);
           String filters = getFilters(myClasses, packageName);
-          if (JUnitStarter.JUNIT5_PARAMETER.equals(getRunner()) && filterOutputByDirectoryForJunit5(myClasses) && module != null) {
+          if (JUnitStarter.JUNIT5_PARAMETER.equals(getRunner()) && module != null && filterOutputByDirectoryForJunit5(myClasses)) {
             JUnitStarter.printClassesList(composeDirectoryFilter(module), packageName, "", filters, myTempFile);
           }
           else {