diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiModuleTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiModuleTest.kt
index 930e74393141..5752b42c49cb 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiModuleTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiModuleTest.kt
@@ -126,7 +126,8 @@ abstract class AbstractQuickFixMultiModuleTest : AbstractMultiModuleTest(), Quic
                 }
 
                 if (actionFile is KtFile) {
-                    DirectiveBasedActionUtils.checkForUnexpectedErrors(actionFile)
+                    // TODO check diagnostics for K2
+                    if (!isFirPlugin()) DirectiveBasedActionUtils.checkForUnexpectedErrors(actionFile)
                 }
 
                 if (actionShouldBeAvailable) {
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addThrowAnnotation/js/js_dep(stdlib)/js.kt b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addThrowAnnotation/js/js_dep(stdlib)/js.kt
index cf33461e61c5..2974adfb587d 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addThrowAnnotation/js/js_dep(stdlib)/js.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addThrowAnnotation/js/js_dep(stdlib)/js.kt
@@ -1,5 +1,4 @@
 // "Add '@Throws' annotation" "false"
-// IGNORE_K2
 fun test() {
     <caret>throw Throwable()
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addThrowAnnotation/jvm/jvm_dep(stdlib)/jvm.kt b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addThrowAnnotation/jvm/jvm_dep(stdlib)/jvm.kt
index 5079db6c3000..5e8ee64b697a 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addThrowAnnotation/jvm/jvm_dep(stdlib)/jvm.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addThrowAnnotation/jvm/jvm_dep(stdlib)/jvm.kt
@@ -1,5 +1,6 @@
 // "Add '@Throws' annotation" "true"
 // IGNORE_K2
+
 fun test() {
     <caret>throw Throwable()
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addThrowAnnotation/jvm/jvm_dep(stdlib)/jvm.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addThrowAnnotation/jvm/jvm_dep(stdlib)/jvm.kt.after
index e4ecf9178a9a..5e3146865989 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addThrowAnnotation/jvm/jvm_dep(stdlib)/jvm.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addThrowAnnotation/jvm/jvm_dep(stdlib)/jvm.kt.after
@@ -1,6 +1,7 @@
 // "Add '@Throws' annotation" "true"
 // IGNORE_K2
+
 @Throws(Throwable::class)
 fun test() {
-    <caret>throw Throwable()
-}
\ No newline at end of file
+    <selection><caret></selection>throw Throwable()
+}
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addThrowAnnotation/jvmWithoutStdlib/jvm/jvm.kt b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addThrowAnnotation/jvmWithoutStdlib/jvm/jvm.kt
index cf33461e61c5..2974adfb587d 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addThrowAnnotation/jvmWithoutStdlib/jvm/jvm.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addThrowAnnotation/jvmWithoutStdlib/jvm/jvm.kt
@@ -1,5 +1,4 @@
 // "Add '@Throws' annotation" "false"
-// IGNORE_K2
 fun test() {
     <caret>throw Throwable()
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/sealedInCommonWhen/header/header.kt b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/sealedInCommonWhen/header/header.kt
index ef960f0a91b8..d3177f929fcc 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/sealedInCommonWhen/header/header.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/sealedInCommonWhen/header/header.kt
@@ -2,7 +2,6 @@
 // SHOULD_BE_AVAILABLE_AFTER_EXECUTION
 // ERROR: Unresolved reference: TODO
 // ERROR: Unresolved reference: TODO
-// IGNORE_K2
 
 sealed class CommonSealedClass()
 class SInheritor1 : CommonSealedClass()
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/sealedInCommonWhen/header/header.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/sealedInCommonWhen/header/header.kt.after
index 6fd2289206b9..26b91bab47e2 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/sealedInCommonWhen/header/header.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/sealedInCommonWhen/header/header.kt.after
@@ -2,7 +2,6 @@
 // SHOULD_BE_AVAILABLE_AFTER_EXECUTION
 // ERROR: Unresolved reference: TODO
 // ERROR: Unresolved reference: TODO
-// IGNORE_K2
 
 sealed class CommonSealedClass()
 class SInheritor1 : CommonSealedClass()
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/fixNativeThrowsErrors/addCancellationException2/native/test.kt b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/fixNativeThrowsErrors/addCancellationException2/native/test.kt
index 548407e1b5a9..ed46ddbb5659 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/fixNativeThrowsErrors/addCancellationException2/native/test.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/fixNativeThrowsErrors/addCancellationException2/native/test.kt
@@ -2,7 +2,6 @@
 // ERROR: @Throws on suspend declaration must have CancellationException (or any of its superclasses) listed
 // ACTION: Make internal
 // ACTION: Make private
-// IGNORE_K2
 
 class MyException : Throwable()
 
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/actualImplementAsConstructorParam/jvm/jvm.kt b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/actualImplementAsConstructorParam/jvm/jvm.kt
index c8fa2a201202..bf2f8bd65f33 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/actualImplementAsConstructorParam/jvm/jvm.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/actualImplementAsConstructorParam/jvm/jvm.kt
@@ -1,3 +1,3 @@
 // "Implement as constructor parameters" "true"
-// IGNORE_K2
+
 actual class <caret>End : IFoo
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/actualImplementAsConstructorParam/jvm/jvm.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/actualImplementAsConstructorParam/jvm/jvm.kt.after
index e36f7a238fa7..06ccd94a61b0 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/actualImplementAsConstructorParam/jvm/jvm.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/actualImplementAsConstructorParam/jvm/jvm.kt.after
@@ -1,3 +1,3 @@
 // "Implement as constructor parameters" "true"
-// IGNORE_K2
+
 actual class End(override val a: Int) : IFoo
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/convertPropertyGetterToInitializer/header/header.kt b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/convertPropertyGetterToInitializer/header/header.kt
index ec524cd14b0f..f5f20a5f6ef6 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/convertPropertyGetterToInitializer/header/header.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/convertPropertyGetterToInitializer/header/header.kt
@@ -1,7 +1,6 @@
 // "Convert property getter to initializer" "false"
 // ERROR: Expected declaration must not have a body
 // ACTION: Convert to block body
-// IGNORE_K2
 
 expect class C {
     val p: Int
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/createTestOnExpect/header/header.kt b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/createTestOnExpect/header/header.kt
index 3f0e4779ce5c..221e1ceb584f 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/createTestOnExpect/header/header.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/createTestOnExpect/header/header.kt
@@ -1,5 +1,4 @@
 // "Create test" "false"
 // ACTION: Rename file to Foo.kt
-// IGNORE_K2
 
 expect class <caret>Foo
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importClassInCommon/common/b.kt b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importClassInCommon/common/b.kt
index f4d968f86508..b86c6f27786f 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importClassInCommon/common/b.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importClassInCommon/common/b.kt
@@ -1,5 +1,4 @@
 // "Import class 'Foo'" "true"
-// IGNORE_K2
 
 package bar
 
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importClassInCommon/common/b.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importClassInCommon/common/b.kt.after
index cf8c6580e86c..c51d69f9a8ba 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importClassInCommon/common/b.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importClassInCommon/common/b.kt.after
@@ -1,5 +1,4 @@
 // "Import class 'Foo'" "true"
-// IGNORE_K2
 
 package bar
 
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importClassInFromProductionInCommonTests/a_common_test/b.kt b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importClassInFromProductionInCommonTests/a_common_test/b.kt
index f4d968f86508..b86c6f27786f 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importClassInFromProductionInCommonTests/a_common_test/b.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importClassInFromProductionInCommonTests/a_common_test/b.kt
@@ -1,5 +1,4 @@
 // "Import class 'Foo'" "true"
-// IGNORE_K2
 
 package bar
 
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importClassInFromProductionInCommonTests/a_common_test/b.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importClassInFromProductionInCommonTests/a_common_test/b.kt.after
index cf8c6580e86c..c51d69f9a8ba 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importClassInFromProductionInCommonTests/a_common_test/b.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importClassInFromProductionInCommonTests/a_common_test/b.kt.after
@@ -1,5 +1,4 @@
 // "Import class 'Foo'" "true"
-// IGNORE_K2
 
 package bar
 
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importCommonClassInJvm/jvm/b.kt b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importCommonClassInJvm/jvm/b.kt
index f4d968f86508..b86c6f27786f 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importCommonClassInJvm/jvm/b.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importCommonClassInJvm/jvm/b.kt
@@ -1,5 +1,4 @@
 // "Import class 'Foo'" "true"
-// IGNORE_K2
 
 package bar
 
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importCommonClassInJvm/jvm/b.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importCommonClassInJvm/jvm/b.kt.after
index cf8c6580e86c..c51d69f9a8ba 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importCommonClassInJvm/jvm/b.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importCommonClassInJvm/jvm/b.kt.after
@@ -1,5 +1,4 @@
 // "Import class 'Foo'" "true"
-// IGNORE_K2
 
 package bar
 
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importCommonFunInJvm/jvm/b.kt b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importCommonFunInJvm/jvm/b.kt
index 60a338ffdbc3..ddb9da3993a1 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importCommonFunInJvm/jvm/b.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importCommonFunInJvm/jvm/b.kt
@@ -1,5 +1,4 @@
 // "Import function 'foo'" "true"
-// IGNORE_K2
 
 package bar
 
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importCommonFunInJvm/jvm/b.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importCommonFunInJvm/jvm/b.kt.after
index 40ca6d36d8d0..abc6c3e93643 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importCommonFunInJvm/jvm/b.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importCommonFunInJvm/jvm/b.kt.after
@@ -1,5 +1,4 @@
 // "Import function 'foo'" "true"
-// IGNORE_K2
 
 package bar
 
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importExpectClassWithActualInJvm/jvm/b.kt b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importExpectClassWithActualInJvm/jvm/b.kt
index f4d968f86508..b86c6f27786f 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importExpectClassWithActualInJvm/jvm/b.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importExpectClassWithActualInJvm/jvm/b.kt
@@ -1,5 +1,4 @@
 // "Import class 'Foo'" "true"
-// IGNORE_K2
 
 package bar
 
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importExpectClassWithActualInJvm/jvm/b.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importExpectClassWithActualInJvm/jvm/b.kt.after
index cf8c6580e86c..c51d69f9a8ba 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importExpectClassWithActualInJvm/jvm/b.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importExpectClassWithActualInJvm/jvm/b.kt.after
@@ -1,5 +1,4 @@
 // "Import class 'Foo'" "true"
-// IGNORE_K2
 
 package bar
 
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importFunInCommon/common/b.kt b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importFunInCommon/common/b.kt
index 60a338ffdbc3..ddb9da3993a1 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importFunInCommon/common/b.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importFunInCommon/common/b.kt
@@ -1,5 +1,4 @@
 // "Import function 'foo'" "true"
-// IGNORE_K2
 
 package bar
 
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importFunInCommon/common/b.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importFunInCommon/common/b.kt.after
index 40ca6d36d8d0..abc6c3e93643 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importFunInCommon/common/b.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/importFunInCommon/common/b.kt.after
@@ -1,5 +1,4 @@
 // "Import function 'foo'" "true"
-// IGNORE_K2
 
 package bar
 
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/moveActualPropertyToExistentConstructor/jvm/jvm.kt b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/moveActualPropertyToExistentConstructor/jvm/jvm.kt
index 74e1d3e10157..88a3b45a153b 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/moveActualPropertyToExistentConstructor/jvm/jvm.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/moveActualPropertyToExistentConstructor/jvm/jvm.kt
@@ -1,5 +1,4 @@
 // "Move to constructor" "true"
-// IGNORE_K2
 
 actual class SimpleWConstructor(i: Int) {
     actual val <caret>b: String = ""
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/moveActualPropertyToExistentConstructor/jvm/jvm.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/moveActualPropertyToExistentConstructor/jvm/jvm.kt.after
index 9e4a9aea57da..ffe8c2598e3a 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/moveActualPropertyToExistentConstructor/jvm/jvm.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/moveActualPropertyToExistentConstructor/jvm/jvm.kt.after
@@ -1,5 +1,4 @@
 // "Move to constructor" "true"
-// IGNORE_K2
 
 actual class SimpleWConstructor(i: Int, actual val b: String = "") {
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/movePropertyToConstructor/jvm/jvm.kt b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/movePropertyToConstructor/jvm/jvm.kt
index 1c12ac3f727e..2d57686e0561 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/movePropertyToConstructor/jvm/jvm.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/movePropertyToConstructor/jvm/jvm.kt
@@ -1,5 +1,4 @@
 // "Move to constructor" "true"
-// IGNORE_K2
 
 actual class SimpleWConstructor {
     val <caret>b: String = ""
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/movePropertyToConstructor/jvm/jvm.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/movePropertyToConstructor/jvm/jvm.kt.after
index d6cf86f51f9c..64048e6dfbd4 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/movePropertyToConstructor/jvm/jvm.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/movePropertyToConstructor/jvm/jvm.kt.after
@@ -1,5 +1,4 @@
 // "Move to constructor" "true"
-// IGNORE_K2
 
 actual class SimpleWConstructor(val b: String = "") {
 }
\ No newline at end of file