diff --git a/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java b/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
index da7e9477770b..3239824d4ada 100644
--- a/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
+++ b/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
@@ -135,7 +135,7 @@ public class JavaExecutionUtil {
 
   @Nullable
   public static PsiClass findMainClass(final Module module, final String mainClassName) {
-    return findMainClass(module.getProject(), mainClassName, GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(module));
+    return findMainClass(module.getProject(), mainClassName, module.getModuleRuntimeScope(true));
   }
 
   @Nullable
diff --git a/java/execution/openapi/src/com/intellij/execution/configurations/JavaRunConfigurationModule.java b/java/execution/openapi/src/com/intellij/execution/configurations/JavaRunConfigurationModule.java
index a8cc13d35cc7..27a27adf3ae8 100644
--- a/java/execution/openapi/src/com/intellij/execution/configurations/JavaRunConfigurationModule.java
+++ b/java/execution/openapi/src/com/intellij/execution/configurations/JavaRunConfigurationModule.java
@@ -53,8 +53,7 @@ public class JavaRunConfigurationModule extends RunConfigurationModule {
     final Module module = getModule();
     final GlobalSearchScope scope;
     if (module != null) {
-      scope = myClassesInLibraries ? GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(module)
-              : GlobalSearchScope.moduleWithDependenciesScope(module);
+      scope = myClassesInLibraries ? module.getModuleRuntimeScope(true) : GlobalSearchScope.moduleWithDependenciesScope(module);
     }
     else {
       scope = myClassesInLibraries ? GlobalSearchScope.allScope(getProject()) : GlobalSearchScope.projectScope(getProject());