diff --git a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
index 147b85008ded..827fd3f2dfd7 100644
--- a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
+++ b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
@@ -160,7 +160,7 @@ public abstract class JavaTestFrameworkRunnableState<T extends ModuleBasedConfig
   }
 
   protected boolean isSmRunnerUsed() {
-    return Registry.is(getFrameworkId() + "_sm_runner");
+    return Registry.is(getFrameworkId() + "_sm");
   }
 
   @Override
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index fe354b846c78..9aa874adf40f 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -362,8 +362,8 @@ ui.no.bangs.and.whistles=false
 
 comment.by.line.bulk.lines.trigger=100
 
-junit_sm_runner=true
-testng_sm_runner=true
+junit_sm=true
+testng_sm=true
 show.flex.debug.design.view=false
 
 diff.patience.alg=false
diff --git a/plugins/junit/test/com/intellij/execution/junit/JUnitClasspathTest.java b/plugins/junit/test/com/intellij/execution/junit/JUnitClasspathTest.java
index 4d4289cfa1c1..2303ec37d508 100644
--- a/plugins/junit/test/com/intellij/execution/junit/JUnitClasspathTest.java
+++ b/plugins/junit/test/com/intellij/execution/junit/JUnitClasspathTest.java
@@ -72,7 +72,7 @@ public class JUnitClasspathTest extends JavaCodeInsightFixtureTestCase {
 
     //ensure fork when whole project is used
     persistentData.setScope(TestSearchScope.WHOLE_PROJECT);
-    final RegistryValue smRunnerProperty = Registry.get("junit_sm_runner");
+    final RegistryValue smRunnerProperty = Registry.get("junit_sm");
     final boolean oldValue = smRunnerProperty.asBoolean();
     try {
       //check old format
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/SearchingForTestsTask.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/SearchingForTestsTask.java
index b1040cba79d1..52fe8d869a8f 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/SearchingForTestsTask.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/SearchingForTestsTask.java
@@ -99,7 +99,7 @@ public class SearchingForTestsTask extends SearchForTestsTask {
 
   @Override
   protected void startListening() {
-    if (!Registry.is("testng_sm_runner")) myClient.startListening(myConfig);
+    if (!Registry.is("testng_sm")) myClient.startListening(myConfig);
   }
 
   protected void logCantRunException(ExecutionException e) {