diff --git a/plugins/junit/src/com/intellij/execution/junit/testDiscovery/JUnitTestDiscoveryConfiguration.java b/plugins/junit/src/com/intellij/execution/junit/testDiscovery/JUnitTestDiscoveryConfiguration.java
index dddbc7f1e081..68e28874c08d 100644
--- a/plugins/junit/src/com/intellij/execution/junit/testDiscovery/JUnitTestDiscoveryConfiguration.java
+++ b/plugins/junit/src/com/intellij/execution/junit/testDiscovery/JUnitTestDiscoveryConfiguration.java
@@ -75,7 +75,7 @@ public class JUnitTestDiscoveryConfiguration extends TestDiscoveryConfiguration
 
     @Override
     protected boolean forkPerModule() {
-      return spansMultipleModules("");
+      return getConfigurationModule().getModule() == null;
     }
 
     @Override
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/testDiscovery/TestNGTestDiscoveryConfiguration.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/testDiscovery/TestNGTestDiscoveryConfiguration.java
index 9ecb0d556213..0b89cbca9a68 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/testDiscovery/TestNGTestDiscoveryConfiguration.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/testDiscovery/TestNGTestDiscoveryConfiguration.java
@@ -75,7 +75,7 @@ public class TestNGTestDiscoveryConfiguration extends TestDiscoveryConfiguration
 
     @Override
     protected boolean forkPerModule() {
-      return spansMultipleModules("");
+      return getConfigurationModule().getModule() == null;
     }
 
     @Override