diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticsSmokeTest.kt.181 b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticsSmokeTest.kt.181
index d599bfb9c06..faf850cb352 100644
--- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticsSmokeTest.kt.181
+++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticsSmokeTest.kt.181
@@ -48,7 +48,11 @@ abstract class AbstractFirDiagnosticsSmokeTest : BaseDiagnosticsTest() {
         val sessionProvider = FirProjectSessionProvider(project)
 
         //For BuiltIns, registered in sessionProvider automatically
-        FirLibrarySession(builtInsModuleInfo, sessionProvider, GlobalSearchScope.EMPTY_SCOPE)
+        val allProjectScope = GlobalSearchScope.allScope(project)
+        FirLibrarySession.create(
+            builtInsModuleInfo, sessionProvider, allProjectScope,
+            environment
+        )
 
         val configToSession = modules.mapValues { (config, info) ->
             val moduleFiles = groupedByModule.getValue(config)
@@ -152,4 +156,4 @@ abstract class AbstractFirDiagnosticsSmokeTest : BaseDiagnosticsTest() {
             dependencies += builtInsModuleInfo
         }
 
-}
\ No newline at end of file
+}
diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirResolveWithSessionTestCase.kt.181 b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirResolveWithSessionTestCase.kt.181
index bccb8bbbe49..31bad68e9cf 100644
--- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirResolveWithSessionTestCase.kt.181
+++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirResolveWithSessionTestCase.kt.181
@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.fir
 
 import com.intellij.openapi.extensions.Extensions
+import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElementFinder
 import com.intellij.psi.search.GlobalSearchScope
 import org.jetbrains.kotlin.asJava.finder.JavaElementFinder
@@ -16,4 +17,16 @@ import org.jetbrains.kotlin.test.KotlinTestWithEnvironment
 
 abstract class AbstractFirResolveWithSessionTestCase : KotlinTestWithEnvironment() {
 
-}
\ No newline at end of file
+    override fun setUp() {
+        super.setUp()
+
+        prepareProjectExtensions(project)
+    }
+
+    protected fun prepareProjectExtensions(project: Project) {
+        // No relevant API in 181
+        // Extensions.getArea(project)
+        //    .getExtensionPoint(PsiElementFinder.EP_NAME)
+        //    .unregisterExtension(JavaElementFinder::class.java)
+    }
+}