diff --git a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
index f98778128f5d..09c174d96b38 100644
--- a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
+++ b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
@@ -61,7 +61,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jps.model.serialization.PathMacroUtil;
 
-import javax.swing.*;
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -116,8 +115,7 @@ public abstract class JavaTestFrameworkRunnableState<T extends ModuleBasedConfig
     final TestConsoleProperties testConsoleProperties = createTestConsoleProperties(executor);
     testConsoleProperties.setIfUndefined(TestConsoleProperties.HIDE_PASSED_TESTS, false);
 
-    final BaseTestsOutputConsoleView consoleView =
-      SMTestRunnerConnectionUtil.createConsoleWithCustomLocator(getFrameworkName(), testConsoleProperties, getEnvironment(), new JavaTestLocationProvider(testConsoleProperties.getScope()));
+    final BaseTestsOutputConsoleView consoleView = SMTestRunnerConnectionUtil.createConsole(getFrameworkName(), testConsoleProperties, getEnvironment());
     final SMTestRunnerResultsForm viewer = ((SMTRunnerConsoleView)consoleView).getResultsViewer();
     Disposer.register(getConfiguration().getProject(), consoleView);
 
@@ -140,10 +138,9 @@ public abstract class JavaTestFrameworkRunnableState<T extends ModuleBasedConfig
             clear();
           }
         };
-        SwingUtilities.invokeLater(runnable);
+        UIUtil.invokeLaterIfNeeded(runnable);
         handler.removeProcessListener(this);
       }
-
     });
 
     AbstractRerunFailedTestsAction rerunFailedTestsAction = createRerunFailedTestsAction(testConsoleProperties, consoleView);
diff --git a/java/execution/impl/src/com/intellij/execution/testframework/JavaTestLocationProvider.java b/java/execution/impl/src/com/intellij/execution/testframework/JavaTestLocator.java
similarity index 63%
rename from java/execution/impl/src/com/intellij/execution/testframework/JavaTestLocationProvider.java
rename to java/execution/impl/src/com/intellij/execution/testframework/JavaTestLocator.java
index 6bd1b167871c..d4e529772a72 100644
--- a/java/execution/impl/src/com/intellij/execution/testframework/JavaTestLocationProvider.java
+++ b/java/execution/impl/src/com/intellij/execution/testframework/JavaTestLocator.java
@@ -19,65 +19,62 @@ import com.intellij.execution.Location;
 import com.intellij.execution.PsiLocation;
 import com.intellij.execution.junit2.PsiMemberParameterizedLocation;
 import com.intellij.execution.junit2.info.MethodLocation;
+import com.intellij.execution.testframework.sm.runner.SMTestLocator;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.JavaPsiFacade;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.testIntegration.TestLocationProvider;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collections;
 import java.util.List;
 
