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 cc1e787aab22..37da6d4417d1 100644
--- a/java/execution/impl/src/com/intellij/execution/actions/AbstractRerunFailedTestsAction.java
+++ b/java/execution/impl/src/com/intellij/execution/actions/AbstractRerunFailedTestsAction.java
@@ -104,7 +104,8 @@ public class AbstractRerunFailedTestsAction extends AnAction {
                                                         profile.getProject(),
                                                         myEnvironment.getRunnerSettings(),
                                                         myEnvironment.getConfigurationSettings(),
-                                                        null));
+                                                        null,
+                                                        myEnvironment.getRunnerAndConfigurationSettings()));
     }
     catch (ExecutionException e1) {
       LOG.error(e1);
diff --git a/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironment.java b/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironment.java
index 58385f88e55f..60339169e0fe 100644
--- a/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironment.java
+++ b/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironment.java
@@ -40,13 +40,14 @@ public class ExecutionEnvironment extends UserDataHolderBase {
 
   @Nullable private RunnerSettings myRunnerSettings;
   @Nullable private ConfigurationPerRunnerSettings myConfigurationSettings;
-  @Nullable private RunnerAndConfigurationSettings myRunnerAndConfigurationSettings;
+  @Nullable private final RunnerAndConfigurationSettings myRunnerAndConfigurationSettings;
   @Nullable private final RunContentDescriptor myContentToReuse;
 
   @TestOnly
   public ExecutionEnvironment() {
     myProject = null;
     myContentToReuse = null;
+    myRunnerAndConfigurationSettings = null;
   }
 
   public ExecutionEnvironment(@NotNull final ProgramRunner runner,