diff --git a/java/execution/impl/src/com/intellij/execution/JavaTestConfigurationBase.java b/java/execution/impl/src/com/intellij/execution/JavaTestConfigurationBase.java
index f1c02ca19cca..eb94d54c5f71 100644
--- a/java/execution/impl/src/com/intellij/execution/JavaTestConfigurationBase.java
+++ b/java/execution/impl/src/com/intellij/execution/JavaTestConfigurationBase.java
@@ -34,4 +34,7 @@ public abstract class JavaTestConfigurationBase extends ModuleBasedConfiguration
                                    ConfigurationFactory factory) {
     super(configurationModule, factory);
   }
+
+  @NotNull
+  public abstract String getFrameworkPrefix();
 }
diff --git a/java/execution/impl/src/com/intellij/execution/testDiscovery/TestDiscoveryConfiguration.java b/java/execution/impl/src/com/intellij/execution/testDiscovery/TestDiscoveryConfiguration.java
index c7412ed4fbfa..3548ffbf46ad 100644
--- a/java/execution/impl/src/com/intellij/execution/testDiscovery/TestDiscoveryConfiguration.java
+++ b/java/execution/impl/src/com/intellij/execution/testDiscovery/TestDiscoveryConfiguration.java
@@ -219,7 +219,4 @@ public abstract class TestDiscoveryConfiguration extends JavaTestConfigurationBa
   public String getChangeList() {
     return myChangeList;
   }
-
-  @NotNull
-  public abstract String getFrameworkPrefix();
 }
diff --git a/java/execution/impl/src/com/intellij/execution/testDiscovery/TestDiscoveryExtension.java b/java/execution/impl/src/com/intellij/execution/testDiscovery/TestDiscoveryExtension.java
index 484d746e6432..891462341284 100644
--- a/java/execution/impl/src/com/intellij/execution/testDiscovery/TestDiscoveryExtension.java
+++ b/java/execution/impl/src/com/intellij/execution/testDiscovery/TestDiscoveryExtension.java
@@ -85,7 +85,7 @@ public class TestDiscoveryExtension extends RunConfigurationExtension {
           if ((root == null || root.getHandler() == handler)) {
             final String fullTestName = test.getLocationUrl();
             if (fullTestName != null && fullTestName.startsWith(JavaTestLocator.TEST_PROTOCOL)) {
-              myCompletedMethodNames.add(((TestDiscoveryConfiguration)configuration).getFrameworkPrefix() + fullTestName.substring(JavaTestLocator.TEST_PROTOCOL.length() + 3));
+              myCompletedMethodNames.add(((JavaTestConfigurationBase)configuration).getFrameworkPrefix() + fullTestName.substring(JavaTestLocator.TEST_PROTOCOL.length() + 3));
               if (myCompletedMethodNames.size() > 50) {
                 final String[] fullTestNames = ArrayUtil.toStringArray(myCompletedMethodNames);
                 myCompletedMethodNames.clear();
diff --git a/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java b/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java
index a7cec4b2c2c5..64b8ddb7a04a 100644
--- a/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java
+++ b/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java
@@ -456,6 +456,12 @@ public class JUnitConfiguration extends JavaTestConfigurationBase {
     return new JUnitConsoleProperties(this, executor);
   }
 
+  @NotNull
+  @Override
+  public String getFrameworkPrefix() {
+    return "j";
+  }
+
   public static class Data implements Cloneable {
     public String PACKAGE_NAME;
     public String MAIN_CLASS_NAME;
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java
index 36edadae31b9..50cc90ab6daa 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java
@@ -426,4 +426,10 @@ public class TestNGConfiguration extends JavaTestConfigurationBase {
   public SMTRunnerConsoleProperties createTestConsoleProperties(Executor executor) {
     return new TestNGConsoleProperties(this, executor);
   }
+
+  @NotNull
+  @Override
+  public String getFrameworkPrefix() {
+    return "g";
+  }
 }