diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleProperties.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleProperties.java
index 8a5af9062d7b..0b55fd16b6be 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleProperties.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleProperties.java
@@ -16,7 +16,7 @@
 package com.intellij.execution.testframework.sm.runner;
 
 import com.intellij.execution.Executor;
-import com.intellij.execution.configurations.ModuleRunConfiguration;
+import com.intellij.execution.configurations.RunConfiguration;
 import com.intellij.execution.filters.CompositeFilter;
 import com.intellij.execution.filters.FileHyperlinkInfo;
 import com.intellij.execution.filters.Filter;
@@ -43,7 +43,7 @@ import org.jetbrains.annotations.Nullable;
  * @author: Roman Chernyatchik
  */
 public class SMTRunnerConsoleProperties extends TestConsoleProperties implements SMStacktraceParser {
-  private final ModuleRunConfiguration myConfiguration;
+  private final RunConfiguration myConfiguration;
   protected final CompositeFilter myCustomFilter;
 
   /**
@@ -51,7 +51,7 @@ public class SMTRunnerConsoleProperties extends TestConsoleProperties implements
    * @param testFrameworkName Prefix for storage which keeps runner settings. E.g. "RubyTestUnit"
    * @param executor
    */
-  public SMTRunnerConsoleProperties(@NotNull final ModuleRunConfiguration config,
+  public SMTRunnerConsoleProperties(@NotNull final RunConfiguration config,
                                     @NotNull final String testFrameworkName,
                                     @NotNull final Executor executor)
   {
@@ -62,7 +62,7 @@ public class SMTRunnerConsoleProperties extends TestConsoleProperties implements
     myCustomFilter = new CompositeFilter(config.getProject());
   }
 
-  public ModuleRunConfiguration getConfiguration() {
+  public RunConfiguration getConfiguration() {
     return myConfiguration;
   }
 
diff --git a/platform/testRunner/src/com/intellij/execution/testframework/TestConsoleProperties.java b/platform/testRunner/src/com/intellij/execution/testframework/TestConsoleProperties.java
index 1733e7749157..364885e54292 100644
--- a/platform/testRunner/src/com/intellij/execution/testframework/TestConsoleProperties.java
+++ b/platform/testRunner/src/com/intellij/execution/testframework/TestConsoleProperties.java
@@ -21,7 +21,8 @@
 package com.intellij.execution.testframework;
 
 import com.intellij.execution.Executor;
-import com.intellij.execution.configurations.ModuleRunConfiguration;
+import com.intellij.execution.configurations.ModuleRunProfile;
+import com.intellij.execution.configurations.RunConfiguration;
 import com.intellij.execution.executors.DefaultDebugExecutor;
 import com.intellij.execution.ui.ConsoleView;
 import com.intellij.execution.ui.ExecutionConsole;
@@ -79,7 +80,11 @@ public abstract class TestConsoleProperties extends StoringPropertyContainer imp
   }
 
   protected GlobalSearchScope initScope() {
-    Module[] modules = getConfiguration().getModules();
+    RunConfiguration configuration = getConfiguration();
+    if (!(configuration instanceof ModuleRunProfile)) {
+      return GlobalSearchScope.allScope(myProject);
+    }
+    Module[] modules = ((ModuleRunProfile) configuration).getModules();
     if (modules.length == 0) return GlobalSearchScope.allScope(myProject);
 
     GlobalSearchScope scope = GlobalSearchScope.EMPTY_SCOPE;
@@ -142,7 +147,7 @@ public abstract class TestConsoleProperties extends StoringPropertyContainer imp
     myListeners.clear();
   }
 
-  public abstract ModuleRunConfiguration getConfiguration();
+  public abstract RunConfiguration getConfiguration();
 
   /**
    * Allows to make console editable and disable/enable input sending in process stdin stream.