diff --git a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt
index 5d717279422..89420c30120 100644
--- a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt
+++ b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt
@@ -132,7 +132,7 @@ class FirResolveModularizedTotalKotlinTest : AbstractFrontendModularizedTest() {
         val (sourceFiles: Collection<KtSourceFile>, scope) =
             if (USE_LIGHT_TREE) {
                 val (platformSources, _) = collectSources(environment.configuration, projectEnvironment, environment.messageCollector)
-                platformSources to projectEnvironment.getSearchScopeBySourceFiles(platformSources)
+                platformSources to projectEnvironment.getSearchScopeForProjectJavaSources()
             } else {
                 val ktFiles = environment.getSourceFiles()
                 ktFiles.map { KtPsiSourceFile(it) } to
diff --git a/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/fir/FirTestSessionFactoryHelper.kt b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/fir/FirTestSessionFactoryHelper.kt
index 1f836f383d3..ffb7c17244a 100644
--- a/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/fir/FirTestSessionFactoryHelper.kt
+++ b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/fir/FirTestSessionFactoryHelper.kt
@@ -27,8 +27,8 @@ object FirTestSessionFactoryHelper {
     @ObsoleteTestInfrastructure
     fun createSessionForTests(
         projectEnvironment: AbstractProjectEnvironment,
-        sourceScope: AbstractProjectFileSearchScope,
-        librariesScope: AbstractProjectFileSearchScope = !sourceScope,
+        javaSourceScope: AbstractProjectFileSearchScope,
+        librariesScope: AbstractProjectFileSearchScope = !javaSourceScope,
         moduleName: String = "TestModule",
         friendsPaths: List<Path> = emptyList(),
         languageVersionSettings: LanguageVersionSettings = LanguageVersionSettingsImpl.DEFAULT
@@ -39,7 +39,7 @@ object FirTestSessionFactoryHelper {
         externalSessionProvider = null,
         projectEnvironment,
         languageVersionSettings,
-        sourceScope,
+        javaSourceScope,
         librariesScope,
         lookupTracker = null,
         enumWhenTracker = null,