diff --git a/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/fir/AbstractFir2IrTextTest.kt b/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/fir/AbstractFir2IrTextTest.kt
index cad2850c933..be2325b2c1a 100644
--- a/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/fir/AbstractFir2IrTextTest.kt
+++ b/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/fir/AbstractFir2IrTextTest.kt
@@ -30,6 +30,10 @@ abstract class AbstractFir2IrTextTest : AbstractIrTextTestCase() {
             .unregisterExtension(JavaElementFinder::class.java)
     }
 
+    override fun doTest(wholeFile: File, testFiles: List<TestFile>) {
+        buildFragmentAndTestIt(wholeFile, testFiles)
+    }
+
     override fun doTest(filePath: String?) {
         if (filePath != null) {
             val originalTextPath = filePath.replace(".kt", ".txt")
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt
index 006de95a05d..8dfac0d1360 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt
@@ -39,6 +39,11 @@ import java.util.regex.Pattern
 
 abstract class AbstractIrTextTestCase : AbstractIrGeneratorTestCase() {
     override fun doTest(wholeFile: File, testFiles: List<TestFile>) {
+        val irModule = buildFragmentAndTestIt(wholeFile, testFiles)
+        doTestIrModuleDependencies(wholeFile, irModule)
+    }
+
+    protected fun buildFragmentAndTestIt(wholeFile: File, testFiles: List<TestFile>): IrModuleFragment {
         val dir = wholeFile.parentFile
         val ignoreErrors = shouldIgnoreErrors(wholeFile)
         val irModule = generateIrModule(ignoreErrors)
@@ -48,7 +53,7 @@ abstract class AbstractIrTextTestCase : AbstractIrGeneratorTestCase() {
             doTestIrFileAgainstExpectations(dir, testFile, irFile)
         }
 
-        doTestIrModuleDependencies(wholeFile, irModule)
+        return irModule
     }
 
     private fun doTestIrModuleDependencies(wholeFile: File, irModule: IrModuleFragment) {