diff --git a/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java b/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java
index 22226ba12970..40515b862172 100644
--- a/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java
+++ b/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java
@@ -215,7 +215,7 @@ public class JUnitUtil {
 
   public static boolean isJUnit4TestClass(final PsiClass psiClass, boolean checkAbstract) {
     final PsiModifierList modifierList = psiClass.getModifierList();
-    if (modifierList == null || JavaExecutionUtil.findModule(psiClass) == null) return false;
+    if (modifierList == null) return false;
     if (psiClass.getQualifiedName() == null) return false; //skip local and anonymous classes
     PsiClass topLevelClass = getTopmostClass(psiClass);
 
@@ -257,7 +257,7 @@ public class JUnitUtil {
 
   public static boolean isJUnit5TestClass(@NotNull final PsiClass psiClass, boolean checkAbstract) {
     final PsiModifierList modifierList = psiClass.getModifierList();
-    if (modifierList == null || JavaExecutionUtil.findModule(psiClass) == null) return false;
+    if (modifierList == null) return false;
 
     if (psiClass.isAnnotationType()) return false;
 
@@ -271,31 +271,26 @@ public class JUnitUtil {
 
     if (!PsiClassUtil.isRunnableClass(psiClass, false, checkAbstract)) return false;
 
-    Module module = ModuleUtilCore.findModuleForPsiElement(psiClass);
-    if (module != null) {
-      return CachedValuesManager.getCachedValue(psiClass, () -> {
-        boolean hasAnnotation = false;
-        for (final PsiMethod method : psiClass.getAllMethods()) {
-          ProgressManager.checkCanceled();
-          if (MetaAnnotationUtil.isMetaAnnotated(method, TEST5_ANNOTATIONS)) {
+    return CachedValuesManager.getCachedValue(psiClass, () -> {
+      boolean hasAnnotation = false;
+      for (final PsiMethod method : psiClass.getAllMethods()) {
+        ProgressManager.checkCanceled();
+        if (MetaAnnotationUtil.isMetaAnnotated(method, TEST5_ANNOTATIONS)) {
+          hasAnnotation = true;
+          break;
+        }
+      }
+
+      if (!hasAnnotation) {
+        for (PsiClass aClass : psiClass.getAllInnerClasses()) {
+          if (MetaAnnotationUtil.isMetaAnnotated(aClass, Collections.singleton(JUNIT5_NESTED))) {
             hasAnnotation = true;
             break;
           }
         }
-
-        if (!hasAnnotation) {
-          for (PsiClass aClass : psiClass.getAllInnerClasses()) {
-            if (MetaAnnotationUtil.isMetaAnnotated(aClass, Collections.singleton(JUNIT5_NESTED))) {
-              hasAnnotation = true;
-              break;
-            }
-          }
-        }
-        return CachedValueProvider.Result.create(hasAnnotation, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
-      });
-    }
-
-    return false;
+      }
+      return CachedValueProvider.Result.create(hasAnnotation, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
+    });
   }
 
   public static boolean isJUnit5(@NotNull PsiElement element) {
diff --git a/java/execution/impl/src/com/intellij/execution/testframework/AbstractInClassConfigurationProducer.java b/java/execution/impl/src/com/intellij/execution/testframework/AbstractInClassConfigurationProducer.java
index a6ef4ed7f582..52fcda029c89 100644
--- a/java/execution/impl/src/com/intellij/execution/testframework/AbstractInClassConfigurationProducer.java
+++ b/java/execution/impl/src/com/intellij/execution/testframework/AbstractInClassConfigurationProducer.java
@@ -137,7 +137,7 @@ public abstract class AbstractInClassConfigurationProducer<T extends JavaTestCon
 
     configuration.restoreOriginalModule(originalModule);
     Module module = configuration.getConfigurationModule().getModule();
-    if (module == null) {
+    if (module == null && psiClass.getManager().isInProject(psiClass)) {
       PsiFile containingFile = psiClass.getContainingFile();
       LOG.error("No module found", new Attachment("context.txt",
                                                   "generated name:" + configuration.getName() +
@@ -145,7 +145,7 @@ public abstract class AbstractInClassConfigurationProducer<T extends JavaTestCon
                                                   "; physical: " + psiClass.isPhysical() +
                                                   "; className: " + psiClass.getQualifiedName() +
                                                   "; file: " + containingFile +
-                                                  "; module: " + ModuleUtilCore.findModuleForPsiElement(psiClass) +
+                                                  "; module: " + ModuleUtilCore.findModuleForPsiElement(psiClass.getContainingFile()) +
                                                   "; original module: " + originalModule));
       return false;
     }
diff --git a/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java b/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
index d837719b217d..a77935bfbba1 100644
--- a/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
+++ b/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
@@ -102,7 +102,7 @@ public class JavaExecutionUtil {
   }
 
   public static Module findModule(@NotNull final PsiClass psiClass) {
-    return ModuleUtilCore.findModuleForPsiElement(psiClass);
+    return ModuleUtilCore.findModuleForPsiElement(psiClass.getContainingFile());
   }
 
   @Nullable