diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
index b45d679202a..8edd894a06e 100644
--- a/compiler/build.gradle.kts
+++ b/compiler/build.gradle.kts
@@ -40,7 +40,6 @@ val testJvm6ServerRuntime by configurations.creating
 val antLauncherJar by configurations.creating
 
 dependencies {
-    testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntime(intellijDep()) // Should come before compiler, because of "progarded" stuff needed for tests
 
     depDistProjects.forEach {
diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts
index 59bf3874515..6da93594679 100644
--- a/idea/build.gradle.kts
+++ b/idea/build.gradle.kts
@@ -74,7 +74,7 @@ dependencies {
     (rootProject.extra["compilerModules"] as Array<String>).forEach {
         testCompile(project(it))
     }
-    testCompile(intellijCoreDep()) { includeJars("intellij-core") }
+    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     testCompile(intellijPluginDep("IntelliLang"))
     testCompile(intellijPluginDep("copyright"))
     testCompile(intellijPluginDep("properties"))
diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts
index 19cb4be5c69..8e2a947e92c 100644
--- a/idea/idea-android/build.gradle.kts
+++ b/idea/idea-android/build.gradle.kts
@@ -6,7 +6,6 @@ apply { plugin("kotlin") }
 val androidSdk by configurations.creating
 
 dependencies {
-    testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntime(intellijDep())
 
     compileOnly(project(":kotlin-reflect-api"))
diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts
index c99742fe64c..0627d7fff71 100644
--- a/idea/idea-gradle/build.gradle.kts
+++ b/idea/idea-gradle/build.gradle.kts
@@ -4,7 +4,6 @@ apply { plugin("kotlin") }
 val androidSdk by configurations.creating
 
 dependencies {
-    testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntime(intellijDep())
 
     compileOnly(project(":idea"))
diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts
index e28fa0da78b..c2cb4a84998 100644
--- a/j2k/build.gradle.kts
+++ b/j2k/build.gradle.kts
@@ -2,7 +2,6 @@
 apply { plugin("kotlin") }
 
 dependencies {
-    testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntime(intellijDep())
 
     compile(projectDist(":kotlin-stdlib"))
diff --git a/jps-plugin/build.gradle.kts b/jps-plugin/build.gradle.kts
index e7091154772..a68f3175d16 100644
--- a/jps-plugin/build.gradle.kts
+++ b/jps-plugin/build.gradle.kts
@@ -28,7 +28,6 @@ dependencies {
         testRuntime(project(it))
     }
     testRuntime(intellijDep())
-    testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntime(projectDist(":kotlin-reflect"))
 }
 
diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts
index 3334ab160b3..23d89ae72bd 100644
--- a/js/js.tests/build.gradle.kts
+++ b/js/js.tests/build.gradle.kts
@@ -15,7 +15,6 @@ apply { plugin("kotlin") }
 val antLauncherJar by configurations.creating
 
 dependencies {
-    testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntime(intellijDep())
 
     testCompile(protobufFull())
diff --git a/plugins/allopen/allopen-cli/build.gradle.kts b/plugins/allopen/allopen-cli/build.gradle.kts
index b0741435ee4..8ba0f4436ca 100644
--- a/plugins/allopen/allopen-cli/build.gradle.kts
+++ b/plugins/allopen/allopen-cli/build.gradle.kts
@@ -4,7 +4,6 @@ description = "Kotlin AllOpen Compiler Plugin"
 apply { plugin("kotlin") }
 
 dependencies {
-    testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntime(intellijDep())
 
     compileOnly(project(":compiler:plugin-api"))
diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts
index ed6486b02a2..5946ae253c7 100644
--- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts
+++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts
@@ -9,7 +9,6 @@ val androidSdk by configurations.creating
 val androidJar by configurations.creating
 
 dependencies {
-    testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntime(intellijDep())
 
     compile(project(":compiler:util"))
diff --git a/plugins/android-extensions/android-extensions-jps/build.gradle.kts b/plugins/android-extensions/android-extensions-jps/build.gradle.kts
index 527204471e8..8ad9325fcaa 100644
--- a/plugins/android-extensions/android-extensions-jps/build.gradle.kts
+++ b/plugins/android-extensions/android-extensions-jps/build.gradle.kts
@@ -4,7 +4,6 @@ apply { plugin("kotlin") }
 val androidSdk by configurations.creating
 
 dependencies {
-    testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntime(intellijDep())
 
     compile(project(":compiler:util"))
diff --git a/plugins/kapt3/kapt3-compiler/build.gradle.kts b/plugins/kapt3/kapt3-compiler/build.gradle.kts
index 1e7e3de918e..ed7ea8b391b 100644
--- a/plugins/kapt3/kapt3-compiler/build.gradle.kts
+++ b/plugins/kapt3/kapt3-compiler/build.gradle.kts
@@ -4,7 +4,7 @@ description = "Annotation Processor for Kotlin"
 apply { plugin("kotlin") }
 
 dependencies {
-    testCompile(intellijCoreDep()) { includeJars("intellij-core") }
+    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntime(intellijDep())
     testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt", "openapi") }
 
diff --git a/plugins/noarg/noarg-cli/build.gradle.kts b/plugins/noarg/noarg-cli/build.gradle.kts
index 62d4387c1a1..61f3e092a54 100644
--- a/plugins/noarg/noarg-cli/build.gradle.kts
+++ b/plugins/noarg/noarg-cli/build.gradle.kts
@@ -4,7 +4,6 @@ description = "Kotlin NoArg Compiler Plugin"
 apply { plugin("kotlin") }
 
 dependencies {
-    testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntime(intellijDep())
 
     compileOnly(project(":compiler:frontend"))
diff --git a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts
index f0ff1ce3037..fa76bf61818 100644
--- a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts
+++ b/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts
@@ -4,6 +4,8 @@ description = "Kotlin SamWithReceiver Compiler Plugin"
 apply { plugin("kotlin") }
 
 dependencies {
+    testRuntime(intellijDep())
+
     compileOnly(project(":compiler:frontend"))
     compileOnly(project(":compiler:frontend.java"))
     compileOnly(project(":compiler:plugin-api"))
@@ -17,8 +19,7 @@ dependencies {
     testCompile(project(":compiler:tests-common"))
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(commonDep("junit:junit"))
-    testCompile(intellijCoreDep()) { includeJars("intellij-core") }
-    testRuntime(intellijDep())
+    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 }
 
 sourceSets {
diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts
index eed9d0de18a..a85c123c8ca 100644
--- a/ultimate/build.gradle.kts
+++ b/ultimate/build.gradle.kts
@@ -18,7 +18,6 @@ val springClasspath by configurations.creating
 
 dependencies {
     if (intellijUltimateEnabled) {
-        testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
         testRuntime(intellijUltimateDep())
     }