diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
index f65140d6cfd..583dd618cba 100644
--- a/compiler/build.gradle.kts
+++ b/compiler/build.gradle.kts
@@ -66,6 +66,10 @@ dependencies {
     testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util", "asm-all", rootProject = rootProject) }
 
+    Platform[192].orHigher {
+        testRuntimeOnly(intellijPluginDep("java"))
+    }
+
     testRuntime(project(":kotlin-reflect"))
     testRuntime(project(":kotlin-daemon-client-new"))
     testRuntime(project(":kotlin-daemon")) // +
diff --git a/compiler/fir/resolve/build.gradle.kts b/compiler/fir/resolve/build.gradle.kts
index 2593dd9e5ca..1f7909bb53e 100644
--- a/compiler/fir/resolve/build.gradle.kts
+++ b/compiler/fir/resolve/build.gradle.kts
@@ -13,14 +13,8 @@ dependencies {
     compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
 
     testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util", "asm-all", "extensions", rootProject = rootProject) }
-
-    Platform[191].orLower {
-        testCompileOnly(intellijDep()) { includeJars("java-api") }
-    }
-
-    Platform[192].orHigher {
-        testCompileOnly(intellijPluginDep("java")) { includeJars("java-api") }
-    }
+    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
 
     testRuntime(intellijDep())
 
diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts
index a3c73fb9a3f..aefb4970f33 100644
--- a/compiler/tests-common/build.gradle.kts
+++ b/compiler/tests-common/build.gradle.kts
@@ -64,7 +64,7 @@ dependencies {
     }
 
     Platform[192].orHigher {
-        testCompile(intellijDep()) { includeJars("platform-util-ui", "platform-objectSerializer") }
+        testCompile(intellijDep()) { includeJars("platform-util-ui", "platform-concurrency", "platform-objectSerializer") }
     }
 }
 
diff --git a/compiler/tests-java8/build.gradle.kts b/compiler/tests-java8/build.gradle.kts
index 1e19b9f3a65..f0eefc9e18c 100644
--- a/compiler/tests-java8/build.gradle.kts
+++ b/compiler/tests-java8/build.gradle.kts
@@ -12,6 +12,9 @@ dependencies {
     testCompile(projectTests(":generators:test-generator"))
     testRuntime(project(":kotlin-reflect"))
     testRuntime(intellijDep())
+    Platform[192].orHigher {
+        testRuntimeOnly(intellijPluginDep("java"))
+    }
 }
 
 sourceSets {
diff --git a/compiler/tests-spec/build.gradle.kts b/compiler/tests-spec/build.gradle.kts
index 0ac0bdc7da9..60727afe66f 100644
--- a/compiler/tests-spec/build.gradle.kts
+++ b/compiler/tests-spec/build.gradle.kts
@@ -5,6 +5,10 @@ plugins {
 
 dependencies {
     testCompile(projectTests(":compiler"))
+    Platform[192].orHigher {
+        testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+        testRuntimeOnly(intellijPluginDep("java"))
+    }
 }
 
 sourceSets {
diff --git a/libraries/tools/kotlinp/build.gradle.kts b/libraries/tools/kotlinp/build.gradle.kts
index 331f1d8c809..6d3e0f8a107 100644
--- a/libraries/tools/kotlinp/build.gradle.kts
+++ b/libraries/tools/kotlinp/build.gradle.kts
@@ -29,6 +29,10 @@ dependencies {
 
     testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
 
+    Platform[192].orHigher {
+        testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency", "platform-objectSerializer") }
+    }
+
     shadows(project(":kotlinx-metadata-jvm", configuration = "runtime"))
     shadows("org.jetbrains.intellij.deps:asm-all:$kotlinpAsmVersion")
 }