diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirOldFrontendDiagnosticsTest.kt b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirOldFrontendDiagnosticsTest.kt
index 512a40bfb93..fbf49de1de0 100644
--- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirOldFrontendDiagnosticsTest.kt
+++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirOldFrontendDiagnosticsTest.kt
@@ -44,6 +44,10 @@ abstract class AbstractFirOldFrontendDiagnosticsTest : AbstractFirDiagnosticsTes
             checkResultingFirFiles(firFiles, testDataFile)
             assertFalse("Test is good but there is expected exception", failureFile.exists())
             checkDiagnostics(testDataFile, testFiles, firFiles)
+            val needDump = testFiles.any { it.directives.containsKey("FIR_DUMP") }
+            if (needDump) {
+                checkFir(testDataFile, firFiles)
+            }
         } else {
             if (!failureFile.exists()) {
                 throw failure