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 7493ffc0d9a..a9b8abd7383 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
@@ -73,7 +73,8 @@ class FirResolveModularizedTotalKotlinTest : KtUsefulTestCase() {
         val ktFiles = environment.getSourceFiles()
 
         val scope = ProjectScope.getContentScope(project)
-        val session = createSession(environment, scope)
+        val librariesScope = ProjectScope.getLibrariesScope(project)
+        val session = createSession(environment, scope, librariesScope)
         val builder = RawFirBuilder(session, stubMode = false)
 
         val totalTransformer = FirTotalResolveTransformer()
diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/SessionTestUtils.kt b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/SessionTestUtils.kt
index 56f375a4c47..6d9f97197d0 100644
--- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/SessionTestUtils.kt
+++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/SessionTestUtils.kt
@@ -11,23 +11,29 @@ import org.jetbrains.kotlin.fir.java.FirJavaModuleBasedSession
 import org.jetbrains.kotlin.fir.java.FirLibrarySession
 import org.jetbrains.kotlin.fir.java.FirProjectSessionProvider
 
-fun createSession(environment: KotlinCoreEnvironment, sourceScope: GlobalSearchScope): FirSession {
+fun createSession(
+    environment: KotlinCoreEnvironment,
+    sourceScope: GlobalSearchScope,
+    librariesScope: GlobalSearchScope = GlobalSearchScope.notScope(sourceScope)
+): FirSession {
     val moduleInfo = FirTestModuleInfo()
     val project = environment.project
     val provider = FirProjectSessionProvider(project)
     return FirJavaModuleBasedSession(moduleInfo, provider, sourceScope).also {
-        createSessionForDependencies(provider, moduleInfo, sourceScope, environment)
+        createSessionForDependencies(provider, moduleInfo, librariesScope, environment)
     }
 }
 
 private fun createSessionForDependencies(
     provider: FirProjectSessionProvider,
     moduleInfo: FirTestModuleInfo,
-    sourceScope: GlobalSearchScope,
+    librariesScope: GlobalSearchScope,
     environment: KotlinCoreEnvironment
 ) {
     val dependenciesInfo = FirTestModuleInfo()
     moduleInfo.dependencies.add(dependenciesInfo)
-    val scope = GlobalSearchScope.notScope(sourceScope)
-    FirLibrarySession.create(dependenciesInfo, provider, scope, environment.project, environment.createPackagePartProvider(scope))
+    FirLibrarySession.create(
+        dependenciesInfo, provider, librariesScope, environment.project,
+        environment.createPackagePartProvider(librariesScope)
+    )
 }