diff --git a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
index 3b58b42fd29e..604da8461825 100644
--- a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
+++ b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
@@ -20,7 +20,6 @@ import com.intellij.execution.configurations.*;
 import com.intellij.execution.process.OSProcessHandler;
 import com.intellij.execution.process.ProcessAdapter;
 import com.intellij.execution.process.ProcessEvent;
-import com.intellij.execution.process.ProcessTerminatedListener;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.testframework.*;
 import com.intellij.execution.testframework.actions.AbstractRerunFailedTestsAction;
@@ -74,6 +73,8 @@ public abstract class JavaTestFrameworkRunnableState<T extends ModuleBasedConfig
 
   @NotNull protected abstract OSProcessHandler createHandler(Executor executor) throws ExecutionException;
 
+  @NotNull protected abstract SMTRunnerConsoleProperties createTestConsoleProperties(Executor executor);
+
   public SearchForTestsTask createSearchingForTestsTask() {
     return null;
   }
@@ -91,11 +92,12 @@ public abstract class JavaTestFrameworkRunnableState<T extends ModuleBasedConfig
 
     final RunnerSettings runnerSettings = getRunnerSettings();
 
-    final TestConsoleProperties testConsoleProperties = new SMTRunnerConsoleProperties(getConfiguration(), getFrameworkName(), executor);
+    final TestConsoleProperties testConsoleProperties = createTestConsoleProperties(executor);
     testConsoleProperties.setIfUndefined(TestConsoleProperties.HIDE_PASSED_TESTS, false);
 
     final BaseTestsOutputConsoleView consoleView =
       SMTestRunnerConnectionUtil.createConsoleWithCustomLocator(getFrameworkName(), testConsoleProperties, getEnvironment(), null);
+    final SMTestRunnerResultsForm viewer = ((SMTRunnerConsoleView)consoleView).getResultsViewer();
     Disposer.register(getConfiguration().getProject(), consoleView);
 
     final OSProcessHandler handler = createHandler(executor);