-public class JavaTestLocationProvider implements TestLocationProvider {
+public class JavaTestLocator implements SMTestLocator {
   public static final String SUITE_PROTOCOL = "java:suite";
   public static final String TEST_PROTOCOL = "java:test";
 
-  private final GlobalSearchScope myScope;
-
-  public JavaTestLocationProvider(@NotNull GlobalSearchScope scope) {
-    myScope = scope;
-  }
+  public static final JavaTestLocator INSTANCE = new JavaTestLocator();
 
   @NotNull
   @Override
-  public List<Location> getLocation(@NotNull String protocolId, @NotNull String locationData, Project project) {
+  public List<Location> getLocation(@NotNull String protocol, @NotNull String path, @NotNull Project project, @NotNull GlobalSearchScope scope) {
     List<Location> results = Collections.emptyList();
 
-    final int idx = locationData.indexOf("[");
-    final String paramName = idx >= 0 ? locationData.substring(idx) : null;
+    String paramName = null;
+    int idx = path.indexOf('[');
     if (idx >= 0) {
-      locationData = locationData.substring(0, idx);
+      paramName = path.substring(idx);
+      path = path.substring(0, idx);
     }
 
-    final JavaPsiFacade javaPsiFacade = JavaPsiFacade.getInstance(project);
-    if (SUITE_PROTOCOL.equals(protocolId)) {
-      locationData = StringUtil.trimEnd(locationData, ".");
-      PsiClass[] classes = javaPsiFacade.findClasses(locationData, myScope);
+    JavaPsiFacade javaPsiFacade = JavaPsiFacade.getInstance(project);
+    if (SUITE_PROTOCOL.equals(protocol)) {
+      path = StringUtil.trimEnd(path, ".");
+      PsiClass[] classes = javaPsiFacade.findClasses(path, scope);
       if (classes.length > 0) {
         results = ContainerUtil.newSmartList();
         for (PsiClass aClass : classes) {
-          results.add(paramName != null ? PsiMemberParameterizedLocation.getParameterizedLocation(aClass, paramName) 
+          results.add(paramName != null ? PsiMemberParameterizedLocation.getParameterizedLocation(aClass, paramName)
                                         : new PsiLocation<PsiClass>(project, aClass));
         }
       }
     }
-    else if (TEST_PROTOCOL.equals(protocolId)) {
-      final String className = StringUtil.getPackageName(locationData);
+    else if (TEST_PROTOCOL.equals(protocol)) {
+      String className = StringUtil.getPackageName(path);
       if (!StringUtil.isEmpty(className)) {
-        String methodName = StringUtil.getShortName(locationData);
-        PsiClass[] classes = javaPsiFacade.findClasses(className, myScope);
+        String methodName = StringUtil.getShortName(path);
+        PsiClass[] classes = javaPsiFacade.findClasses(className, scope);
         if (classes.length > 0) {
           results = ContainerUtil.newSmartList();
           for (PsiClass aClass : classes) {
             PsiMethod[] methods = aClass.findMethodsByName(methodName, true);
             if (methods.length > 0) {
               for (PsiMethod method : methods) {
-                results.add(paramName != null ?  new PsiMemberParameterizedLocation(project, method, aClass, paramName)
-                                              :  MethodLocation.elementInClass(method, aClass));
+                results.add(paramName != null ? new PsiMemberParameterizedLocation(project, method, aClass, paramName)
+                                              : MethodLocation.elementInClass(method, aClass));
               }
             }
           }
diff --git a/plugins/junit/src/com/intellij/execution/junit2/ui/properties/JUnitConsoleProperties.java b/plugins/junit/src/com/intellij/execution/junit2/ui/properties/JUnitConsoleProperties.java
index 3b3ea763ba7b..c202fd0787b2 100644
--- a/plugins/junit/src/com/intellij/execution/junit2/ui/properties/JUnitConsoleProperties.java
+++ b/plugins/junit/src/com/intellij/execution/junit2/ui/properties/JUnitConsoleProperties.java
@@ -19,7 +19,9 @@ import com.intellij.execution.Executor;
 import com.intellij.execution.junit.JUnitConfiguration;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.testframework.JavaAwareTestConsoleProperties;
+import com.intellij.execution.testframework.JavaTestLocator;
 import com.intellij.execution.testframework.SourceScope;
+import com.intellij.execution.testframework.sm.runner.SMTestLocator;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.psi.search.GlobalSearchScope;
 import org.jetbrains.annotations.NotNull;
@@ -48,4 +50,9 @@ public class JUnitConsoleProperties extends JavaAwareTestConsoleProperties<JUnit
     super.appendAdditionalActions(actionGroup, environment, parent);
     actionGroup.addAction(createIncludeNonStartedInRerun()).setAsSecondary(true);
   }
+
+  @Override
+  public SMTestLocator getTestLocator() {
+    return JavaTestLocator.INSTANCE;
+  }
 }
diff --git a/plugins/junit/test/com/intellij/execution/junit/JUnitRerunFailedTestsTest.java b/plugins/junit/test/com/intellij/execution/junit/JUnitRerunFailedTestsTest.java
index 82e5f466788e..6a90db594c17 100644
--- a/plugins/junit/test/com/intellij/execution/junit/JUnitRerunFailedTestsTest.java
+++ b/plugins/junit/test/com/intellij/execution/junit/JUnitRerunFailedTestsTest.java
@@ -18,7 +18,7 @@ package com.intellij.execution.junit;
 import com.intellij.execution.Location;
 import com.intellij.execution.junit2.PsiMemberParameterizedLocation;
 import com.intellij.execution.junit2.info.MethodLocation;
-import com.intellij.execution.testframework.JavaTestLocationProvider;
+import com.intellij.execution.testframework.JavaTestLocator;
 import com.intellij.execution.testframework.sm.runner.SMTestProxy;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiClass;
@@ -44,7 +44,7 @@ public class JUnitRerunFailedTestsTest extends LightCodeInsightFixtureTestCase
     final SMTestProxy testProxy = new SMTestProxy("testMe", false, "java:test://ChildTest.testMe");
     final Project project = getProject();
     final GlobalSearchScope searchScope = GlobalSearchScope.projectScope(project);
-    testProxy.setLocator(new JavaTestLocationProvider(searchScope));
+    testProxy.setLocator(JavaTestLocator.INSTANCE);
 
     final Location location = testProxy.getLocation(project, searchScope);
     assertNotNull(location);
@@ -82,7 +82,7 @@ public class JUnitRerunFailedTestsTest extends LightCodeInsightFixtureTestCase
 
     final Project project = getProject();
     final GlobalSearchScope searchScope = GlobalSearchScope.projectScope(project);
-    final JavaTestLocationProvider locationProvider = new JavaTestLocationProvider(searchScope);
+    final JavaTestLocator locationProvider = JavaTestLocator.INSTANCE;
 
     final SMTestProxy rootProxy = new SMTestProxy("MyTest", true, "java:suite://MyTest");
     rootProxy.setLocator(locationProvider);
diff --git a/plugins/testng/src/com/theoryinpractice/testng/model/TestNGConsoleProperties.java b/plugins/testng/src/com/theoryinpractice/testng/model/TestNGConsoleProperties.java
index ee476986378b..0dbc3942ee26 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/model/TestNGConsoleProperties.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/model/TestNGConsoleProperties.java
@@ -18,22 +18,23 @@ package com.theoryinpractice.testng.model;
 import com.intellij.execution.Executor;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.testframework.JavaAwareTestConsoleProperties;
+import com.intellij.execution.testframework.JavaTestLocator;
+import com.intellij.execution.testframework.sm.runner.SMTestLocator;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.theoryinpractice.testng.configuration.TestNGConfiguration;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 
 public class TestNGConsoleProperties extends JavaAwareTestConsoleProperties<TestNGConfiguration> {
   private final TestNGConfiguration myConfiguration;
 
-    public TestNGConsoleProperties(TestNGConfiguration config, Executor executor)
-    {
-      super("TestNG", config, executor);
-      myConfiguration = config;
-    }
-
+  public TestNGConsoleProperties(TestNGConfiguration config, Executor executor) {
+    super("TestNG", config, executor);
+    myConfiguration = config;
+  }
 
   @NotNull
   @Override
@@ -42,9 +43,14 @@ public class TestNGConsoleProperties extends JavaAwareTestConsoleProperties<Test
   }
 
   @Override
-  protected void appendAdditionalActions(DefaultActionGroup actionGroup,
-                                         ExecutionEnvironment environment, JComponent parent) {
+  protected void appendAdditionalActions(DefaultActionGroup actionGroup, ExecutionEnvironment environment, JComponent parent) {
     super.appendAdditionalActions(actionGroup, environment, parent);
     actionGroup.addAction(createIncludeNonStartedInRerun()).setAsSecondary(true);
   }
+
+  @Nullable
+  @Override
+  public SMTestLocator getTestLocator() {
+    return JavaTestLocator.INSTANCE;
+  }
 }