diff --git a/analysis/analysis-api-standalone/build.gradle.kts b/analysis/analysis-api-standalone/build.gradle.kts
index 12e5ead9b26..321cf1d56c5 100644
--- a/analysis/analysis-api-standalone/build.gradle.kts
+++ b/analysis/analysis-api-standalone/build.gradle.kts
@@ -20,6 +20,7 @@ dependencies {
     api(project(":analysis:decompiled:light-classes-for-decompiled"))
     api(project(":analysis:analysis-api-standalone:analysis-api-standalone-base"))
 
+    testApi(projectTests(":analysis:analysis-test-framework"))
     testApi(projectTests(":analysis:analysis-api-impl-base"))
     testApi(projectTests(":analysis:analysis-api-fir"))
 
diff --git a/analysis/decompiled/decompiler-to-file-stubs/build.gradle.kts b/analysis/decompiled/decompiler-to-file-stubs/build.gradle.kts
index a2370aefd62..d1e0eb979e5 100644
--- a/analysis/decompiled/decompiler-to-file-stubs/build.gradle.kts
+++ b/analysis/decompiled/decompiler-to-file-stubs/build.gradle.kts
@@ -15,7 +15,8 @@ dependencies {
     api(intellijCore())
 
     testImplementation(projectTests(":compiler:tests-common"))
-
+    testImplementation(projectTests(":compiler:tests-common-new"))
+    testImplementation(projectTests(":analysis:analysis-test-framework"))
 }
 
 sourceSets {
diff --git a/analysis/decompiled/decompiler-to-file-stubs/tests/org/jetbrains/kotlin/analysis/decompiler/stub/files/AbstractStubBuilderTest.kt b/analysis/decompiled/decompiler-to-file-stubs/tests/org/jetbrains/kotlin/analysis/decompiler/stub/files/AbstractStubBuilderTest.kt
index 4bd6a642a0a..be486fc4980 100644
--- a/analysis/decompiled/decompiler-to-file-stubs/tests/org/jetbrains/kotlin/analysis/decompiler/stub/files/AbstractStubBuilderTest.kt
+++ b/analysis/decompiled/decompiler-to-file-stubs/tests/org/jetbrains/kotlin/analysis/decompiler/stub/files/AbstractStubBuilderTest.kt
@@ -33,7 +33,7 @@ import java.util.stream.Collectors
 
 abstract class AbstractStubBuilderTest : KotlinTestWithEnvironment() {
     override fun createEnvironment(): KotlinCoreEnvironment {
-        return KotlinTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(testRootDisposable, ConfigurationKind.JDK_NO_RUNTIME)
+        return KotlinTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(ApplicationEnvironmentDisposer.ROOT_DISPOSABLE, ConfigurationKind.JDK_NO_RUNTIME)
     }
 
     override fun setUp() {
diff --git a/analysis/decompiled/decompiler-to-stubs/build.gradle.kts b/analysis/decompiled/decompiler-to-stubs/build.gradle.kts
index c2014ca900e..00f12871ba7 100644
--- a/analysis/decompiled/decompiler-to-stubs/build.gradle.kts
+++ b/analysis/decompiled/decompiler-to-stubs/build.gradle.kts
@@ -9,9 +9,9 @@ dependencies {
     api(project(":core:deserialization.common.jvm"))
     api(project(":core:deserialization"))
     implementation(project(":core:compiler.common.jvm"))
+    testImplementation(projectTests(":compiler:tests-common-new"))
 
     api(intellijCore())
-
 }
 
 sourceSets {
diff --git a/analysis/symbol-light-classes/build.gradle.kts b/analysis/symbol-light-classes/build.gradle.kts
index 3055168671b..d849f8e8f17 100644
--- a/analysis/symbol-light-classes/build.gradle.kts
+++ b/analysis/symbol-light-classes/build.gradle.kts
@@ -19,6 +19,7 @@ dependencies {
     testImplementation(projectTests(":analysis:decompiled:decompiler-to-file-stubs"))
     testImplementation(projectTests(":analysis:analysis-api-impl-base"))
     testImplementation(projectTests(":analysis:analysis-api-fir"))
+    testImplementation(projectTests(":compiler:tests-common-new"))
 }
 
 sourceSets {