diff --git a/plugins/devkit/META-INF/plugin.xml b/plugins/devkit/META-INF/plugin.xml
index aa3efebed2e2..fdebee750cd3 100644
--- a/plugins/devkit/META-INF/plugin.xml
+++ b/plugins/devkit/META-INF/plugin.xml
@@ -9,6 +9,7 @@
 
   <extensions xmlns="com.intellij">
     <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
+    <junitPatcher implementation="org.jetbrains.idea.devkit.run.JUnitDevKitPatcher"/>
   </extensions>
 
   <application-components>
diff --git a/plugins/devkit/src/run/JUnitDevKitPatcher.java b/plugins/devkit/src/run/JUnitDevKitPatcher.java
new file mode 100644
index 000000000000..df3b232b8679
--- /dev/null
+++ b/plugins/devkit/src/run/JUnitDevKitPatcher.java
@@ -0,0 +1,27 @@
+package org.jetbrains.idea.devkit.run;
+
+import com.intellij.execution.JUnitPatcher;
+import com.intellij.execution.configurations.JavaParameters;
+import com.intellij.openapi.projectRoots.ProjectJdk;
+import org.jetbrains.idea.devkit.projectRoots.IdeaJdk;
+
+import java.io.File;
+
+/**
+ * User: anna
+ * Date: Mar 4, 2005
+ */
+public class JUnitDevKitPatcher extends JUnitPatcher{
+
+  public void patchJavaParameters(JavaParameters javaParameters) {
+    final ProjectJdk jdk = javaParameters.getJdk();
+    if (!(jdk.getSdkType() instanceof IdeaJdk)) {
+      return;
+    }
+    String libPath = jdk.getHomePath() + File.separator + "lib";
+    javaParameters.getVMParametersList().add("-Xbootclasspath/p:" + libPath + File.separator + "boot.jar");
+    javaParameters.getClassPath().addFirst(libPath + File.separator + "idea.jar");
+    javaParameters.getClassPath().addTail(libPath + File.separator + "idea_rt.jar");
+    javaParameters.getClassPath().addFirst(libPath + File.separator + "resources.jar");
+  }
+}