diff --git a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
index 758f6aa78cdf..fc6e4bb7e806 100644
--- a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
+++ b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
@@ -47,14 +47,12 @@ import com.intellij.openapi.util.Getter;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.openapi.util.text.StringUtilRt;
 import com.intellij.openapi.vfs.CharsetToolkit;
 import com.intellij.psi.JavaPsiFacade;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiPackage;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.GlobalSearchScopesCore;
-import com.intellij.rt.execution.CommandLineWrapper;
 import com.intellij.util.PathUtil;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
@@ -251,7 +249,7 @@ public abstract class JavaTestFrameworkRunnableState<T extends ModuleBasedConfig
       final PrintWriter writer = new PrintWriter(tempFile, CharsetToolkit.UTF8);
       try {
         if (JdkUtil.useDynamicClasspath(getConfiguration().getProject())) {
-          writer.println(PathUtil.getJarPathForClass(CommandLineWrapper.class));
+          writer.println("use classpath jar");
         }
         else {
           writer.println("");
diff --git a/java/java-runtime/src/com/intellij/rt/execution/testFrameworks/ForkedByModuleSplitter.java b/java/java-runtime/src/com/intellij/rt/execution/testFrameworks/ForkedByModuleSplitter.java
index 2ffdcaffe5f8..e6b434cd8801 100644
--- a/java/java-runtime/src/com/intellij/rt/execution/testFrameworks/ForkedByModuleSplitter.java
+++ b/java/java-runtime/src/com/intellij/rt/execution/testFrameworks/ForkedByModuleSplitter.java
@@ -15,8 +15,6 @@
  */
 package com.intellij.rt.execution.testFrameworks;
 
-import com.intellij.rt.execution.CommandLineWrapper;
-
 import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
@@ -83,10 +81,7 @@ public abstract class ForkedByModuleSplitter {
     builder.add("-classpath");
     if (myDynamicClasspath.length() > 0) {
       try {
-        final File classpathFile = createClasspathJarFile(new Manifest(), classpath);
-        builder.add(myDynamicClasspath + File.pathSeparator + classpathFile.getAbsolutePath());
-        builder.add(CommandLineWrapper.class.getName());
-        builder.add(classpathFile.getAbsolutePath());
+        builder.add(createClasspathJarFile(new Manifest(), classpath).getAbsolutePath());
       }
       catch (Throwable e) {
         builder.add(classpath);
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/ExternalProcessUtil.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/ExternalProcessUtil.java
index 24e994e023ad..fcc4def0298b 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/ExternalProcessUtil.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/ExternalProcessUtil.java
@@ -105,8 +105,6 @@ public class ExternalProcessUtil {
             final String classpathFile = CommandLineWrapperUtil.createClasspathJarFile(new Manifest(), classpath).getAbsolutePath();
             commandLineWrapperArgs = Arrays.asList(
               "-classpath",
-              ClasspathBootstrap.getResourcePath(wrapperClass) + File.pathSeparator + classpathFile,
-              wrapperClass.getName(),
               classpathFile
             );
           }
diff --git a/platform/lang-api/src/com/intellij/openapi/projectRoots/JdkUtil.java b/platform/lang-api/src/com/intellij/openapi/projectRoots/JdkUtil.java
index a9dbabd90361..ded00415fd0c 100644
--- a/platform/lang-api/src/com/intellij/openapi/projectRoots/JdkUtil.java
+++ b/platform/lang-api/src/com/intellij/openapi/projectRoots/JdkUtil.java
@@ -173,7 +173,8 @@ public class JdkUtil {
           final Manifest manifest = new Manifest();
           manifest.getMainAttributes().putValue("Created-By", 
                                                 ApplicationNamesInfo.getInstance().getFullProductName());
-          if (javaParameters.isDynamicVMOptions() && useDynamicVMOptions()) {
+          final boolean writeDynamicVMOptions = javaParameters.isDynamicVMOptions() && useDynamicVMOptions();
+          if (writeDynamicVMOptions) {
             List<String> dParams = new ArrayList<String>();
             for (String param : vmParametersList.getList()) {
               if (param.startsWith("-D")) {
@@ -193,11 +194,16 @@ public class JdkUtil {
           final List<String> classPathList = javaParameters.getClassPath().getPathList();
           final String jarFile = CommandLineWrapperUtil.createClasspathJarFile(manifest, classPathList, notEscape).getAbsolutePath();
           commandLine.addParameter("-classpath");
-          commandLine.addParameter(PathUtil.getJarPathForClass(commandLineWrapper) + File.pathSeparator + jarFile);
-
-          appendEncoding(javaParameters, commandLine, vmParametersList);
-          commandLine.addParameter(commandLineWrapper.getName());
-          commandLine.addParameter(jarFile);
+          if (writeDynamicVMOptions) {
+            commandLine.addParameter(PathUtil.getJarPathForClass(commandLineWrapper) + File.pathSeparator + jarFile);
+            appendEncoding(javaParameters, commandLine, vmParametersList);
+            commandLine.addParameter(commandLineWrapper.getName());
+            commandLine.addParameter(jarFile);
+          }
+          else {
+            commandLine.addParameters(jarFile);
+            appendEncoding(javaParameters, commandLine, vmParametersList);
+          }
         }
         catch (IOException e) {
           LOG.error(e);