diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
index 655829eb90a..3656868f665 100644
--- a/compiler/build.gradle.kts
+++ b/compiler/build.gradle.kts
@@ -24,7 +24,6 @@ dependencies {
     testApi(projectTests(":compiler:tests-common"))
     testApi(projectTests(":compiler:fir:raw-fir:psi2fir"))
     testApi(projectTests(":compiler:fir:raw-fir:light-tree2fir"))
-    testApi(projectTests(":compiler:fir:fir2ir"))
     testApi(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests"))
     testApi(projectTests(":generators:test-generator"))
     testApi(project(":compiler:ir.ir2cfg"))
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/ReplacingSourceTransformer.kt b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/utils/ReplacingSourceTransformer.kt
similarity index 100%
rename from compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/ReplacingSourceTransformer.kt
rename to compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/utils/ReplacingSourceTransformer.kt
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/TransformersFunctions.kt b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/utils/TransformersFunctions.kt
similarity index 100%
rename from compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/TransformersFunctions.kt
rename to compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/utils/TransformersFunctions.kt
diff --git a/plugins/kapt3/kapt3-cli/build.gradle.kts b/plugins/kapt3/kapt3-cli/build.gradle.kts
index adb81695610..18242223601 100644
--- a/plugins/kapt3/kapt3-cli/build.gradle.kts
+++ b/plugins/kapt3/kapt3-cli/build.gradle.kts
@@ -8,6 +8,7 @@ dependencies {
 
     compileOnly(intellijCore())
 
+    testImplementation(intellijCore())
     testApi(projectTests(":compiler:tests-common"))
     testApi(projectTests(":compiler"))
     testApi(commonDependency("junit:junit"))