diff --git a/java/execution/impl/src/com/intellij/execution/actions/AbstractRerunFailedTestsAction.java b/java/execution/impl/src/com/intellij/execution/actions/AbstractRerunFailedTestsAction.java
index 40a91499fd2a..4ffd73d63d54 100644
--- a/java/execution/impl/src/com/intellij/execution/actions/AbstractRerunFailedTestsAction.java
+++ b/java/execution/impl/src/com/intellij/execution/actions/AbstractRerunFailedTestsAction.java
@@ -118,8 +118,7 @@ public class AbstractRerunFailedTestsAction extends AnAction implements AnAction
 
   public final void update(AnActionEvent e) {
     AbstractRerunFailedTestsAction action = findActualAction();
-    TestFrameworkRunningModel model = action.getModel();
-    e.getPresentation().setEnabled(action.isActive(e) && model != null && !model.isRunning());
+    e.getPresentation().setEnabled(action.isActive(e));
   }
 
   private boolean isActive(AnActionEvent e) {
@@ -163,7 +162,7 @@ public class AbstractRerunFailedTestsAction extends AnAction implements AnAction
                                                         myEnvironment.getRunnerSettings(),
                                                         myEnvironment.getConfigurationSettings(),
                                                         myEnvironment.getContentToReuse(),
-                                                        myEnvironment.getRunnerAndConfigurationSettings()));
+                                                        null));
     }
     catch (ExecutionException e1) {
       LOG.error(e1);
diff --git a/platform/lang-impl/src/com/intellij/execution/runners/RestartAction.java b/platform/lang-impl/src/com/intellij/execution/runners/RestartAction.java
index b41bf27a800b..03d40981ff98 100644
--- a/platform/lang-impl/src/com/intellij/execution/runners/RestartAction.java
+++ b/platform/lang-impl/src/com/intellij/execution/runners/RestartAction.java
@@ -20,7 +20,6 @@ import com.intellij.execution.process.ProcessHandler;
 import com.intellij.execution.ui.RunContentDescriptor;
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.DataManager;
-import com.intellij.idea.ActionsBundle;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.keymap.KeymapManager;
 import com.intellij.openapi.project.DumbAware;
@@ -102,11 +101,6 @@ public class RestartAction extends AnAction implements DumbAware, AnAction.Trans
   public void update(final AnActionEvent event) {
     final Presentation presentation = event.getPresentation();
     String name = myEnvironment.getRunProfile().getName();
-    if (name.startsWith(ActionsBundle.message("action.RerunFailedTests.text"))) {
-      RunnerAndConfigurationSettings settings = myEnvironment.getRunnerAndConfigurationSettings();
-      if (settings != null)
-        name = settings.getName();
-    }
     final boolean isRunning = myProcessHandler != null && !myProcessHandler.isProcessTerminated();
     boolean isTerminating = myProcessHandler != null && myProcessHandler.isProcessTerminating();
     boolean isStarting = ExecutorRegistry.getInstance().isStarting(myEnvironment.getProject(), myExecutor.getId(), myRunner.getRunnerId());