diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
index 9d4f2837843..38fc5b42cb4 100644
--- a/compiler/build.gradle.kts
+++ b/compiler/build.gradle.kts
@@ -49,7 +49,6 @@ dependencies {
     testCompile(projectTests(":compiler:fir:raw-fir:light-tree2fir"))
     testCompile(projectTests(":compiler:fir:fir2ir"))
     testCompile(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests"))
-    testCompile(projectTests(":compiler:visualizer"))
     testCompile(projectTests(":generators:test-generator"))
     testCompile(project(":compiler:ir.ir2cfg"))
     testCompile(project(":compiler:ir.tree")) // used for deepCopyWithSymbols call that is removed by proguard from the compiler TODO: make it more straightforward
diff --git a/compiler/tests-against-klib/build.gradle.kts b/compiler/tests-against-klib/build.gradle.kts
index d3c77c1837e..61aad1a4e84 100644
--- a/compiler/tests-against-klib/build.gradle.kts
+++ b/compiler/tests-against-klib/build.gradle.kts
@@ -8,8 +8,11 @@ plugins {
 
 dependencies {
     compile(kotlinStdlib())
-    testCompile(projectTests(":compiler:visualizer"))
     testCompile(projectTests(":generators:test-generator"))
+    testApi(projectTests(":compiler:tests-common"))
+
+    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
 }
 
 sourceSets {
diff --git a/compiler/tests-different-jdk/build.gradle.kts b/compiler/tests-different-jdk/build.gradle.kts
index fc9a6b90acc..3fb84bb828a 100644
--- a/compiler/tests-different-jdk/build.gradle.kts
+++ b/compiler/tests-different-jdk/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
 
     testApiJUnit5(vintageEngine = true, runner = true, suiteApi = true)
 
-    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    testImplementation(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntime(project(":kotlin-reflect"))
     testRuntime(intellijDep())
     testJvm6ServerRuntime(projectTests(":compiler:tests-common-jvm6"))