diff --git a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
index c885e314de73..4b18e282b5d7 100644
--- a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
+++ b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.execution;
 
 import com.intellij.ExtensionPoints;
@@ -198,7 +198,6 @@ public abstract class JavaTestFrameworkRunnableState<T extends
   protected JavaParameters createJavaParameters() throws ExecutionException {
     final JavaParameters javaParameters = new JavaParameters();
     Project project = getConfiguration().getProject();
-    javaParameters.setShortenCommandLine(getConfiguration().getShortenCommandLine(), project);
     final Module module = getConfiguration().getConfigurationModule().getModule();
 
     Sdk jdk = module == null ? ProjectRootManager.getInstance(project).getProjectSdk() : ModuleRootManager.getInstance(module).getSdk();
@@ -233,6 +232,8 @@ public abstract class JavaTestFrameworkRunnableState<T extends
       javaParameters.getVMParametersList().addProperty("idea.test.cyclic.buffer.size", String.valueOf(ConsoleBuffer.getCycleBufferSize()));
     }
 
+    javaParameters.setShortenCommandLine(getConfiguration().getShortenCommandLine(), project);
+
     return javaParameters;
   }
 
diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationCommandLineState.java b/java/execution/impl/src/com/intellij/execution/application/ApplicationCommandLineState.java
index fbf61c1cb24f..5833be34e7f3 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationCommandLineState.java
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationCommandLineState.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.execution.application;
 
 import com.intellij.codeInsight.daemon.impl.analysis.JavaModuleGraphUtil;
@@ -41,7 +41,6 @@ public abstract class ApplicationCommandLineState<T extends
   protected JavaParameters createJavaParameters() throws ExecutionException {
     final JavaParameters params = new JavaParameters();
     T configuration = getConfiguration();
-    params.setShortenCommandLine(configuration.getShortenCommandLine(), configuration.getProject());
 
     params.setMainClass(myConfiguration.getRunClass());
     setupJavaParameters(params);
@@ -61,6 +60,8 @@ public abstract class ApplicationCommandLineState<T extends
 
     setupModulePath(params, module);
 
+    params.setShortenCommandLine(configuration.getShortenCommandLine(), configuration.getProject());
+
     return params;
   }