diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/quickfix/AbstractHighLevelQuickFixTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/quickfix/AbstractHighLevelQuickFixTest.kt
index 124df0cb27e..84cd922c20b 100644
--- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/quickfix/AbstractHighLevelQuickFixTest.kt
+++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/quickfix/AbstractHighLevelQuickFixTest.kt
@@ -6,9 +6,22 @@
 package org.jetbrains.kotlin.idea.quickfix
 
 import com.intellij.codeInsight.intention.IntentionAction
+import org.jetbrains.kotlin.test.uitls.IgnoreTests
+import java.nio.file.Paths
 
 
 abstract class AbstractHighLevelQuickFixTest : AbstractQuickFixTest() {
+    override fun doTest(beforeFileName: String) {
+        IgnoreTests.runTestIfEnabledByFileDirective(
+            Paths.get(beforeFileName),
+            enableTestDirective = IgnoreTests.DIRECTIVES.FIR_COMPARISON_MUTLTILINE_COMMENT,
+            directivePosition = IgnoreTests.DirectivePosition.LAST_LINE_IN_FILE,
+            additionalFilesExtensions = arrayOf("after")
+        ) {
+            super.doTest(beforeFileName)
+        }
+    }
+
     override fun checkForUnexpectedErrors() {}
     override fun checkAvailableActionsAreExpected(actions: List<IntentionAction>) {}
 }