@@ -105,7 +107,6 @@ public abstract class JavaTestFrameworkRunnableState<T extends ModuleBasedConfig
       public void processTerminated(ProcessEvent event) {
         Runnable runnable = new Runnable() {
           public void run() {
-            final SMTestRunnerResultsForm viewer = ((SMTRunnerConsoleView)consoleView).getResultsViewer();
             if (viewer.hasTestSuites() ||
                 !ResetConfigurationModuleAdapter.tryWithAnotherModule(getConfiguration(), testConsoleProperties.isDebug())) {
               TestsUIUtil.notifyByBalloon(testConsoleProperties.getProject(), viewer.hasTestSuites(), viewer.getRoot(), testConsoleProperties, null);
@@ -122,7 +123,7 @@ public abstract class JavaTestFrameworkRunnableState<T extends ModuleBasedConfig
     rerunFailedTestsAction.setModelProvider(new Getter<TestFrameworkRunningModel>() {
       @Override
       public TestFrameworkRunningModel get() {
-        return ((SMTRunnerConsoleView)consoleView).getResultsViewer();
+        return viewer;
       }
     });
 
diff --git a/java/execution/impl/src/com/intellij/execution/testframework/JavaAwareTestConsoleProperties.java b/java/execution/impl/src/com/intellij/execution/testframework/JavaAwareTestConsoleProperties.java
index 6ca16855c893..c644d05b97cd 100644
--- a/java/execution/impl/src/com/intellij/execution/testframework/JavaAwareTestConsoleProperties.java
+++ b/java/execution/impl/src/com/intellij/execution/testframework/JavaAwareTestConsoleProperties.java
@@ -23,15 +23,17 @@ package com.intellij.execution.testframework;
 import com.intellij.debugger.DebuggerManagerEx;
 import com.intellij.debugger.impl.DebuggerSession;
 import com.intellij.execution.Executor;
+import com.intellij.execution.configurations.RunConfiguration;
+import com.intellij.execution.testframework.sm.runner.SMTRunnerConsoleProperties;
 import com.intellij.openapi.project.Project;
 import com.intellij.util.config.Storage;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
 
-public abstract class JavaAwareTestConsoleProperties extends TestConsoleProperties {
-  public JavaAwareTestConsoleProperties(final Storage storage, Project project, Executor executor) {
-    super(storage, project, executor);
+public abstract class JavaAwareTestConsoleProperties extends SMTRunnerConsoleProperties {
+  public JavaAwareTestConsoleProperties(final String testFrameworkName, RunConfiguration configuration, Executor executor) {
+    super(configuration, testFrameworkName, executor, false);
   }
 
   @Override
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerToolbarPanel.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerToolbarPanel.java
index 9d6fa6c990bd..9bd252811cd5 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerToolbarPanel.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerToolbarPanel.java
@@ -19,6 +19,7 @@ import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.testframework.TestConsoleProperties;
 import com.intellij.execution.testframework.TestFrameworkRunningModel;
 import com.intellij.execution.testframework.ToolbarPanel;
+import com.intellij.openapi.actionSystem.DefaultActionGroup;
 
 import javax.swing.*;
 
diff --git a/platform/testRunner/src/com/intellij/execution/testframework/TestConsoleProperties.java b/platform/testRunner/src/com/intellij/execution/testframework/TestConsoleProperties.java
index 364885e54292..f3ff19ce70ae 100644
--- a/platform/testRunner/src/com/intellij/execution/testframework/TestConsoleProperties.java
+++ b/platform/testRunner/src/com/intellij/execution/testframework/TestConsoleProperties.java
@@ -20,23 +20,30 @@
  */
 package com.intellij.execution.testframework;
 
+import com.intellij.execution.ExecutionBundle;
 import com.intellij.execution.Executor;
 import com.intellij.execution.configurations.ModuleRunProfile;
 import com.intellij.execution.configurations.RunConfiguration;
 import com.intellij.execution.executors.DefaultDebugExecutor;
+import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.ui.ConsoleView;
 import com.intellij.execution.ui.ExecutionConsole;
 import com.intellij.execution.util.StoringPropertyContainer;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.Disposable;
+import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.util.config.AbstractProperty;
 import com.intellij.util.config.BooleanProperty;
 import com.intellij.util.config.Storage;
+import com.intellij.util.config.ToggleBooleanProperty;
 import com.intellij.xdebugger.XDebugSession;
 import com.intellij.xdebugger.XDebuggerManager;
+import org.jetbrains.annotations.NotNull;
 
+import javax.swing.*;
 import java.util.ArrayList;
 import java.util.HashMap;
 
@@ -178,4 +185,17 @@ public abstract class TestConsoleProperties extends StoringPropertyContainer imp
   public void setUsePredefinedMessageFilter(boolean usePredefinedMessageFilter) {
     myUsePredefinedMessageFilter = usePredefinedMessageFilter;
   }
+
+  protected void appendAdditionalActions(DefaultActionGroup actionGroup,
+                                         ExecutionEnvironment environment, JComponent parent) {
+  }
+
+  @NotNull
+  protected ToggleBooleanProperty createIncludeNonStartedInRerun() {
+    return new ToggleBooleanProperty(
+      ExecutionBundle.message("junit.runing.info.include.non.started.in.rerun.failed.action.name"),
+      null,
+      AllIcons.RunConfigurations.IncludeNonStartedTests_Rerun,
+      this, TestConsoleProperties.INCLUDE_NON_STARTED_IN_RERUN_FAILED);
+  }
 }
diff --git a/platform/testRunner/src/com/intellij/execution/testframework/ToolbarPanel.java b/platform/testRunner/src/com/intellij/execution/testframework/ToolbarPanel.java
index 541f024ea239..baceee628301 100644
--- a/platform/testRunner/src/com/intellij/execution/testframework/ToolbarPanel.java
+++ b/platform/testRunner/src/com/intellij/execution/testframework/ToolbarPanel.java
@@ -113,17 +113,13 @@ public class ToolbarPanel extends JPanel implements OccurenceNavigator, Disposab
     myExportAction = ExportTestResultsAction.create(properties.getExecutor().getToolWindowId(), properties.getConfiguration());
     actionGroup.addAction(myExportAction);
 
-    appendAdditionalActions(actionGroup, properties, environment, parent);
+    properties.appendAdditionalActions(actionGroup, environment, parent);
 
     add(ActionManager.getInstance().
       createActionToolbar(ActionPlaces.TESTTREE_VIEW_TOOLBAR, actionGroup, true).
       getComponent(), BorderLayout.CENTER);
   }
 
-  protected void appendAdditionalActions(DefaultActionGroup actionGroup, TestConsoleProperties properties,
-                                         ExecutionEnvironment environment, JComponent parent) {
-  }
-
   public void setModel(final TestFrameworkRunningModel model) {
     TestFrameworkActions.installFilterAction(model);
     myScrollToSource.setModel(model);
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestObject.java b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
index 51dad2db57b1..d41883cbf444 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestObject.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
@@ -36,6 +36,7 @@ import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.runners.ProgramRunner;
 import com.intellij.execution.testframework.*;
 import com.intellij.execution.testframework.actions.AbstractRerunFailedTestsAction;
+import com.intellij.execution.testframework.sm.runner.SMTRunnerConsoleProperties;
 import com.intellij.execution.ui.ConsoleView;
 import com.intellij.execution.ui.ConsoleViewContentType;
 import com.intellij.execution.util.JavaParametersUtil;
@@ -313,6 +314,12 @@ public abstract class TestObject extends JavaTestFrameworkRunnableState<JUnitCon
     return JUnitProcessHandler.runCommandLine(createCommandLine());
   }
 
+  @NotNull
+  @Override
+  protected SMTRunnerConsoleProperties createTestConsoleProperties(Executor executor) {
+    return new JUnitConsoleProperties(getConfiguration(), executor);
+  }
+
   private boolean forkPerModule() {
     final String workingDirectory = getConfiguration().getWorkingDirectory();
     return JUnitConfiguration.TEST_PACKAGE.equals(getConfiguration().getPersistentData().TEST_OBJECT) &&
diff --git a/plugins/junit/src/com/intellij/execution/junit2/ui/actions/JUnitToolbarPanel.java b/plugins/junit/src/com/intellij/execution/junit2/ui/actions/JUnitToolbarPanel.java
index 180deac756bc..9a66b5299d4e 100644
--- a/plugins/junit/src/com/intellij/execution/junit2/ui/actions/JUnitToolbarPanel.java
+++ b/plugins/junit/src/com/intellij/execution/junit2/ui/actions/JUnitToolbarPanel.java
@@ -16,7 +16,6 @@
 
 package com.intellij.execution.junit2.ui.actions;
 
-import com.intellij.execution.ExecutionBundle;
 import com.intellij.execution.Location;
 import com.intellij.execution.junit2.TestProxy;
 import com.intellij.execution.junit2.ui.model.JUnitAdapter;
@@ -26,13 +25,10 @@ import com.intellij.execution.junit2.ui.properties.JUnitConsoleProperties;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.testframework.*;
 import com.intellij.execution.testframework.actions.ScrollToTestSourceAction;
-import com.intellij.icons.AllIcons;
-import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.project.Project;
 import com.intellij.pom.Navigatable;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.util.config.ToggleBooleanProperty;
 import org.jetbrains.annotations.NonNls;
 
 import javax.swing.*;
@@ -46,18 +42,6 @@ public class JUnitToolbarPanel extends ToolbarPanel {
     super(properties, environment, parentComponent);
   }
 
-  @Override
-  protected void appendAdditionalActions(DefaultActionGroup actionGroup,
-                                         TestConsoleProperties properties,
-                                         ExecutionEnvironment environment, JComponent parent) {
-    super.appendAdditionalActions(actionGroup, properties, environment, parent);
-    actionGroup.addAction(new ToggleBooleanProperty(
-      ExecutionBundle.message("junit.runing.info.include.non.started.in.rerun.failed.action.name"),
-      null,
-      AllIcons.RunConfigurations.IncludeNonStartedTests_Rerun,
-      properties, TestConsoleProperties.INCLUDE_NON_STARTED_IN_RERUN_FAILED)).setAsSecondary(true);
-  }
-
 
   public void setModel(final TestFrameworkRunningModel model) {
     super.setModel(model);
diff --git a/plugins/junit/src/com/intellij/execution/junit2/ui/model/JUnitRunningModel.java b/plugins/junit/src/com/intellij/execution/junit2/ui/model/JUnitRunningModel.java
index 4d53bb8cbaa7..beb0d013540c 100644
--- a/plugins/junit/src/com/intellij/execution/junit2/ui/model/JUnitRunningModel.java
+++ b/plugins/junit/src/com/intellij/execution/junit2/ui/model/JUnitRunningModel.java
@@ -199,7 +199,7 @@ public class JUnitRunningModel implements TestFrameworkRunningModel {
   }
 
   public JUnitConfiguration getConfiguration() {
-    return myProperties.getConfiguration();
+    return (JUnitConfiguration)myProperties.getConfiguration();
   }
 
   private class MyTreeSelectionListener extends FocusAdapter implements TreeSelectionListener, Disposable {
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 2a1eb7de6f86..56f9c1103174 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
@@ -18,33 +18,34 @@ package com.intellij.execution.junit2.ui.properties;
 
 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.SourceScope;
-import com.intellij.ide.util.PropertiesComponent;
+import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.util.config.Storage;
-import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
+import javax.swing.*;
+
 public class JUnitConsoleProperties extends JavaAwareTestConsoleProperties {
-  @NonNls private static final String GROUP_NAME = "JUnitSupport.";
 
   private final JUnitConfiguration myConfiguration;
 
   public JUnitConsoleProperties(@NotNull JUnitConfiguration configuration, Executor executor) {
-    this(configuration, new Storage.PropertiesComponentStorage(GROUP_NAME, PropertiesComponent.getInstance()), executor);
-  }
-
-  public JUnitConsoleProperties(@NotNull JUnitConfiguration configuration, final Storage storage, Executor executor) {
-    super(storage, configuration.getProject(), executor);
+    super("JUnit", configuration, executor);
     myConfiguration = configuration;
   }
 
-  public JUnitConfiguration getConfiguration() { return myConfiguration; }
-
   @Override
   protected GlobalSearchScope initScope() {
     final SourceScope sourceScope = myConfiguration.getPersistentData().getScope().getSourceScope(myConfiguration);
     return sourceScope != null ? sourceScope.getGlobalSearchScope() : GlobalSearchScope.allScope(getProject());
   }
+
+  @Override
+  protected void appendAdditionalActions(DefaultActionGroup actionGroup,
+                                         ExecutionEnvironment environment, JComponent parent) {
+    super.appendAdditionalActions(actionGroup, environment, parent);
+    actionGroup.addAction(createIncludeNonStartedInRerun()).setAsSecondary(true);
+  }
 }
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java
index 4624c204247f..9c2c15439a1b 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java
@@ -25,6 +25,7 @@ import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.runners.ProgramRunner;
 import com.intellij.execution.testframework.*;
 import com.intellij.execution.testframework.actions.AbstractRerunFailedTestsAction;
+import com.intellij.execution.testframework.sm.runner.SMTRunnerConsoleProperties;
 import com.intellij.execution.ui.ConsoleView;
 import com.intellij.execution.ui.ConsoleViewContentType;
 import com.intellij.openapi.diagnostic.Logger;
@@ -181,6 +182,12 @@ public class TestNGRunnableState extends JavaTestFrameworkRunnableState<TestNGCo
     return module != null && getConfiguration().getPersistantData().getScope() != TestSearchScope.WHOLE_PROJECT;
   }
 
+  @NotNull
+  @Override
+  protected SMTRunnerConsoleProperties createTestConsoleProperties(Executor executor) {
+    return new TestNGConsoleProperties(getConfiguration(), executor);
+  }
+
   @Override
   protected JavaParameters createJavaParameters() throws ExecutionException {
     final JavaParameters javaParameters = super.createJavaParameters();
diff --git a/plugins/testng/src/com/theoryinpractice/testng/model/TestNGConsoleProperties.java b/plugins/testng/src/com/theoryinpractice/testng/model/TestNGConsoleProperties.java
index 1aae7cdf4e5a..9b048468b091 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/model/TestNGConsoleProperties.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/model/TestNGConsoleProperties.java
@@ -16,30 +16,33 @@
 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.ide.util.PropertiesComponent;
+import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.util.config.Storage;
 import com.theoryinpractice.testng.configuration.TestNGConfiguration;
-import org.jetbrains.annotations.NonNls;
+
+import javax.swing.*;
 
 public class TestNGConsoleProperties extends JavaAwareTestConsoleProperties {
-    @NonNls private static final String PREFIX = "TestNGSupport.";
-    private final TestNGConfiguration myConfiguration;
+  private final TestNGConfiguration myConfiguration;
 
     public TestNGConsoleProperties(TestNGConfiguration config, Executor executor)
     {
-      super(new Storage.PropertiesComponentStorage(PREFIX, PropertiesComponent.getInstance()), config.getProject(), executor);
+      super("TestNG", config, executor);
       myConfiguration = config;
     }
 
-    public TestNGConfiguration getConfiguration()
-    {
-        return myConfiguration;
-    }
 
   @Override
   protected GlobalSearchScope initScope() {
     return myConfiguration.getPersistantData().getScope().getSourceScope(myConfiguration).getGlobalSearchScope();
   }
+
+  @Override
+  protected void appendAdditionalActions(DefaultActionGroup actionGroup,
+                                         ExecutionEnvironment environment, JComponent parent) {
+    super.appendAdditionalActions(actionGroup, environment, parent);
+    actionGroup.addAction(createIncludeNonStartedInRerun()).setAsSecondary(true);
+  }
 }
diff --git a/plugins/testng/src/com/theoryinpractice/testng/ui/TestNGResults.java b/plugins/testng/src/com/theoryinpractice/testng/ui/TestNGResults.java
index 04d8d1b0ec6e..7e4ec014171b 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/ui/TestNGResults.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/ui/TestNGResults.java
@@ -153,19 +153,7 @@ public class TestNGResults extends TestResultsPanel implements TestFrameworkRunn
 
   @Override
   protected ToolbarPanel createToolbarPanel() {
-    final ToolbarPanel panel = new ToolbarPanel(getProperties(), myEnvironment, this){
-      @Override
-      protected void appendAdditionalActions(DefaultActionGroup actionGroup,
-                                             TestConsoleProperties properties,
-                                             ExecutionEnvironment environment, JComponent parent) {
-        super.appendAdditionalActions(actionGroup, properties, environment, parent);
-        actionGroup.addAction(new ToggleBooleanProperty(
-          ExecutionBundle.message("junit.runing.info.include.non.started.in.rerun.failed.action.name"),
-                                                    null,
-                                                    AllIcons.RunConfigurations.IncludeNonStartedTests_Rerun,
-                                                    properties, TestConsoleProperties.INCLUDE_NON_STARTED_IN_RERUN_FAILED)).setAsSecondary(true);
-      }
-    };
+    final ToolbarPanel panel = new ToolbarPanel(getProperties(), myEnvironment, this);
     panel.setModel(this);
     return panel;
   }