diff --git a/plugins/junit/resources/META-INF/plugin.xml b/plugins/junit/resources/META-INF/plugin.xml
index 51cd282995c9..bef7eac8a1d5 100644
--- a/plugins/junit/resources/META-INF/plugin.xml
+++ b/plugins/junit/resources/META-INF/plugin.xml
@@ -160,6 +160,9 @@
     <registryKey key="idea.test.graceful.shutdown.timeout.seconds"
                  defaultValue="600"
                  description="Timeout in seconds for the test runner to terminate gracefully after receiving a shutdown signal. A negative value disables the timeout, allowing unlimited wait."/>
+    <registryKey key="junit.version.detection.scope"
+                 defaultValue="withDependenciesAndLibraries"
+                 description="Scope used to detect the JUnit version in a module. Supported values: 'runtime' (module runtime), 'module' (module only), 'testsWithDependents' (tests with dependent modules), 'WithLibraries' (module with libraries), and 'withDependenciesAndLibraries' (module with dependencies and libraries; used by default)."/>
   </extensions>
 
   <extensionPoints>
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestObject.java b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
index 9140cdadd026..5c3edc619233 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestObject.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
@@ -640,7 +640,14 @@ public abstract class TestObject extends JavaTestFrameworkRunnableState<JUnitCon
   }
 
   private static GlobalSearchScope getScopeForJUnit(@Nullable Module module, Project project) {
-    return module != null ? GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(module, true) : GlobalSearchScope.allScope(project);
+    if (module == null) return GlobalSearchScope.allScope(project);
+    return switch (Registry.stringValue("junit.version.detection.scope")) {
+      case "runtime" -> GlobalSearchScope.moduleRuntimeScope(module, true);
+      case "module" -> GlobalSearchScope.moduleScope(module);
+      case "testsWithDependents" -> GlobalSearchScope.moduleTestsWithDependentsScope(module);
+      case "WithLibraries" -> GlobalSearchScope.moduleWithLibrariesScope(module);
+      default -> GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(module, true);
+    };
   }
 
   public static GlobalSearchScope getScopeForJUnit(JUnitConfiguration configuration) {