diff --git a/buildSrc/src/main/kotlin/intellijDependencies.kt b/buildSrc/src/main/kotlin/intellijDependencies.kt
index 5aca38988e8..9c6461a0a8c 100644
--- a/buildSrc/src/main/kotlin/intellijDependencies.kt
+++ b/buildSrc/src/main/kotlin/intellijDependencies.kt
@@ -141,8 +141,7 @@ fun Project.runIdeTask(name: String, ideaPluginDir: File, ideaSandboxDir: File,
             "-Dapple.laf.useScreenMenuBar=true",
             "-Dapple.awt.graphics.UseQuartz=true",
             "-Dsun.io.useCanonCaches=false",
-            "-Dplugin.path=${ideaPluginDir.absolutePath}",
-            "-Didea.additional.classpath=../idea-kotlin-runtime/kotlin-runtime.jar,../idea-kotlin-runtime/kotlin-reflect.jar"
+            "-Dplugin.path=${ideaPluginDir.absolutePath}"
         )
 
         if (rootProject.findProperty("versions.androidStudioRelease") != null) {
diff --git a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerApiTest.kt b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerApiTest.kt
index 7e8e2f65c68..67f1cc6fb89 100644
--- a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerApiTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerApiTest.kt
@@ -41,9 +41,6 @@ class CompilerApiTest : KotlinIntegrationTestBase() {
 
     val compilerClassPath = listOf(
             File(compilerLibDir, "kotlin-compiler.jar"))
-    val scriptRuntimeClassPath = listOf(
-            File(compilerLibDir, "kotlin-runtime.jar"),
-            File(compilerLibDir, "kotlin-script-runtime.jar"))
     val compilerId by lazy(LazyThreadSafetyMode.NONE) { CompilerId.makeCompilerId(compilerClassPath) }
 
     private fun compileLocally(messageCollector: TestMessageCollector, vararg args: String): Pair<Int, Collection<OutputMessageUtil.Output>> {
@@ -147,7 +144,7 @@ class CompilerApiTest : KotlinIntegrationTestBase() {
         Assert.assertEquals(0, code)
         Assert.assertTrue(outputs.isNotEmpty())
         Assert.assertEquals(File(tmpdir, "Script.class").absolutePath, outputs.first().outputFile?.absolutePath)
-        runScriptWithArgs(getSimpleScriptBaseDir(), "script", "Script", scriptRuntimeClassPath + tmpdir, "hi", "there")
+        runScriptWithArgs(getSimpleScriptBaseDir(), "script", "Script", listOf(tmpdir), "hi", "there")
     }
 
     fun testSimpleScript() {
@@ -168,7 +165,7 @@ class CompilerApiTest : KotlinIntegrationTestBase() {
                 Assert.assertEquals(0, code)
                 Assert.assertTrue(outputs.isNotEmpty())
                 Assert.assertEquals(File(tmpdir, "Script.class").absolutePath, outputs.first().outputFile?.absolutePath)
-                runScriptWithArgs(getSimpleScriptBaseDir(), "script", "Script", scriptRuntimeClassPath + tmpdir, "hi", "there")
+                runScriptWithArgs(getSimpleScriptBaseDir(), "script", "Script", listOf(tmpdir), "hi", "there")
             }
             finally {
                 KotlinCompilerClient.shutdownCompileService(compilerId, daemonOptions)
diff --git a/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTestBase.java b/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTestBase.java
index 628a6ffa7b8..23a59ced916 100644
--- a/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTestBase.java
+++ b/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTestBase.java
@@ -36,9 +36,7 @@ public abstract class CompilerSmokeTestBase extends KotlinIntegrationTestBase {
 
         javaArgs.add("-cp");
         javaArgs.add(StringsKt.join(Arrays.asList(
-                getCompilerLib().getAbsolutePath() + File.separator + "kotlin-compiler.jar",
-                new File("dependencies/bootstrap-compiler/Kotlin/kotlinc/lib/kotlin-runtime.jar").getAbsolutePath(),
-                new File("dependencies/bootstrap-compiler/Kotlin/kotlinc/lib/kotlin-reflect.jar").getAbsolutePath()
+                getCompilerLib().getAbsolutePath() + File.separator + "kotlin-compiler.jar"
         ), File.pathSeparator));
         javaArgs.add("org.jetbrains.kotlin.cli.jvm.K2JVMCompiler");