\ No newline at end of file
diff --git a/idea/idea-frontend-independent/tests/org/jetbrains/kotlin/test/uitls/IgnoreTests.kt b/idea/idea-frontend-independent/tests/org/jetbrains/kotlin/test/uitls/IgnoreTests.kt
index 141a03d7403..359cf480236 100644
--- a/idea/idea-frontend-independent/tests/org/jetbrains/kotlin/test/uitls/IgnoreTests.kt
+++ b/idea/idea-frontend-independent/tests/org/jetbrains/kotlin/test/uitls/IgnoreTests.kt
@@ -10,7 +10,7 @@ import java.nio.file.Files
 import java.nio.file.Path
 
 object IgnoreTests {
-    private const val INSERT_DIRECTIVE_AUTOMATICALLY = false // TODO use environment variable instead
+    private const val INSERT_DIRECTIVE_AUTOMATICALLY = true // TODO use environment variable instead
     private const val ALWAYS_CONSIDER_TEST_AS_PASSING = false // TODO use environment variable instead
 
     fun runTestIfEnabledByFileDirective(
@@ -136,6 +136,7 @@ object IgnoreTests {
 
     object DIRECTIVES {
         const val FIR_COMPARISON = "// FIR_COMPARISON"
+        const val FIR_COMPARISON_MUTLTILINE_COMMENT = "/* FIR_COMPARISON */"
         const val IGNORE_FIR = "// IGNORE_FIR"
         const val FIX_ME = "// FIX_ME: "
     }
diff --git a/idea/testData/quickfix/modifiers/cannotMakeClassAnnotation.kt b/idea/testData/quickfix/modifiers/cannotMakeClassAnnotation.kt
index 26fb9805cd8..6daad2408fb 100644
--- a/idea/testData/quickfix/modifiers/cannotMakeClassAnnotation.kt
+++ b/idea/testData/quickfix/modifiers/cannotMakeClassAnnotation.kt
@@ -1,3 +1,4 @@
 // "class org.jetbrains.kotlin.idea.quickfix.MakeClassAnAnnotationClassFix" "false"
 // ERROR: 'String' is not an annotation class
 @String<caret> class foo {}
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/nestedAnnotationClass.kt b/idea/testData/quickfix/modifiers/nestedAnnotationClass.kt
index 32d1c1e4ca9..d472a3314db 100644
--- a/idea/testData/quickfix/modifiers/nestedAnnotationClass.kt
+++ b/idea/testData/quickfix/modifiers/nestedAnnotationClass.kt
@@ -5,3 +5,4 @@ class A() {
         annotation class <caret>C
     }
 }
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/nestedDataClass.kt b/idea/testData/quickfix/modifiers/nestedDataClass.kt
index eb8b2b4fe0b..d846cbb7456 100644
--- a/idea/testData/quickfix/modifiers/nestedDataClass.kt
+++ b/idea/testData/quickfix/modifiers/nestedDataClass.kt
@@ -7,3 +7,4 @@ class A() {
         data class <caret>C
     }
 }
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/nestedEnumClass.kt b/idea/testData/quickfix/modifiers/nestedEnumClass.kt
index a4994f62fbe..457c74fa7f5 100644
--- a/idea/testData/quickfix/modifiers/nestedEnumClass.kt
+++ b/idea/testData/quickfix/modifiers/nestedEnumClass.kt
@@ -7,3 +7,4 @@ class A() {
         enum class <caret>C
     }
 }
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/nestedInterface.kt b/idea/testData/quickfix/modifiers/nestedInterface.kt
index 869025b6950..faa04f00d96 100644
--- a/idea/testData/quickfix/modifiers/nestedInterface.kt
+++ b/idea/testData/quickfix/modifiers/nestedInterface.kt
@@ -6,3 +6,4 @@ class A() {
         interface <caret>C
     }
 }
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/nestedObject.kt b/idea/testData/quickfix/modifiers/nestedObject.kt
index 5472f4809ba..78db500cf1d 100644
--- a/idea/testData/quickfix/modifiers/nestedObject.kt
+++ b/idea/testData/quickfix/modifiers/nestedObject.kt
@@ -6,3 +6,4 @@ class A() {
         object <caret>C
     }
 }
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/nestedSealedClass.kt b/idea/testData/quickfix/modifiers/nestedSealedClass.kt
index e3fe905d0b8..edeed352147 100644
--- a/idea/testData/quickfix/modifiers/nestedSealedClass.kt
+++ b/idea/testData/quickfix/modifiers/nestedSealedClass.kt
@@ -8,3 +8,4 @@ class A() {
         sealed class <caret>C
     }
 }
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/noAbstractForAnonymousObject.kt b/idea/testData/quickfix/modifiers/noAbstractForAnonymousObject.kt
index bd36c6b8c39..8ec491989d1 100644
--- a/idea/testData/quickfix/modifiers/noAbstractForAnonymousObject.kt
+++ b/idea/testData/quickfix/modifiers/noAbstractForAnonymousObject.kt
@@ -9,4 +9,5 @@ interface T {
 
 fun test() {
     val o = <caret>object : T {}
-}
\ No newline at end of file
+}
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/noAbstractForObject.kt b/idea/testData/quickfix/modifiers/noAbstractForObject.kt
index 9887ea6cca1..8d475c736c4 100644
--- a/idea/testData/quickfix/modifiers/noAbstractForObject.kt
+++ b/idea/testData/quickfix/modifiers/noAbstractForObject.kt
@@ -9,3 +9,4 @@ interface T {
 }
 
 object <caret>Some : T
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/noLateinitOnNullable.kt b/idea/testData/quickfix/modifiers/noLateinitOnNullable.kt
index 7d036855be9..ff7e8f730a5 100644
--- a/idea/testData/quickfix/modifiers/noLateinitOnNullable.kt
+++ b/idea/testData/quickfix/modifiers/noLateinitOnNullable.kt
@@ -10,4 +10,5 @@
 
 class A {
     private var a: String?<caret>
-}
\ No newline at end of file
+}
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/noLateinitOnPrimitive.kt b/idea/testData/quickfix/modifiers/noLateinitOnPrimitive.kt
index a27adf5ab72..a0d531e14d8 100644
--- a/idea/testData/quickfix/modifiers/noLateinitOnPrimitive.kt
+++ b/idea/testData/quickfix/modifiers/noLateinitOnPrimitive.kt
@@ -11,4 +11,5 @@
 
 class A {
     private var a: Int<caret>
-}
\ No newline at end of file
+}
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt b/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt
index 86656df35d3..e0a5cbfd311 100644
--- a/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt
+++ b/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt
@@ -2,4 +2,5 @@
 
 interface My {
     <caret>open fun foo()
-}
\ No newline at end of file
+}
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt.after b/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt.after
index 378d19a8e62..fdb5c1bb643 100644
--- a/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt.after
+++ b/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt.after
@@ -2,4 +2,5 @@
 
 interface My {
     fun foo()
-}
\ No newline at end of file
+}
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeProtectedModifier.kt b/idea/testData/quickfix/modifiers/removeProtectedModifier.kt
index 633f449798e..809fb1920fa 100644
--- a/idea/testData/quickfix/modifiers/removeProtectedModifier.kt
+++ b/idea/testData/quickfix/modifiers/removeProtectedModifier.kt
@@ -3,3 +3,4 @@
 class A private <caret>protected constructor() {
 
 }
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeProtectedModifier.kt.after b/idea/testData/quickfix/modifiers/removeProtectedModifier.kt.after
index cb41cc26b7d..0c4d4b357c1 100644
--- a/idea/testData/quickfix/modifiers/removeProtectedModifier.kt.after
+++ b/idea/testData/quickfix/modifiers/removeProtectedModifier.kt.after
@@ -3,3 +3,4 @@
 class A private constructor() {
 
 }
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeMultipleOverriddenPropertiesTypes.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeMultipleOverriddenPropertiesTypes.kt
index a586e7fbf63..10cb1883c83 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeMultipleOverriddenPropertiesTypes.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeMultipleOverriddenPropertiesTypes.kt
@@ -12,4 +12,5 @@ interface B {
 
 interface C : A, B {
     override val x: (Int) -> Int<caret>
-}
\ No newline at end of file
+}
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt
index 113219068dc..6d3570592f0 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt
@@ -11,3 +11,4 @@ interface B {
 interface C : A, B {
     override var x: String<caret>
 }
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangePropertyTypeToMatchOverridenProperties.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangePropertyTypeToMatchOverridenProperties.kt
index e816c04d94e..075269abaf5 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangePropertyTypeToMatchOverridenProperties.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangePropertyTypeToMatchOverridenProperties.kt
@@ -11,3 +11,4 @@ interface B {
 interface C : A, B {
     override var x: Int<caret>
 }
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeReturnTypeOfOverriddenFunction.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeReturnTypeOfOverriddenFunction.kt
index c556a11f027..e67faff7e96 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeReturnTypeOfOverriddenFunction.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeReturnTypeOfOverriddenFunction.kt
@@ -11,3 +11,5 @@ interface B {
 interface C : A, B {
     override fun foo(): <caret>Long
 }
+
+/* FIR_COMPARISON */
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType1.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType1.kt
index 398415db622..1e187fe1e1b 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType1.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType1.kt
@@ -9,4 +9,5 @@ interface B {
 
 interface C : A, B {
     override val x: (Int) -> Int<caret>
-}
\ No newline at end of file
+}
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType1.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType1.kt.after
index e659b0670a8..83da809265b 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType1.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType1.kt.after
@@ -9,4 +9,5 @@ interface B {
 
 interface C : A, B {
     override val x: (Int) -> Int<caret>
-}
\ No newline at end of file
+}
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType2.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType2.kt
index 26dfcefc0b5..c082b2f3fed 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType2.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType2.kt
@@ -9,4 +9,5 @@ interface B {
 
 interface C : A, B {
     override var x: String<caret>
-}
\ No newline at end of file
+}
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType2.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType2.kt.after
index 070a6ab2a7a..bf18edd4403 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType2.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType2.kt.after
@@ -9,4 +9,5 @@ interface B {
 
 interface C : A, B {
     override var x: String<caret>
-}
\ No newline at end of file
+}
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyTypeFromCtorParameter.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyTypeFromCtorParameter.kt
index 9daa097c738..1cef1779410 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyTypeFromCtorParameter.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyTypeFromCtorParameter.kt
@@ -3,4 +3,5 @@ interface A {
     val x: CharSequence
 }
 
-class B(override val x: Any<caret>) : A
\ No newline at end of file
+class B(override val x: Any<caret>) : A
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyTypeFromCtorParameter.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyTypeFromCtorParameter.kt.after
index 970fa13870e..514c75a7212 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyTypeFromCtorParameter.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyTypeFromCtorParameter.kt.after
@@ -3,4 +3,5 @@ interface A {
     val x: Any
 }
 
-class B(override val x: Any) : A
\ No newline at end of file
+class B(override val x: Any) : A
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingCtorParameterType.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingCtorParameterType.kt
index 280487ae400..6526345d0cb 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingCtorParameterType.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingCtorParameterType.kt
@@ -3,4 +3,5 @@ interface A {
     val x: CharSequence
 }
 
-class B(override val x: Any<caret>) : A
\ No newline at end of file
+class B(override val x: Any<caret>) : A
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingCtorParameterType.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingCtorParameterType.kt.after
index 2c475dd6e1a..a3e545ea382 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingCtorParameterType.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingCtorParameterType.kt.after
@@ -3,4 +3,5 @@ interface A {
     val x: CharSequence
 }
 
-class B(override val x: CharSequence) : A
\ No newline at end of file
+class B(override val x: CharSequence) : A
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingPropertyTypeToFunctionType.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingPropertyTypeToFunctionType.kt
index 3ecabb8a48b..17e1f5f0eb7 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingPropertyTypeToFunctionType.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingPropertyTypeToFunctionType.kt
@@ -4,4 +4,5 @@ interface A {
 }
 interface B : A {
     override var x: (Int) -> String<caret>
-}
\ No newline at end of file
+}
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingPropertyTypeToFunctionType.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingPropertyTypeToFunctionType.kt.after
index 2e719f97f4a..0e3256ca2c4 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingPropertyTypeToFunctionType.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingPropertyTypeToFunctionType.kt.after
@@ -4,4 +4,5 @@ interface A {
 }
 interface B : A {
     override var x: (String) -> Int
-}
\ No newline at end of file
+}
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt
index 0637470776c..a0fd8f8fb31 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt
@@ -9,4 +9,5 @@ interface B {
 
 interface C : A, B {
     override fun foo(): Long<caret>
-}
\ No newline at end of file
+}
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt.after
index f298475a37c..a0138984cc7 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt.after
@@ -9,4 +9,5 @@ interface B {
 
 interface C : A, B {
     override fun foo(): Long<caret>
-}
\ No newline at end of file
+}
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/propertyReturnTypeMismatchOnOverride.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/propertyReturnTypeMismatchOnOverride.kt
index 7e4ded6883c..b3e9e11804d 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/propertyReturnTypeMismatchOnOverride.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/propertyReturnTypeMismatchOnOverride.kt
@@ -5,4 +5,5 @@ interface X {
 
 class A : X {
     override val x: Number<caret> = 42
-}
\ No newline at end of file
+}
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/propertyReturnTypeMismatchOnOverride.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/propertyReturnTypeMismatchOnOverride.kt.after
index d5b8f1e3773..0f0a2a821c8 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/propertyReturnTypeMismatchOnOverride.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/propertyReturnTypeMismatchOnOverride.kt.after
@@ -5,4 +5,5 @@ interface X {
 
 class A : X {
     override val x: Int = 42
-}
\ No newline at end of file
+}
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntLong.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntLong.kt
index 3a434bca3bb..dbb82a6de7f 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntLong.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntLong.kt
@@ -6,3 +6,5 @@ abstract class A {
 abstract class B : A() {
     override abstract var x: Long<caret>
 }
+
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntLong.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntLong.kt.after
index e75ee15370c..05e3ca665b8 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntLong.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntLong.kt.after
@@ -6,3 +6,5 @@ abstract class A {
 abstract class B : A() {
     override abstract var x: Int
 }
+
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt
index 7a54f43ac80..1b021c9663c 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt
@@ -13,3 +13,5 @@ interface X {
 abstract class B : A(), X {
     override abstract fun foo(): Int<caret>
 }
+
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt.after
index 61fe7a054fe..9aff6772d70 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt.after
@@ -13,3 +13,5 @@ interface X {
 abstract class B : A(), X {
     override abstract fun foo(): T
 }
+
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverrideAmbiguity.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverrideAmbiguity.kt
index 4a6b63a6f6b..782b7f687cb 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverrideAmbiguity.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverrideAmbiguity.kt
@@ -14,3 +14,4 @@ interface X {
 abstract class B : A(), X {
     abstract override fun foo() : String<caret>
 }
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt
index fb7d4e8964e..7c6be0bd4eb 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt
@@ -6,3 +6,5 @@ abstract class A {
 abstract class B : A() {
     abstract override fun foo(): Long<caret>
 }
+
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt.after
index 2abf8dbbd4a..f41241f90a3 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt.after
@@ -6,3 +6,5 @@ abstract class A {
 abstract class B : A() {
     abstract override fun foo(): Int
 }
+
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt
index de628e696b0..730fd6cc17d 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt
@@ -6,3 +6,5 @@ abstract class A {
 abstract class B : A() {
     abstract override fun foo<caret>()
 }
+
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt.after
index 3c636fe0b08..01953ef3c79 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt.after
@@ -6,3 +6,5 @@ abstract class A {
 abstract class B : A() {
     abstract override fun foo<caret>(): Int
 }
+
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt
index 9c038ebaa52..1b570f38605 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt
@@ -2,3 +2,5 @@
 abstract class A : java.util.Iterator<Int> {
     public abstract override fun remove() : Int<caret>;
 }
+
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt.after
index ffd4cf48bca..98807e59771 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt.after
@@ -2,3 +2,5 @@
 abstract class A : java.util.Iterator<Int> {
     public abstract override fun remove();
 }
+
+/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.kt
index 9f85b69fc68..60c0c406b6a 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.kt
@@ -51,7 +51,7 @@ abstract class AbstractQuickFixTest : KotlinLightCodeInsightFixtureTestCase(), Q
     }
 
     @Throws(Exception::class)
-    protected fun doTest(beforeFileName: String) {
+    protected open fun doTest(beforeFileName: String) {
         val beforeFileText = FileUtil.loadFile(File(beforeFileName))
         withCustomCompilerOptions(beforeFileText, project, module) {
             val inspections = parseInspectionsToEnable(beforeFileName, beforeFileText).toTypedArray()