diff --git a/compiler/testData/codegen/box/annotations/resolveWithLowPriorityAnnotation.kt b/compiler/testData/codegen/box/annotations/resolveWithLowPriorityAnnotation.kt
index 9b51c9fdb51..908eb2dc040 100644
--- a/compiler/testData/codegen/box/annotations/resolveWithLowPriorityAnnotation.kt
+++ b/compiler/testData/codegen/box/annotations/resolveWithLowPriorityAnnotation.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR_DIAGNOSTICS
 // WITH_RUNTIME
 
 @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
diff --git a/compiler/testData/codegen/box/collectionLiterals/collectionLiteralsWithConstants.kt b/compiler/testData/codegen/box/collectionLiterals/collectionLiteralsWithConstants.kt
index c565aab7244..3b1c07084ef 100644
--- a/compiler/testData/codegen/box/collectionLiterals/collectionLiteralsWithConstants.kt
+++ b/compiler/testData/codegen/box/collectionLiterals/collectionLiteralsWithConstants.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR_DIAGNOSTICS
 // WITH_REFLECT
 
 // TARGET_BACKEND: JVM
diff --git a/compiler/testData/codegen/box/contracts/kt39374.kt b/compiler/testData/codegen/box/contracts/kt39374.kt
index e69bdf6f00d..26425439f69 100644
--- a/compiler/testData/codegen/box/contracts/kt39374.kt
+++ b/compiler/testData/codegen/box/contracts/kt39374.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR_DIAGNOSTICS
 // IGNORE_BACKEND: NATIVE
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
diff --git a/compiler/testData/codegen/box/controlStructures/kt12908_2.kt b/compiler/testData/codegen/box/controlStructures/kt12908_2.kt
index f4fd0e0555e..9e1de9c3e5d 100644
--- a/compiler/testData/codegen/box/controlStructures/kt12908_2.kt
+++ b/compiler/testData/codegen/box/controlStructures/kt12908_2.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR_DIAGNOSTICS
 var field: Int = 0
 
 fun next(): Int {
diff --git a/compiler/testData/codegen/box/delegation/delegationWithPrivateConstructor.kt b/compiler/testData/codegen/box/delegation/delegationWithPrivateConstructor.kt
index 0fcef72f872..bcfd8a9132a 100644
--- a/compiler/testData/codegen/box/delegation/delegationWithPrivateConstructor.kt
+++ b/compiler/testData/codegen/box/delegation/delegationWithPrivateConstructor.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR_DIAGNOSTICS
 class MyObject private constructor(val delegate: Interface) : Interface by delegate {
     constructor() : this(Delegate())
 }
diff --git a/compiler/testData/codegen/box/evaluate/divide.kt b/compiler/testData/codegen/box/evaluate/divide.kt
index 45d9c48d7d7..75d45fb5d31 100644
--- a/compiler/testData/codegen/box/evaluate/divide.kt
+++ b/compiler/testData/codegen/box/evaluate/divide.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR_DIAGNOSTICS
 // TARGET_BACKEND: JVM
 
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/evaluate/intrinsics.kt b/compiler/testData/codegen/box/evaluate/intrinsics.kt
index de082796984..b13c9671c1a 100644
--- a/compiler/testData/codegen/box/evaluate/intrinsics.kt
+++ b/compiler/testData/codegen/box/evaluate/intrinsics.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR_DIAGNOSTICS
 // TARGET_BACKEND: JVM
 
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/evaluate/maxValueByte.kt b/compiler/testData/codegen/box/evaluate/maxValueByte.kt
index cfb4eb2f2c3..9aba9d0dd54 100644
--- a/compiler/testData/codegen/box/evaluate/maxValueByte.kt
+++ b/compiler/testData/codegen/box/evaluate/maxValueByte.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR_DIAGNOSTICS
 // TARGET_BACKEND: JVM
 
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/evaluate/maxValueInt.kt b/compiler/testData/codegen/box/evaluate/maxValueInt.kt
index 669dff497d0..a2fe20d4130 100644
--- a/compiler/testData/codegen/box/evaluate/maxValueInt.kt
+++ b/compiler/testData/codegen/box/evaluate/maxValueInt.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR_DIAGNOSTICS
 // TARGET_BACKEND: JVM
 
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/evaluate/minus.kt b/compiler/testData/codegen/box/evaluate/minus.kt
index b9a0987b111..2c0c594d159 100644
--- a/compiler/testData/codegen/box/evaluate/minus.kt
+++ b/compiler/testData/codegen/box/evaluate/minus.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR_DIAGNOSTICS
 // TARGET_BACKEND: JVM
 
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/evaluate/mod.kt b/compiler/testData/codegen/box/evaluate/mod.kt
index bbcf0190791..50f411473c2 100644
--- a/compiler/testData/codegen/box/evaluate/mod.kt
+++ b/compiler/testData/codegen/box/evaluate/mod.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR_DIAGNOSTICS
 // TARGET_BACKEND: JVM
 
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/evaluate/multiply.kt b/compiler/testData/codegen/box/evaluate/multiply.kt
index 31ca4006ef2..978764e0ead 100644
--- a/compiler/testData/codegen/box/evaluate/multiply.kt
+++ b/compiler/testData/codegen/box/evaluate/multiply.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR_DIAGNOSTICS
 // TARGET_BACKEND: JVM
 
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/evaluate/parenthesized.kt b/compiler/testData/codegen/box/evaluate/parenthesized.kt
index 588a2463d3a..88ccae26ee0 100644
--- a/compiler/testData/codegen/box/evaluate/parenthesized.kt
+++ b/compiler/testData/codegen/box/evaluate/parenthesized.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR_DIAGNOSTICS
 // TARGET_BACKEND: JVM
 
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/evaluate/plus.kt b/compiler/testData/codegen/box/evaluate/plus.kt
index b0fb097164a..c7da6fe3597 100644
--- a/compiler/testData/codegen/box/evaluate/plus.kt
+++ b/compiler/testData/codegen/box/evaluate/plus.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR_DIAGNOSTICS
 // TARGET_BACKEND: JVM
 
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/functions/defaultargs.kt b/compiler/testData/codegen/box/functions/defaultargs.kt
index 726a4d4db10..d24557a2b17 100644
--- a/compiler/testData/codegen/box/functions/defaultargs.kt
+++ b/compiler/testData/codegen/box/functions/defaultargs.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR_DIAGNOSTICS
 open abstract class B {
     fun foo(arg: Int = 239 + 1) : Int = arg
 }
diff --git a/compiler/testData/codegen/box/functions/defaultargs4.kt b/compiler/testData/codegen/box/functions/defaultargs4.kt
index b98b9a95d64..9b0ca9b5f02 100644
--- a/compiler/testData/codegen/box/functions/defaultargs4.kt
+++ b/compiler/testData/codegen/box/functions/defaultargs4.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR_DIAGNOSTICS
 interface A {
     fun bar2(arg: Int = 239) : Int
 
diff --git a/compiler/testData/codegen/box/functions/defaultargs5.kt b/compiler/testData/codegen/box/functions/defaultargs5.kt
index 91dc6f6be40..776736fb905 100644
--- a/compiler/testData/codegen/box/functions/defaultargs5.kt
+++ b/compiler/testData/codegen/box/functions/defaultargs5.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR_DIAGNOSTICS
 open abstract class B {
     abstract fun foo2(arg: Int = 239) : Int
 }
diff --git a/compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt b/compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt
index ca43c4b8e8c..de18d4c9273 100644
--- a/compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt
+++ b/compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt
@@ -1,6 +1,5 @@
 // DONT_TARGET_EXACT_BACKEND: WASM
 // WASM_MUTE_REASON: SERIALIZATION_REGRESSION
-// IGNORE_BACKEND_FIR: JVM_IR
 // EXPECTED_REACHABLE_NODES: 1304
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/jvmPackageName/metadataField.kt b/compiler/testData/codegen/box/jvmPackageName/metadataField.kt
index 7efd2b4eb9e..f38a67b0157 100644
--- a/compiler/testData/codegen/box/jvmPackageName/metadataField.kt
+++ b/compiler/testData/codegen/box/jvmPackageName/metadataField.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR_DIAGNOSTICS
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/jvmPackageName/multifileClass.kt b/compiler/testData/codegen/box/jvmPackageName/multifileClass.kt
index aba8692fa6b..fbf5340c6bb 100644
--- a/compiler/testData/codegen/box/jvmPackageName/multifileClass.kt
+++ b/compiler/testData/codegen/box/jvmPackageName/multifileClass.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR_DIAGNOSTICS
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/jvmPackageName/rootPackage.kt b/compiler/testData/codegen/box/jvmPackageName/rootPackage.kt
index 9a2c21a959a..bbee85eea00 100644
--- a/compiler/testData/codegen/box/jvmPackageName/rootPackage.kt
+++ b/compiler/testData/codegen/box/jvmPackageName/rootPackage.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR_DIAGNOSTICS
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/jvmPackageName/simple.kt b/compiler/testData/codegen/box/jvmPackageName/simple.kt
index aecccdb64cd..55712c7ca7b 100644
--- a/compiler/testData/codegen/box/jvmPackageName/simple.kt
+++ b/compiler/testData/codegen/box/jvmPackageName/simple.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR_DIAGNOSTICS
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/jvmPackageName/withJvmName.kt b/compiler/testData/codegen/box/jvmPackageName/withJvmName.kt
index ee9d09a4e98..1d639b16f06 100644
--- a/compiler/testData/codegen/box/jvmPackageName/withJvmName.kt
+++ b/compiler/testData/codegen/box/jvmPackageName/withJvmName.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR_DIAGNOSTICS
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/reflection/typeOf/noReflect/nonReifiedTypeParameters/innerGeneric.kt b/compiler/testData/codegen/box/reflection/typeOf/noReflect/nonReifiedTypeParameters/innerGeneric.kt
index bae963c80b5..8f9f3a4a258 100644
--- a/compiler/testData/codegen/box/reflection/typeOf/noReflect/nonReifiedTypeParameters/innerGeneric.kt
+++ b/compiler/testData/codegen/box/reflection/typeOf/noReflect/nonReifiedTypeParameters/innerGeneric.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR_DIAGNOSTICS
 // !USE_EXPERIMENTAL: kotlin.ExperimentalStdlibApi
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/reflection/typeOf/nonReifiedTypeParameters/innerGeneric.kt b/compiler/testData/codegen/box/reflection/typeOf/nonReifiedTypeParameters/innerGeneric.kt
index 1d333a6345c..ab7a22b0ee3 100644
--- a/compiler/testData/codegen/box/reflection/typeOf/nonReifiedTypeParameters/innerGeneric.kt
+++ b/compiler/testData/codegen/box/reflection/typeOf/nonReifiedTypeParameters/innerGeneric.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR_DIAGNOSTICS
 // !USE_EXPERIMENTAL: kotlin.ExperimentalStdlibApi
 // WITH_REFLECT
 // KJS_WITH_FULL_RUNTIME
diff --git a/compiler/testData/codegen/box/super/innerClassLabeledSuper2.kt b/compiler/testData/codegen/box/super/innerClassLabeledSuper2.kt
index 1a0bca8c437..c5fa3fb87a4 100644
--- a/compiler/testData/codegen/box/super/innerClassLabeledSuper2.kt
+++ b/compiler/testData/codegen/box/super/innerClassLabeledSuper2.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR_DIAGNOSTICS
 //inspired by kt3492
 interface BK {
     fun foo(): String