diff --git a/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/InTextDirectivesUtils.java b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/InTextDirectivesUtils.java
index cd12e1f5a65..74b7c8e5638 100644
--- a/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/InTextDirectivesUtils.java
+++ b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/InTextDirectivesUtils.java
@@ -12,7 +12,6 @@ import com.intellij.util.ArrayUtil;
 import kotlin.text.StringsKt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.utils.CollectionsKt;
 import org.jetbrains.kotlin.utils.ExceptionUtilsKt;
 
 import java.io.BufferedReader;
@@ -27,6 +26,9 @@ public final class InTextDirectivesUtils {
     private static final String DIRECTIVES_FILE_NAME = "directives.txt";
 
     public static final String IGNORE_BACKEND_DIRECTIVE_PREFIX = "// IGNORE_BACKEND: ";
+    public static final String IGNORE_BACKEND_K1_DIRECTIVE_PREFIX = "// IGNORE_BACKEND_K1: ";
+
+    public static final String[] IGNORE_BACKEND_DIRECTIVE_PREFIXES = { IGNORE_BACKEND_DIRECTIVE_PREFIX, IGNORE_BACKEND_K1_DIRECTIVE_PREFIX };
 
     private InTextDirectivesUtils() {
     }
@@ -241,13 +243,13 @@ public final class InTextDirectivesUtils {
         return backends.isEmpty() || backends.contains(targetBackend.name()) || isCompatibleTargetExceptAny(targetBackend.getCompatibleWith(), backends);
     }
 
-    public static boolean isIgnoredTarget(@NotNull TargetBackend targetBackend, @NotNull File file, @NotNull String ignoreBackendDirectivePrefix) {
-        List<String> ignoredBackends = findListWithPrefixes(textWithDirectives(file), ignoreBackendDirectivePrefix);
+    public static boolean isIgnoredTarget(@NotNull TargetBackend targetBackend, @NotNull File file, String... ignoreBackendDirectivePrefixes) {
+        List<String> ignoredBackends = findListWithPrefixes(textWithDirectives(file), ignoreBackendDirectivePrefixes);
         return ignoredBackends.contains(targetBackend.name());
     }
 
     public static boolean isIgnoredTarget(@NotNull TargetBackend targetBackend, @NotNull File file) {
-        return isIgnoredTarget(targetBackend, file, IGNORE_BACKEND_DIRECTIVE_PREFIX);
+        return isIgnoredTarget(targetBackend, file, IGNORE_BACKEND_DIRECTIVE_PREFIXES);
     }
 
     public static boolean dontRunGeneratedCode(@NotNull TargetBackend targetBackend, @NotNull File file) {
diff --git a/compiler/testData/codegen/box/annotations/instances/multimoduleCreation.kt b/compiler/testData/codegen/box/annotations/instances/multimoduleCreation.kt
index 77119dc760b..f46f95602a8 100644
--- a/compiler/testData/codegen/box/annotations/instances/multimoduleCreation.kt
+++ b/compiler/testData/codegen/box/annotations/instances/multimoduleCreation.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: IllegalStateException: Usage of default value argument for this annotation is not yet possible.
 // Please specify value for 'A.kClass' explicitly
 // TARGET_BACKEND: JVM_IR
diff --git a/compiler/testData/codegen/box/annotations/instances/multiplatformInstantiation.kt b/compiler/testData/codegen/box/annotations/instances/multiplatformInstantiation.kt
index e22d6b537a2..db4f2f3abdf 100644
--- a/compiler/testData/codegen/box/annotations/instances/multiplatformInstantiation.kt
+++ b/compiler/testData/codegen/box/annotations/instances/multiplatformInstantiation.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: expect/actual in the same module (ACTUAL_WITHOUT_EXPECT)
 // IGNORE_BACKEND: JVM
 // IGNORE_BACKEND: WASM
diff --git a/compiler/testData/codegen/box/annotations/singleAssignmentToVarargInAnnotation.kt b/compiler/testData/codegen/box/annotations/singleAssignmentToVarargInAnnotation.kt
index fd258a6604a..e08eba3e268 100644
--- a/compiler/testData/codegen/box/annotations/singleAssignmentToVarargInAnnotation.kt
+++ b/compiler/testData/codegen/box/annotations/singleAssignmentToVarargInAnnotation.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: don't support legacy feature
 // !LANGUAGE: -ProhibitAssigningSingleElementsToVarargsInNamedForm
 // TARGET_BACKEND: JVM
diff --git a/compiler/testData/codegen/box/argumentOrder/kt17691.kt b/compiler/testData/codegen/box/argumentOrder/kt17691.kt
index 8a8bbedf0ff..13b37aee8db 100644
--- a/compiler/testData/codegen/box/argumentOrder/kt17691.kt
+++ b/compiler/testData/codegen/box/argumentOrder/kt17691.kt
@@ -3,7 +3,6 @@
 // WITH_STDLIB
 // TARGET_BACKEND: JVM
 // IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
 
 fun foo(vararg x: Unit, y: Any) {}
 
diff --git a/compiler/testData/codegen/box/binaryOp/boxingOfLiteralReceiverWithIntegerValueType.kt b/compiler/testData/codegen/box/binaryOp/boxingOfLiteralReceiverWithIntegerValueType.kt
index 0c47cb8ba55..35b17ca75c8 100644
--- a/compiler/testData/codegen/box/binaryOp/boxingOfLiteralReceiverWithIntegerValueType.kt
+++ b/compiler/testData/codegen/box/binaryOp/boxingOfLiteralReceiverWithIntegerValueType.kt
@@ -1,6 +1,6 @@
 // !LANGUAGE: -ApproximateIntegerLiteralTypesInReceiverPosition
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: don't support legacy feature
 // WITH_STDLIB
 // This test exists only to check that we don't accidentally break the buggy behavior of the old JVM backend in JVM IR (KT-42321).
diff --git a/compiler/testData/codegen/box/binaryOp/call.kt b/compiler/testData/codegen/box/binaryOp/call.kt
index 3bc4711cbf1..27cf6db0635 100644
--- a/compiler/testData/codegen/box/binaryOp/call.kt
+++ b/compiler/testData/codegen/box/binaryOp/call.kt
@@ -1,5 +1,5 @@
 // LANGUAGE: -ApproximateIntegerLiteralTypesInReceiverPosition
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: don't support legacy feature; for reasons this test is ignored, go to KT-46419
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/binaryOp/callNullable.kt b/compiler/testData/codegen/box/binaryOp/callNullable.kt
index c36e2294429..a0b7625d98c 100644
--- a/compiler/testData/codegen/box/binaryOp/callNullable.kt
+++ b/compiler/testData/codegen/box/binaryOp/callNullable.kt
@@ -1,5 +1,5 @@
 // LANGUAGE: -ApproximateIntegerLiteralTypesInReceiverPosition
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: don't support legacy feature; for reasons this test is ignored, go to KT-46419
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/binaryOp/intrinsic.kt b/compiler/testData/codegen/box/binaryOp/intrinsic.kt
index 388619947c5..43b161d9e1d 100644
--- a/compiler/testData/codegen/box/binaryOp/intrinsic.kt
+++ b/compiler/testData/codegen/box/binaryOp/intrinsic.kt
@@ -1,5 +1,5 @@
 // LANGUAGE: -ApproximateIntegerLiteralTypesInReceiverPosition
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: don't support legacy feature; for reasons this test is ignored, go to KT-46419
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/binaryOp/intrinsicNullable.kt b/compiler/testData/codegen/box/binaryOp/intrinsicNullable.kt
index f7d424560f6..c1be1c53fa8 100644
--- a/compiler/testData/codegen/box/binaryOp/intrinsicNullable.kt
+++ b/compiler/testData/codegen/box/binaryOp/intrinsicNullable.kt
@@ -1,5 +1,5 @@
 // LANGUAGE: -ApproximateIntegerLiteralTypesInReceiverPosition
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: don't support legacy feature; for reasons this test is ignored, go to KT-46419
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/bridges/fakeOverrideFromInterfaceThroughIntermediateClass.kt b/compiler/testData/codegen/box/bridges/fakeOverrideFromInterfaceThroughIntermediateClass.kt
index b37fe4824f6..a4112599fab 100644
--- a/compiler/testData/codegen/box/bridges/fakeOverrideFromInterfaceThroughIntermediateClass.kt
+++ b/compiler/testData/codegen/box/bridges/fakeOverrideFromInterfaceThroughIntermediateClass.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: -AbstractClassMemberNotImplementedWithIntermediateAbstractClass
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: don't support legacy feature
 
 interface A {
diff --git a/compiler/testData/codegen/box/bridges/fakeOverrideMultiFile.kt b/compiler/testData/codegen/box/bridges/fakeOverrideMultiFile.kt
index 4ec90712206..8a7c116756c 100644
--- a/compiler/testData/codegen/box/bridges/fakeOverrideMultiFile.kt
+++ b/compiler/testData/codegen/box/bridges/fakeOverrideMultiFile.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: -AbstractClassMemberNotImplementedWithIntermediateAbstractClass
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: don't support legacy feature
 
 // FILE: 1.kt
diff --git a/compiler/testData/codegen/box/callableReference/kt49526_sam.kt b/compiler/testData/codegen/box/callableReference/kt49526_sam.kt
index b6fc93d5466..b76b1ed3b31 100644
--- a/compiler/testData/codegen/box/callableReference/kt49526_sam.kt
+++ b/compiler/testData/codegen/box/callableReference/kt49526_sam.kt
@@ -1,7 +1,7 @@
 // IGNORE_BACKEND: JVM
 // IGNORE_LIGHT_ANALYSIS
 
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR_STATUS: LambdaConversionException: Type mismatch for lambda argument 1: class java.lang.Object is not convertible to interface I1
 // JVM_IR it this case has an approximated type 'KFun<out Any>', which has a projected top-level argument.
 
diff --git a/compiler/testData/codegen/box/checkcastOptimization/kt47851.kt b/compiler/testData/codegen/box/checkcastOptimization/kt47851.kt
index f6bed4eb204..2af58ab79b2 100644
--- a/compiler/testData/codegen/box/checkcastOptimization/kt47851.kt
+++ b/compiler/testData/codegen/box/checkcastOptimization/kt47851.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: result.getMethod OK in FE1.0, unresolved in FIR
 
 class C(val value: String) {
diff --git a/compiler/testData/codegen/box/checkcastOptimization/kt47851a.kt b/compiler/testData/codegen/box/checkcastOptimization/kt47851a.kt
index 70c789c18b4..49358a0fa6a 100644
--- a/compiler/testData/codegen/box/checkcastOptimization/kt47851a.kt
+++ b/compiler/testData/codegen/box/checkcastOptimization/kt47851a.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: result.getMethod OK in FE1.0, unresolved in FIR
 // FULL_JDK
 
diff --git a/compiler/testData/codegen/box/collections/irrelevantImplCharSequenceKotlin.kt b/compiler/testData/codegen/box/collections/irrelevantImplCharSequenceKotlin.kt
index 542e29b53d6..f96a0df6e18 100644
--- a/compiler/testData/codegen/box/collections/irrelevantImplCharSequenceKotlin.kt
+++ b/compiler/testData/codegen/box/collections/irrelevantImplCharSequenceKotlin.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: wrong ABSTRACT_MEMBER_NOT_IMPLEMENTED, probably provoked by override mapping error
 // TARGET_BACKEND: JVM
 
diff --git a/compiler/testData/codegen/box/collections/irrelevantImplMutableList.kt b/compiler/testData/codegen/box/collections/irrelevantImplMutableList.kt
index 1e47ee2df91..a468c353f13 100644
--- a/compiler/testData/codegen/box/collections/irrelevantImplMutableList.kt
+++ b/compiler/testData/codegen/box/collections/irrelevantImplMutableList.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: wrong ABSTRACT_MEMBER_NOT_IMPLEMENTED, probably provoked by override mapping error
 // TARGET_BACKEND: JVM
 
diff --git a/compiler/testData/codegen/box/collections/irrelevantImplMutableListKotlin.kt b/compiler/testData/codegen/box/collections/irrelevantImplMutableListKotlin.kt
index 0afe5aef9a8..39e2f760569 100644
--- a/compiler/testData/codegen/box/collections/irrelevantImplMutableListKotlin.kt
+++ b/compiler/testData/codegen/box/collections/irrelevantImplMutableListKotlin.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: wrong ABSTRACT_MEMBER_NOT_IMPLEMENTED, probably provoked by override mapping error
 // TARGET_BACKEND: JVM
 
diff --git a/compiler/testData/codegen/box/collections/irrelevantImplMutableListSubstitution.kt b/compiler/testData/codegen/box/collections/irrelevantImplMutableListSubstitution.kt
index feb09779ff7..27d4035495a 100644
--- a/compiler/testData/codegen/box/collections/irrelevantImplMutableListSubstitution.kt
+++ b/compiler/testData/codegen/box/collections/irrelevantImplMutableListSubstitution.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: wrong CONFLICTING_INHERITED_JVM_DECLARATIONS, probably provoked by override mapping error
 // TARGET_BACKEND: JVM
 
diff --git a/compiler/testData/codegen/box/collections/kt48945.kt b/compiler/testData/codegen/box/collections/kt48945.kt
index 0d96f95a02e..6838ee82480 100644
--- a/compiler/testData/codegen/box/collections/kt48945.kt
+++ b/compiler/testData/codegen/box/collections/kt48945.kt
@@ -1,6 +1,6 @@
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: in progress (M.G.), different structure of f/o
 // IGNORE_BACKEND: ANDROID
 //  ^ NSME: java.util.AbstractMap.remove
diff --git a/compiler/testData/codegen/box/collections/kt48945a.kt b/compiler/testData/codegen/box/collections/kt48945a.kt
index 1ef197387cf..249675ba569 100644
--- a/compiler/testData/codegen/box/collections/kt48945a.kt
+++ b/compiler/testData/codegen/box/collections/kt48945a.kt
@@ -1,6 +1,6 @@
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: in progress (M.G.), different structure of f/o
 // IGNORE_BACKEND: ANDROID
 //  ^ NSME: java.util.AbstractMap.remove
diff --git a/compiler/testData/codegen/box/collections/kt48945b.kt b/compiler/testData/codegen/box/collections/kt48945b.kt
index d4fdf6cf209..fabe5c757d8 100644
--- a/compiler/testData/codegen/box/collections/kt48945b.kt
+++ b/compiler/testData/codegen/box/collections/kt48945b.kt
@@ -1,6 +1,6 @@
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: in progress (M.G.), different structure of f/o
 // IGNORE_BACKEND: ANDROID
 //  ^ NSME: java.util.AbstractMap.remove
diff --git a/compiler/testData/codegen/box/collections/kt48945c.kt b/compiler/testData/codegen/box/collections/kt48945c.kt
index f37b38f5347..58b4417a036 100644
--- a/compiler/testData/codegen/box/collections/kt48945c.kt
+++ b/compiler/testData/codegen/box/collections/kt48945c.kt
@@ -1,6 +1,6 @@
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: in progress (M.G.), different structure of f/o
 // IGNORE_BACKEND: ANDROID
 //  ^ NSME: java.util.AbstractMap.remove
diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/clashingFakeOverrideSignatures.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/clashingFakeOverrideSignatures.kt
index 3ff2fa3cad0..2999b7ebeff 100644
--- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/clashingFakeOverrideSignatures.kt
+++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/clashingFakeOverrideSignatures.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // IGNORE_BACKEND: NATIVE
 // FIR status: Validation failed. TODO decide if we want to fix KT-42020 for FIR as well
 // MODULE: lib
diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/optionalAnnotation.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/optionalAnnotation.kt
index 1205525f08f..0a7074c08a0 100644
--- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/optionalAnnotation.kt
+++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/optionalAnnotation.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: expect/actual in the same module (ACTUAL_WITHOUT_EXPECT)
 // !LANGUAGE: +MultiPlatformProjects
 // !OPT_IN: kotlin.ExperimentalMultiplatform
diff --git a/compiler/testData/codegen/box/constants/numberLiteralCoercionToInferredType.kt b/compiler/testData/codegen/box/constants/numberLiteralCoercionToInferredType.kt
index 97cfd2230fd..6ff2d6a2496 100644
--- a/compiler/testData/codegen/box/constants/numberLiteralCoercionToInferredType.kt
+++ b/compiler/testData/codegen/box/constants/numberLiteralCoercionToInferredType.kt
@@ -2,7 +2,7 @@
 // WASM_MUTE_REASON: FAILS_IN_JS_IR
 // IGNORE_BACKEND: JS, JS_IR, NATIVE
 // IGNORE_BACKEND: JS_IR_ES6
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: value: 0 should have type Long
 // WITH_STDLIB
 
diff --git a/compiler/testData/codegen/box/coroutines/debug/debuggerMetadata.kt b/compiler/testData/codegen/box/coroutines/debug/debuggerMetadata.kt
index a2087ffcb4d..758bd2efcd2 100644
--- a/compiler/testData/codegen/box/coroutines/debug/debuggerMetadata.kt
+++ b/compiler/testData/codegen/box/coroutines/debug/debuggerMetadata.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: some error in resolve (FirErrorNamedReferenceImpl in FIR)
 // TARGET_BACKEND: JVM
 // WITH_STDLIB
diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/defaultExpect.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/defaultExpect.kt
index 81ff20a3dd2..cfbb3f11aad 100644
--- a/compiler/testData/codegen/box/coroutines/featureIntersection/defaultExpect.kt
+++ b/compiler/testData/codegen/box/coroutines/featureIntersection/defaultExpect.kt
@@ -1,6 +1,6 @@
 // !LANGUAGE: +MultiPlatformProjects
 // WITH_STDLIB
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: expect/actual in the same module (ACTUAL_WITHOUT_EXPECT)
 
 import kotlin.coroutines.*
diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/suspendFunctionAsSupertypeIsCheckWithArity.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/suspendFunctionAsSupertypeIsCheckWithArity.kt
index 73405bb40bd..895cf9971de 100644
--- a/compiler/testData/codegen/box/coroutines/featureIntersection/suspendFunctionAsSupertypeIsCheckWithArity.kt
+++ b/compiler/testData/codegen/box/coroutines/featureIntersection/suspendFunctionAsSupertypeIsCheckWithArity.kt
@@ -1,6 +1,5 @@
 // KJS_WITH_FULL_RUNTIME
 // IGNORE_BACKEND: JS, JVM, JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
 // FIR status: not supported in JVM
 // !LANGUAGE: +SuspendFunctionAsSupertype
 
diff --git a/compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt b/compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt
index b113d84938c..5342a8b26c0 100644
--- a/compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt
+++ b/compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt
@@ -1,6 +1,5 @@
-// IGNORE_BACKEND_FIR: JVM_IR
-// FIR status: not supported in JVM
 // IGNORE_BACKEND: JVM_IR, JS_IR
+// FIR status: not supported in JVM
 // IGNORE_BACKEND: JS_IR_ES6
 // IGNORE_BACKEND: JVM, JS, NATIVE
 // IGNORE_BACKEND: WASM
diff --git a/compiler/testData/codegen/box/coroutines/suspendCovariantJavaOverrides.kt b/compiler/testData/codegen/box/coroutines/suspendCovariantJavaOverrides.kt
index 6de554373c0..cd216971944 100644
--- a/compiler/testData/codegen/box/coroutines/suspendCovariantJavaOverrides.kt
+++ b/compiler/testData/codegen/box/coroutines/suspendCovariantJavaOverrides.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: wrong ABSTRACT_SUPER_CALL
 // TARGET_BACKEND: JVM
 // WITH_STDLIB
diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt
index bc9569d7622..45c7be48ee4 100644
--- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt
+++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: questionable bytecode listing difference (open/final methods in final class)
 // WITH_STDLIB
 // WITH_COROUTINES
diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.kt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.kt
index 2df8fb0d14d..83a3a9a1f6b 100644
--- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.kt
+++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: questionable bytecode listing difference (open/final methods in final class)
 // WITH_STDLIB
 // WITH_COROUTINES
diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override5.kt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override5.kt
index bd72a1637df..55d6e0cecce 100644
--- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override5.kt
+++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override5.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: questionable bytecode listing difference (open/final methods in final class)
 // TARGET_BACKEND: JVM
 // FULL_JDK
diff --git a/compiler/testData/codegen/box/dataClasses/kt49715.kt b/compiler/testData/codegen/box/dataClasses/kt49715.kt
index 6a771d608c4..0574ea692e1 100644
--- a/compiler/testData/codegen/box/dataClasses/kt49715.kt
+++ b/compiler/testData/codegen/box/dataClasses/kt49715.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: [IR VALIDATION] Duplicate IR node: FUN GENERATED_DATA_CLASS_MEMBER name:toString
 // CHECK_BYTECODE_LISTING
 // FIR_IDENTICAL
diff --git a/compiler/testData/codegen/box/dataClasses/kt49715_behaviorChange.kt b/compiler/testData/codegen/box/dataClasses/kt49715_behaviorChange.kt
index 2858188a80d..ba1c5bbc7f7 100644
--- a/compiler/testData/codegen/box/dataClasses/kt49715_behaviorChange.kt
+++ b/compiler/testData/codegen/box/dataClasses/kt49715_behaviorChange.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: [IR VALIDATION] Duplicate IR node: FUN GENERATED_DATA_CLASS_MEMBER name:equals
 
 interface A {
diff --git a/compiler/testData/codegen/box/defaultArguments/convention/incWithDefaultInGetter.kt b/compiler/testData/codegen/box/defaultArguments/convention/incWithDefaultInGetter.kt
index 56e166cd5e2..9d3a74d27ed 100644
--- a/compiler/testData/codegen/box/defaultArguments/convention/incWithDefaultInGetter.kt
+++ b/compiler/testData/codegen/box/defaultArguments/convention/incWithDefaultInGetter.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: don't support legacy feature (prefix increment calls getter twice). fail 2: anone1
 var inc: String = ""
 
diff --git a/compiler/testData/codegen/box/defaultArguments/convention/kt16520_old.kt b/compiler/testData/codegen/box/defaultArguments/convention/kt16520_old.kt
index 8a9e1e1d33a..455f8958653 100644
--- a/compiler/testData/codegen/box/defaultArguments/convention/kt16520_old.kt
+++ b/compiler/testData/codegen/box/defaultArguments/convention/kt16520_old.kt
@@ -1,6 +1,5 @@
 // !LANGUAGE: -ProperArrayConventionSetterWithDefaultCalls
 // IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
 // FIR status: don't support legacy feature
 // TARGET_BACKEND: JVM
 var result = "fail"
diff --git a/compiler/testData/codegen/box/defaultArguments/kt36853_fibonacci.kt b/compiler/testData/codegen/box/defaultArguments/kt36853_fibonacci.kt
index 1427b133266..87c0a261d35 100644
--- a/compiler/testData/codegen/box/defaultArguments/kt36853_fibonacci.kt
+++ b/compiler/testData/codegen/box/defaultArguments/kt36853_fibonacci.kt
@@ -1,6 +1,6 @@
 // WITH_STDLIB
 
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status:
 //  java.lang.StackOverflowError
 //	at Nat$Companion$invoke$1.next(kt36853_fibonacci.kt:40) ...
diff --git a/compiler/testData/codegen/box/defaultArguments/useNextParamInLambdaTailrec.kt b/compiler/testData/codegen/box/defaultArguments/useNextParamInLambdaTailrec.kt
index 1123cea0830..98778672a4c 100644
--- a/compiler/testData/codegen/box/defaultArguments/useNextParamInLambdaTailrec.kt
+++ b/compiler/testData/codegen/box/defaultArguments/useNextParamInLambdaTailrec.kt
@@ -1,5 +1,5 @@
 // IGNORE_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: don't support legacy feature. UNINITIALIZED_PARAMETER y. See KT-49800
 tailrec fun foo(x: () -> String? = { y }, y: String = "fail"): String? {
     if (y == "start")
diff --git a/compiler/testData/codegen/box/delegatedProperty/delegateToAnother/genericJavaProperty.kt b/compiler/testData/codegen/box/delegatedProperty/delegateToAnother/genericJavaProperty.kt
index 2de3c3fe383..0b9eca7441e 100644
--- a/compiler/testData/codegen/box/delegatedProperty/delegateToAnother/genericJavaProperty.kt
+++ b/compiler/testData/codegen/box/delegatedProperty/delegateToAnother/genericJavaProperty.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // WITH_REFLECT
 // WITH_STDLIB
 // FILE: J.java
diff --git a/compiler/testData/codegen/box/delegatedProperty/genericDelegateUncheckedCast2.kt b/compiler/testData/codegen/box/delegatedProperty/genericDelegateUncheckedCast2.kt
index 9530ce6f99b..640cd2be504 100644
--- a/compiler/testData/codegen/box/delegatedProperty/genericDelegateUncheckedCast2.kt
+++ b/compiler/testData/codegen/box/delegatedProperty/genericDelegateUncheckedCast2.kt
@@ -1,8 +1,7 @@
 // IGNORE_BACKEND: WASM
-// IGNORE_BACKEND_FIR: JVM_IR
-// FIR status: not supported in JVM
 // IGNORE_BACKEND: NATIVE
 // IGNORE_BACKEND: JVM_IR
+// FIR status: not supported in JVM
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // IGNORE_BACKEND: JVM, JS
diff --git a/compiler/testData/codegen/box/delegation/delegationToMap.kt b/compiler/testData/codegen/box/delegation/delegationToMap.kt
index 6dced10fc5a..7fb0a975c2e 100644
--- a/compiler/testData/codegen/box/delegation/delegationToMap.kt
+++ b/compiler/testData/codegen/box/delegation/delegationToMap.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: NSME: Test.remove(Ljava/lang/String;Ljava/lang/String;)Z
 // FIR + JVM_IR:
 //  INVOKEVIRTUAL Test.remove (Ljava/lang/String;Ljava/lang/String;)Z
diff --git a/compiler/testData/codegen/box/differentDependencyVersion/kt51194_javaAndKotlin.kt b/compiler/testData/codegen/box/differentDependencyVersion/kt51194_javaAndKotlin.kt
index 63b203fbdb7..577f0648840 100644
--- a/compiler/testData/codegen/box/differentDependencyVersion/kt51194_javaAndKotlin.kt
+++ b/compiler/testData/codegen/box/differentDependencyVersion/kt51194_javaAndKotlin.kt
@@ -1,7 +1,7 @@
 // TARGET_BACKEND: JVM
 // ISSUE: KT-51194
 // DIAGNOSTICS: +CONFLICTING_INHERITED_MEMBERS_WARNING
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: FIR correctly reports CONFLICTING_INHERITED_MEMBERS, so this test should not pass design
 //   For details see related issue
 
diff --git a/compiler/testData/codegen/box/differentDependencyVersion/kt51194_kotlin.kt b/compiler/testData/codegen/box/differentDependencyVersion/kt51194_kotlin.kt
index c13d82a02dc..5829cbe4994 100644
--- a/compiler/testData/codegen/box/differentDependencyVersion/kt51194_kotlin.kt
+++ b/compiler/testData/codegen/box/differentDependencyVersion/kt51194_kotlin.kt
@@ -1,7 +1,7 @@
 // TARGET_BACKEND: JVM
 // ISSUE: KT-51194
 // DIAGNOSTICS: +CONFLICTING_INHERITED_MEMBERS_WARNING
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: FIR correctly reports CONFLICTING_INHERITED_MEMBERS, so this test should not pass design
 //   For details see related issue
 
diff --git a/compiler/testData/codegen/box/enum/enumEntriesNameClashes.kt b/compiler/testData/codegen/box/enum/enumEntriesNameClashes.kt
index b3c854d8f47..d448478a006 100644
--- a/compiler/testData/codegen/box/enum/enumEntriesNameClashes.kt
+++ b/compiler/testData/codegen/box/enum/enumEntriesNameClashes.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: +EnumEntries
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // IGNORE_BACKEND: JS, JVM
 // WITH_STDLIB
 
diff --git a/compiler/testData/codegen/box/enum/nameClashWithCompanion.kt b/compiler/testData/codegen/box/enum/nameClashWithCompanion.kt
index 330e0d2c02c..2c0f52f7500 100644
--- a/compiler/testData/codegen/box/enum/nameClashWithCompanion.kt
+++ b/compiler/testData/codegen/box/enum/nameClashWithCompanion.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: don't support legacy feature (see https://youtrack.jetbrains.com/issue/KT-37591). UNRESOLVED_REFERENCE at '+'
 // WITH_STDLIB
 // MODULE: lib
diff --git a/compiler/testData/codegen/box/evaluate/intrinsics.kt b/compiler/testData/codegen/box/evaluate/intrinsics.kt
index 21a740f4b04..3293e0e23b4 100644
--- a/compiler/testData/codegen/box/evaluate/intrinsics.kt
+++ b/compiler/testData/codegen/box/evaluate/intrinsics.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: -ApproximateIntegerLiteralTypesInReceiverPosition
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: don't support legacy feature
 // TARGET_BACKEND: JVM
 
diff --git a/compiler/testData/codegen/box/evaluate/minus.kt b/compiler/testData/codegen/box/evaluate/minus.kt
index eea652ced37..22dda6df87b 100644
--- a/compiler/testData/codegen/box/evaluate/minus.kt
+++ b/compiler/testData/codegen/box/evaluate/minus.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: -ApproximateIntegerLiteralTypesInReceiverPosition
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // TARGET_BACKEND: JVM
 
 // WITH_STDLIB
diff --git a/compiler/testData/codegen/box/evaluate/multiply.kt b/compiler/testData/codegen/box/evaluate/multiply.kt
index 43afd2cb7c6..7bf4b464f73 100644
--- a/compiler/testData/codegen/box/evaluate/multiply.kt
+++ b/compiler/testData/codegen/box/evaluate/multiply.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: -ApproximateIntegerLiteralTypesInReceiverPosition
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // TARGET_BACKEND: JVM
 
 // WITH_STDLIB
diff --git a/compiler/testData/codegen/box/evaluate/parenthesized.kt b/compiler/testData/codegen/box/evaluate/parenthesized.kt
index 3ed28104757..d8893d6e692 100644
--- a/compiler/testData/codegen/box/evaluate/parenthesized.kt
+++ b/compiler/testData/codegen/box/evaluate/parenthesized.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: -ApproximateIntegerLiteralTypesInReceiverPosition
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // TARGET_BACKEND: JVM
 
 // WITH_STDLIB
diff --git a/compiler/testData/codegen/box/evaluate/plus.kt b/compiler/testData/codegen/box/evaluate/plus.kt
index 3aa434b18e1..52077cd4520 100644
--- a/compiler/testData/codegen/box/evaluate/plus.kt
+++ b/compiler/testData/codegen/box/evaluate/plus.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: -ApproximateIntegerLiteralTypesInReceiverPosition
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // TARGET_BACKEND: JVM
 
 // WITH_STDLIB
diff --git a/compiler/testData/codegen/box/evaluate/rem.kt b/compiler/testData/codegen/box/evaluate/rem.kt
index cd8cbd2ec52..c48ad5142d4 100644
--- a/compiler/testData/codegen/box/evaluate/rem.kt
+++ b/compiler/testData/codegen/box/evaluate/rem.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: -ApproximateIntegerLiteralTypesInReceiverPosition
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // TARGET_BACKEND: JVM
 
 // WITH_STDLIB
diff --git a/compiler/testData/codegen/box/extensionClasses/constructors.kt b/compiler/testData/codegen/box/extensionClasses/constructors.kt
index 850fe6ea31d..37d347f78bb 100644
--- a/compiler/testData/codegen/box/extensionClasses/constructors.kt
+++ b/compiler/testData/codegen/box/extensionClasses/constructors.kt
@@ -1,6 +1,6 @@
 // !LANGUAGE: +ContextReceivers
 // TARGET_BACKEND: JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: context receivers aren't yet supported
 // WITH_STDLIB
 
diff --git a/compiler/testData/codegen/box/fir/cannotCastToFunction.kt b/compiler/testData/codegen/box/fir/cannotCastToFunction.kt
index 6eea96ea1eb..ff80ba14927 100644
--- a/compiler/testData/codegen/box/fir/cannotCastToFunction.kt
+++ b/compiler/testData/codegen/box/fir/cannotCastToFunction.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM_IR
-// IGNORE_BACKEND: JVM_IR
+// IGNORE_BACKEND_K1: JVM_IR
 
 open class IrElement
 
diff --git a/compiler/testData/codegen/box/fir/unqualifiedEnum.kt b/compiler/testData/codegen/box/fir/unqualifiedEnum.kt
index c7dffd2af82..7d1bf8791f6 100644
--- a/compiler/testData/codegen/box/fir/unqualifiedEnum.kt
+++ b/compiler/testData/codegen/box/fir/unqualifiedEnum.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM_IR
-// IGNORE_BACKEND: JVM_IR
+// IGNORE_BACKEND_K1: JVM_IR
 // WITH_STDLIB
 
 enum class Rainbow {
diff --git a/compiler/testData/codegen/box/fullJdk/kt46540.kt b/compiler/testData/codegen/box/fullJdk/kt46540.kt
index be97a5b9530..d3292f6b015 100644
--- a/compiler/testData/codegen/box/fullJdk/kt46540.kt
+++ b/compiler/testData/codegen/box/fullJdk/kt46540.kt
@@ -1,6 +1,6 @@
 // !LANGUAGE: -ApproximateIntegerLiteralTypesInReceiverPosition
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: don't support legacy feature; for reasons this test is ignored, go to KT-46419
 // SKIP_JDK6
 // FULL_JDK
diff --git a/compiler/testData/codegen/box/increment/argumentWithSideEffects.kt b/compiler/testData/codegen/box/increment/argumentWithSideEffects.kt
index fde8aa5efde..cc01f79d613 100644
--- a/compiler/testData/codegen/box/increment/argumentWithSideEffects.kt
+++ b/compiler/testData/codegen/box/increment/argumentWithSideEffects.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: don't support legacy feature; questionable test, probably should not support.
 // Currently fails because prefix increment only calls getter once.
 var log = ""
diff --git a/compiler/testData/codegen/box/inference/builderInference/cstBasedOnTwoBuilderInferenceLambda.kt b/compiler/testData/codegen/box/inference/builderInference/cstBasedOnTwoBuilderInferenceLambda.kt
index d6f870ddeca..99ca59d464b 100644
--- a/compiler/testData/codegen/box/inference/builderInference/cstBasedOnTwoBuilderInferenceLambda.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/cstBasedOnTwoBuilderInferenceLambda.kt
@@ -1,6 +1,6 @@
 // WITH_STDLIB
 // IGNORE_BACKEND: WASM
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: ARGUMENT_TYPE_MISMATCH at contribute arguments
 // TARGET_BACKEND: JVM
 
diff --git a/compiler/testData/codegen/box/inference/builderInference/kt48445.kt b/compiler/testData/codegen/box/inference/builderInference/kt48445.kt
index 6f2de7e3bc2..a13a0c29738 100644
--- a/compiler/testData/codegen/box/inference/builderInference/kt48445.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/kt48445.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: +UnrestrictedBuilderInference
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER on lazy call (Name3, T)
 // WITH_STDLIB
 
diff --git a/compiler/testData/codegen/box/inference/builderInference/kt50520.kt b/compiler/testData/codegen/box/inference/builderInference/kt50520.kt
index 9d0288e8488..4f7a796c2f4 100644
--- a/compiler/testData/codegen/box/inference/builderInference/kt50520.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/kt50520.kt
@@ -1,5 +1,5 @@
 // WITH_STDLIB
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: different behavour with FE 1.0, reported `NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER`
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/inference/builderInference/memberScope.kt b/compiler/testData/codegen/box/inference/builderInference/memberScope.kt
index 1c33204c932..a1589466905 100644
--- a/compiler/testData/codegen/box/inference/builderInference/memberScope.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/memberScope.kt
@@ -1,7 +1,7 @@
 // !LANGUAGE: +UnrestrictedBuilderInference
 // !DIAGNOSTICS: -DEPRECATION -OPT_IN_IS_NOT_ENABLED
 // WITH_STDLIB
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: NONE_APPLICABLE at all equals calls
 import kotlin.experimental.ExperimentalTypeInference
 
diff --git a/compiler/testData/codegen/box/inference/builderInference/withExpectedType.kt b/compiler/testData/codegen/box/inference/builderInference/withExpectedType.kt
index 9fa5b308350..c270dc2542c 100644
--- a/compiler/testData/codegen/box/inference/builderInference/withExpectedType.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/withExpectedType.kt
@@ -1,7 +1,7 @@
 // !LANGUAGE: +UnrestrictedBuilderInference -UseBuilderInferenceOnlyIfNeeded
 // WITH_STDLIB
 // !DIAGNOSTICS: -OPT_IN_USAGE_ERROR -CAST_NEVER_SUCCEEDS
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: Initializer type mismatch at first val x = : expected kotlin/collections/MutableList<kotlin/CharSequence>, actual kotlin/collections/MutableList<kotlin/String>
 
 import kotlin.experimental.ExperimentalTypeInference
diff --git a/compiler/testData/codegen/box/inference/noNothingValueInsideSpecialCall.kt b/compiler/testData/codegen/box/inference/noNothingValueInsideSpecialCall.kt
index 871cd52c3f0..b581439331a 100644
--- a/compiler/testData/codegen/box/inference/noNothingValueInsideSpecialCall.kt
+++ b/compiler/testData/codegen/box/inference/noNothingValueInsideSpecialCall.kt
@@ -1,6 +1,6 @@
 // WITH_REFLECT
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: KotlinNothingValueException from create()
 
 fun <T : A> create(modelClass: Class<T>): T {
diff --git a/compiler/testData/codegen/box/invokedynamic/sam/kt51868_contravariantGenericSam.kt b/compiler/testData/codegen/box/invokedynamic/sam/kt51868_contravariantGenericSam.kt
index ba4af8f028f..628efd1c1ef 100644
--- a/compiler/testData/codegen/box/invokedynamic/sam/kt51868_contravariantGenericSam.kt
+++ b/compiler/testData/codegen/box/invokedynamic/sam/kt51868_contravariantGenericSam.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: "ClassCastException: String cannot be cast to StringBuilder".
 // FIR always takes the parameter type and erases type projections in it to obtain the SAM type. This is incorrect, see KT-51868 and KT-52428.
 
diff --git a/compiler/testData/codegen/box/invokedynamic/sam/specializedGenerics/genericWithInProjection.kt b/compiler/testData/codegen/box/invokedynamic/sam/specializedGenerics/genericWithInProjection.kt
index 556419a8406..af72fcf524f 100644
--- a/compiler/testData/codegen/box/invokedynamic/sam/specializedGenerics/genericWithInProjection.kt
+++ b/compiler/testData/codegen/box/invokedynamic/sam/specializedGenerics/genericWithInProjection.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: the test passes but LambdaMetafactory is used, so bytecode text check fails.
 // In this case FIR behavior is fine but it works because of a hack in
 
diff --git a/compiler/testData/codegen/box/ir/clashingFakeOverrideSignatures.kt b/compiler/testData/codegen/box/ir/clashingFakeOverrideSignatures.kt
index 68a10524463..ffd48f791a9 100644
--- a/compiler/testData/codegen/box/ir/clashingFakeOverrideSignatures.kt
+++ b/compiler/testData/codegen/box/ir/clashingFakeOverrideSignatures.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: validation failed. TODO decide if we want to fix KT-42020 for FIR as well
 
 open class Base<T> {
diff --git a/compiler/testData/codegen/box/ir/serializationRegressions/dispatchReceiverValue.kt b/compiler/testData/codegen/box/ir/serializationRegressions/dispatchReceiverValue.kt
index 78129ae1b6e..a84e3abba6b 100644
--- a/compiler/testData/codegen/box/ir/serializationRegressions/dispatchReceiverValue.kt
+++ b/compiler/testData/codegen/box/ir/serializationRegressions/dispatchReceiverValue.kt
@@ -3,7 +3,7 @@
 // !LANGUAGE: +MultiPlatformProjects
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: expect/actual in the same module (ACTUAL_WITHOUT_EXPECT)
 // MODULE: lib
 // FILE: common.kt
diff --git a/compiler/testData/codegen/box/ir/serializationRegressions/signatureClash.kt b/compiler/testData/codegen/box/ir/serializationRegressions/signatureClash.kt
index 0d975618002..131b358b617 100644
--- a/compiler/testData/codegen/box/ir/serializationRegressions/signatureClash.kt
+++ b/compiler/testData/codegen/box/ir/serializationRegressions/signatureClash.kt
@@ -4,7 +4,7 @@
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // IGNORE_BACKEND: NATIVE
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: validation failed. TODO decide if we want to fix KT-42020 for FIR as well
 // MODULE: lib
 // FILE: lib.kt
diff --git a/compiler/testData/codegen/box/ir/serializationRegressions/varAsFunctionCall.kt b/compiler/testData/codegen/box/ir/serializationRegressions/varAsFunctionCall.kt
index d308c7f8941..087cecf554f 100644
--- a/compiler/testData/codegen/box/ir/serializationRegressions/varAsFunctionCall.kt
+++ b/compiler/testData/codegen/box/ir/serializationRegressions/varAsFunctionCall.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: ARGUMENT_TYPE_MISMATCH at ok.z(fail), actual String, expected T
 // MODULE: lib
 // FILE: l1.kt
diff --git a/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inFunctionWithExpressionBodyWithJavaGeneric.kt b/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inFunctionWithExpressionBodyWithJavaGeneric.kt
index 1ac80930223..72a1a3a4a06 100644
--- a/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inFunctionWithExpressionBodyWithJavaGeneric.kt
+++ b/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inFunctionWithExpressionBodyWithJavaGeneric.kt
@@ -1,6 +1,6 @@
 // !LANGUAGE: +StrictJavaNullabilityAssertions -ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: expected: <OK> but was: <Fail: SHOULD NOT throw>, issue related to T & Any
 // See KT-8135
 // We could generate runtime assertion on call site for 'generic<NOT_NULL_TYPE>()' below.
diff --git a/compiler/testData/codegen/box/javaInterop/notNullAssertions/typeParameterWithMixedNullableAndNotNullableBounds.kt b/compiler/testData/codegen/box/javaInterop/notNullAssertions/typeParameterWithMixedNullableAndNotNullableBounds.kt
index 4dfab0de58d..1572680c71d 100644
--- a/compiler/testData/codegen/box/javaInterop/notNullAssertions/typeParameterWithMixedNullableAndNotNullableBounds.kt
+++ b/compiler/testData/codegen/box/javaInterop/notNullAssertions/typeParameterWithMixedNullableAndNotNullableBounds.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND: JVM, JVM_IR
+// IGNORE_BACKEND_K1: JVM, JVM_IR
 
 // Note: This fails on non-FIR because of KT-45903 (missing not-null assertion on argument).
 
diff --git a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/superCall.kt b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/superCall.kt
index 8e9079320f5..3883744da4b 100644
--- a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/superCall.kt
+++ b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/superCall.kt
@@ -1,6 +1,6 @@
 // CHECK_BYTECODE_LISTING
 // FIR_IDENTICAL
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: questionable bytecode listing difference (open/final methods in final class)
 // !JVM_DEFAULT_MODE: all-compatibility
 // TARGET_BACKEND: JVM
diff --git a/compiler/testData/codegen/box/jvm8/defaults/nonDefaultInheritance/superCall.kt b/compiler/testData/codegen/box/jvm8/defaults/nonDefaultInheritance/superCall.kt
index 68d8b1e221f..8051e96d2b3 100644
--- a/compiler/testData/codegen/box/jvm8/defaults/nonDefaultInheritance/superCall.kt
+++ b/compiler/testData/codegen/box/jvm8/defaults/nonDefaultInheritance/superCall.kt
@@ -1,7 +1,7 @@
 // CHECK_BYTECODE_LISTING
 // FIR_IDENTICAL
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: NCDFE: Foo$DefaultImpls
 // JVM_TARGET: 1.8
 // WITH_STDLIB
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/annotations.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/annotations.kt
index 3f7969d81f4..def691a9a4c 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/annotations.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/annotations.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: default argument mapping in MPP isn't designed yet
 // TARGET_BACKEND: JVM
 // WITH_STDLIB
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/bothInExpectAndActual.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/bothInExpectAndActual.kt
index a2be2be7b49..3b5dbbd2dcb 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/bothInExpectAndActual.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/bothInExpectAndActual.kt
@@ -1,6 +1,6 @@
 // !LANGUAGE: +MultiPlatformProjects
 // IGNORE_BACKEND: NATIVE
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: default argument mapping in MPP isn't designed yet
 // FILE: common.kt
 
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/bothInExpectAndActual2.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/bothInExpectAndActual2.kt
index 981cbff29ad..bb9df9fb115 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/bothInExpectAndActual2.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/bothInExpectAndActual2.kt
@@ -1,6 +1,6 @@
 // !LANGUAGE: +MultiPlatformProjects
 // IGNORE_BACKEND: NATIVE
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: default argument mapping in MPP isn't designed yet
 // FILE: common.kt
 
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/constructor.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/constructor.kt
index c89fc38fc01..1ec11295e02 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/constructor.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/constructor.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: default argument mapping in MPP isn't designed yet
 // WITH_STDLIB
 // FILE: common.kt
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/delegatedExpectedInterface.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/delegatedExpectedInterface.kt
index 7bccb3b7e38..6ef2e267c30 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/delegatedExpectedInterface.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/delegatedExpectedInterface.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: default argument mapping in MPP isn't designed yet
 // FILE: lib.kt
 
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/dispatchReceiverValue.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/dispatchReceiverValue.kt
index c0a2b6e6912..193b4f02dde 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/dispatchReceiverValue.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/dispatchReceiverValue.kt
@@ -1,7 +1,7 @@
 // IGNORE_BACKEND: WASM
 // IGNORE_BACKEND: JS_IR
 // WASM_MUTE_REASON: EXPECT_DEFAULT_PARAMETERS
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: default argument mapping in MPP isn't designed yet
 // !LANGUAGE: +MultiPlatformProjects
 
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/extensionReceiverValue.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/extensionReceiverValue.kt
index 880034daadf..b315939eba6 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/extensionReceiverValue.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/extensionReceiverValue.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: default argument mapping in MPP isn't designed yet
 // !LANGUAGE: +MultiPlatformProjects
 // FILE: common.kt
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/function.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/function.kt
index a359501c520..1cda0a452b6 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/function.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/function.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: default argument mapping in MPP isn't designed yet
 // WITH_STDLIB
 // FILE: common.kt
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/functionFromOtherModule.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/functionFromOtherModule.kt
index 421c6079ff0..7092d851f90 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/functionFromOtherModule.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/functionFromOtherModule.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: default argument mapping in MPP isn't designed yet
 // WITH_STDLIB
 // MODULE: lib
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedFromCommonClass.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedFromCommonClass.kt
index cda62d40a0d..690d7f908af 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedFromCommonClass.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedFromCommonClass.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: default argument mapping in MPP isn't designed yet
 // WITH_STDLIB
 // FILE: common.kt
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedFromExpectedClass.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedFromExpectedClass.kt
index aa98c000b9b..f35cc687872 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedFromExpectedClass.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedFromExpectedClass.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: default argument mapping in MPP isn't designed yet
 // WITH_STDLIB
 // FILE: common.kt
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedFromExpectedInterface.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedFromExpectedInterface.kt
index 27142c56d57..86cf4f6450a 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedFromExpectedInterface.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedFromExpectedInterface.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: default argument mapping in MPP isn't designed yet
 
 // FILE: lib.kt
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedFromExpectedMethod.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedFromExpectedMethod.kt
index ac1468caf89..fc4b8124b5a 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedFromExpectedMethod.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedFromExpectedMethod.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: default argument mapping in MPP isn't designed yet
 // WITH_STDLIB
 // FILE: common.kt
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedInExpectedDeclarations.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedInExpectedDeclarations.kt
index 0f5b057975f..95eaaca8b69 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedInExpectedDeclarations.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedInExpectedDeclarations.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: default argument mapping in MPP isn't designed yet
 // WITH_STDLIB
 // FILE: common.kt
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedViaAnotherInterfaceIndirectly.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedViaAnotherInterfaceIndirectly.kt
index 5bd73055fe4..7a1bc96ad96 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedViaAnotherInterfaceIndirectly.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedViaAnotherInterfaceIndirectly.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: default argument mapping in MPP isn't designed yet
 
 // FILE: lib.kt
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/inlineFunctionWithDefaultLambda.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/inlineFunctionWithDefaultLambda.kt
index e11aa8a3ea8..18f385827a8 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/inlineFunctionWithDefaultLambda.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/inlineFunctionWithDefaultLambda.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: default argument mapping in MPP isn't designed yet
 // WITH_STDLIB
 // FILE: common.kt
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/jvmOverloads.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/jvmOverloads.kt
index f9c5d63e1f3..1a75982ef56 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/jvmOverloads.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/jvmOverloads.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: default argument mapping in MPP isn't designed yet
 // TARGET_BACKEND: JVM
 // WITH_STDLIB
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/kt23239.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/kt23239.kt
index 0d2a20639aa..d8dfa72f9e8 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/kt23239.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/kt23239.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: default argument mapping in MPP isn't designed yet
 // WITH_STDLIB
 // FILE: common.kt
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/kt23739.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/kt23739.kt
index 3e08626acb3..57dcaacc254 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/kt23739.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/kt23739.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: default argument mapping in MPP isn't designed yet
 // FILE: common.kt
 
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/nestedEnumEntryValue.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/nestedEnumEntryValue.kt
index 98c2463eb44..0d16d7f6d08 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/nestedEnumEntryValue.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/nestedEnumEntryValue.kt
@@ -1,6 +1,6 @@
 // IGNORE_BACKEND: JS_IR, WASM
 //  JS IR & Wasm: https://youtrack.jetbrains.com/issue/KT-51225
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: default argument mapping in MPP isn't designed yet
 // !LANGUAGE: +MultiPlatformProjects
 // MODULE: lib
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/parametersInArgumentValues.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/parametersInArgumentValues.kt
index 5b5f76848f4..55891891ba8 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/parametersInArgumentValues.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/parametersInArgumentValues.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: default argument mapping in MPP isn't designed yet
 
 // FILE: common.kt
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/superCall.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/superCall.kt
index a0fb051470f..1f6ccc86c9f 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/superCall.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/superCall.kt
@@ -1,10 +1,9 @@
 // IGNORE_BACKEND: WASM
 // WASM_MUTE_REASON: EXPECT_DEFAULT_PARAMETERS
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_FIR: JVM_IR
-// FIR status: not supported in JVM
 // IGNORE_BACKEND: NATIVE
 // IGNORE_BACKEND: JVM_IR
+// FIR status: not supported in JVM
 // IGNORE_BACKEND: JVM
 
 // FILE: lib.kt
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/suspend.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/suspend.kt
index 6fd692175ee..4a06ec1e16d 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/suspend.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/suspend.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: default argument mapping in MPP isn't designed yet
 // WITH_STDLIB
 // WITH_COROUTINES
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/withTypeParameter.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/withTypeParameter.kt
index 6f5fdbb10d1..a641a87ebff 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/withTypeParameter.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/withTypeParameter.kt
@@ -1,6 +1,6 @@
 // !LANGUAGE: +MultiPlatformProjects
 // IGNORE_BACKEND: WASM
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: default argument mapping in MPP isn't designed yet
 // WITH_STDLIB
 // MODULE: lib
diff --git a/compiler/testData/codegen/box/multiplatform/expectClassInJvmMultifileFacade.kt b/compiler/testData/codegen/box/multiplatform/expectClassInJvmMultifileFacade.kt
index a26339daee1..d28548ebafb 100644
--- a/compiler/testData/codegen/box/multiplatform/expectClassInJvmMultifileFacade.kt
+++ b/compiler/testData/codegen/box/multiplatform/expectClassInJvmMultifileFacade.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: expect/actual in the same module (ACTUAL_WITHOUT_EXPECT)
 // TARGET_BACKEND: JVM
 // WITH_STDLIB
diff --git a/compiler/testData/codegen/box/multiplatform/expectProperty.kt b/compiler/testData/codegen/box/multiplatform/expectProperty.kt
index a2d1bae3bd6..69f49138455 100644
--- a/compiler/testData/codegen/box/multiplatform/expectProperty.kt
+++ b/compiler/testData/codegen/box/multiplatform/expectProperty.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: expect/actual in the same module (ACTUAL_WITHOUT_EXPECT)
 // !LANGUAGE: +MultiPlatformProjects
 // FILE: common.kt
diff --git a/compiler/testData/codegen/box/multiplatform/noArgActualConstructor.kt b/compiler/testData/codegen/box/multiplatform/noArgActualConstructor.kt
index 63be8dc6c1c..5664193a3d3 100644
--- a/compiler/testData/codegen/box/multiplatform/noArgActualConstructor.kt
+++ b/compiler/testData/codegen/box/multiplatform/noArgActualConstructor.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: expect/actual in the same module (ACTUAL_WITHOUT_EXPECT)
 // TARGET_BACKEND: JVM
 // WITH_STDLIB
diff --git a/compiler/testData/codegen/box/multiplatform/optionalExpectation.kt b/compiler/testData/codegen/box/multiplatform/optionalExpectation.kt
index 750502c5fbe..f8f482c0c38 100644
--- a/compiler/testData/codegen/box/multiplatform/optionalExpectation.kt
+++ b/compiler/testData/codegen/box/multiplatform/optionalExpectation.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: expect/actual in the same module (ACTUAL_WITHOUT_EXPECT)
 // !LANGUAGE: +MultiPlatformProjects
 // !OPT_IN: kotlin.ExperimentalMultiplatform
diff --git a/compiler/testData/codegen/box/polymorphicSignature/varargOfObjects_after.kt b/compiler/testData/codegen/box/polymorphicSignature/varargOfObjects_after.kt
index b34151a042a..fde8ea6edd1 100644
--- a/compiler/testData/codegen/box/polymorphicSignature/varargOfObjects_after.kt
+++ b/compiler/testData/codegen/box/polymorphicSignature/varargOfObjects_after.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: +PolymorphicSignature
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: Fail 9
 // TARGET_BACKEND: JVM
 // FULL_JDK
diff --git a/compiler/testData/codegen/box/properties/genericWithSameName.kt b/compiler/testData/codegen/box/properties/genericWithSameName.kt
index 8bfc683a35f..0d3e8e824b8 100644
--- a/compiler/testData/codegen/box/properties/genericWithSameName.kt
+++ b/compiler/testData/codegen/box/properties/genericWithSameName.kt
@@ -1,5 +1,4 @@
 // IGNORE_BACKEND: JVM, JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
 // FIR status: not supported in JVM
 
 package foo
diff --git a/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/isInitializedMultiFile.kt b/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/isInitializedMultiFile.kt
index 6d2d32ecfb6..29765d67a0b 100644
--- a/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/isInitializedMultiFile.kt
+++ b/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/isInitializedMultiFile.kt
@@ -1,7 +1,7 @@
 // WITH_STDLIB
-
 // On JVM, isInitialized on a property from another file is forbidden because lateinit-ness is not included in the an ABI of a property.
-// IGNORE_BACKEND: JVM, JVM_IR
+// IGNORE_BACKEND_K1: JVM, JVM_IR
+// IGNORE_LIGHT_ANALYSIS
 
 // FILE: A.kt
 
diff --git a/compiler/testData/codegen/box/ranges/forInIndices/kt43159_ArrayUpperBound.kt b/compiler/testData/codegen/box/ranges/forInIndices/kt43159_ArrayUpperBound.kt
index 4c74a5216bb..b0b04cfd408 100644
--- a/compiler/testData/codegen/box/ranges/forInIndices/kt43159_ArrayUpperBound.kt
+++ b/compiler/testData/codegen/box/ranges/forInIndices/kt43159_ArrayUpperBound.kt
@@ -1,6 +1,5 @@
 // WITH_STDLIB
 // IGNORE_BACKEND: JVM, JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
 // FIR status: not supported in JVM
 
 fun <T : IntArray> test(array: T): Int {
diff --git a/compiler/testData/codegen/box/ranges/javaInterop/javaArrayOfInheritedNotNullFailFast.kt b/compiler/testData/codegen/box/ranges/javaInterop/javaArrayOfInheritedNotNullFailFast.kt
index eb1e2d74787..f1adf88a8ba 100644
--- a/compiler/testData/codegen/box/ranges/javaInterop/javaArrayOfInheritedNotNullFailFast.kt
+++ b/compiler/testData/codegen/box/ranges/javaInterop/javaArrayOfInheritedNotNullFailFast.kt
@@ -1,6 +1,6 @@
 // !LANGUAGE: +StrictJavaNullabilityAssertions
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND: JVM, JVM_IR
+// IGNORE_BACKEND_K1: JVM, JVM_IR
 // WITH_STDLIB
 
 // Note: This fails on JVM (non-IR) with "Fail: should throw on get() in loop header". The not-null assertion is not generated when
diff --git a/compiler/testData/codegen/box/ranges/javaInterop/javaCollectionOfExplicitNotNullFailFast.kt b/compiler/testData/codegen/box/ranges/javaInterop/javaCollectionOfExplicitNotNullFailFast.kt
index b823d037248..a0b15654645 100644
--- a/compiler/testData/codegen/box/ranges/javaInterop/javaCollectionOfExplicitNotNullFailFast.kt
+++ b/compiler/testData/codegen/box/ranges/javaInterop/javaCollectionOfExplicitNotNullFailFast.kt
@@ -1,6 +1,6 @@
 // !LANGUAGE: +StrictJavaNullabilityAssertions
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND: JVM, JVM_IR
+// IGNORE_BACKEND_K1: JVM, JVM_IR
 // WITH_STDLIB
 // JVM_TARGET: 1.8
 
diff --git a/compiler/testData/codegen/box/ranges/javaInterop/javaCollectionOfInheritedNotNullFailFast.kt b/compiler/testData/codegen/box/ranges/javaInterop/javaCollectionOfInheritedNotNullFailFast.kt
index 0878ebe85d6..8dfa9823752 100644
--- a/compiler/testData/codegen/box/ranges/javaInterop/javaCollectionOfInheritedNotNullFailFast.kt
+++ b/compiler/testData/codegen/box/ranges/javaInterop/javaCollectionOfInheritedNotNullFailFast.kt
@@ -1,6 +1,6 @@
 // !LANGUAGE: +StrictJavaNullabilityAssertions
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND: JVM, JVM_IR
+// IGNORE_BACKEND_K1: JVM, JVM_IR
 // WITH_STDLIB
 
 // Note: This fails on JVM (non-IR) with "Fail: should throw on get() in loop header". The not-null assertion is not generated when
diff --git a/compiler/testData/codegen/box/ranges/javaInterop/javaCollectionOfNotNullToTypedArrayFailFast.kt b/compiler/testData/codegen/box/ranges/javaInterop/javaCollectionOfNotNullToTypedArrayFailFast.kt
index ae9ccd6c724..750f8658d4a 100644
--- a/compiler/testData/codegen/box/ranges/javaInterop/javaCollectionOfNotNullToTypedArrayFailFast.kt
+++ b/compiler/testData/codegen/box/ranges/javaInterop/javaCollectionOfNotNullToTypedArrayFailFast.kt
@@ -1,6 +1,6 @@
 // !LANGUAGE: +StrictJavaNullabilityAssertions
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND: JVM, JVM_IR
+// IGNORE_BACKEND_K1: JVM, JVM_IR
 // WITH_STDLIB
 // JVM_TARGET: 1.8
 
diff --git a/compiler/testData/codegen/box/ranges/javaInterop/javaIteratorOfNotNullFailFast.kt b/compiler/testData/codegen/box/ranges/javaInterop/javaIteratorOfNotNullFailFast.kt
index 67e86e24d07..68bd515b8e3 100644
--- a/compiler/testData/codegen/box/ranges/javaInterop/javaIteratorOfNotNullFailFast.kt
+++ b/compiler/testData/codegen/box/ranges/javaInterop/javaIteratorOfNotNullFailFast.kt
@@ -1,6 +1,6 @@
 // !LANGUAGE: +StrictJavaNullabilityAssertions
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND: JVM, JVM_IR
+// IGNORE_BACKEND_K1: JVM, JVM_IR
 // WITH_STDLIB
 // JVM_TARGET: 1.8
 
diff --git a/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaArrayOfInheritedNotNullWithIndexFailFast.kt b/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaArrayOfInheritedNotNullWithIndexFailFast.kt
index 180ea91f801..16a1c0336da 100644
--- a/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaArrayOfInheritedNotNullWithIndexFailFast.kt
+++ b/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaArrayOfInheritedNotNullWithIndexFailFast.kt
@@ -1,6 +1,6 @@
 // !LANGUAGE: +StrictJavaNullabilityAssertions
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND: JVM, JVM_IR
+// IGNORE_BACKEND_K1: JVM, JVM_IR
 // WITH_STDLIB
 
 // Note: This fails on JVM (non-IR) with "Fail: should throw on get()". The not-null assertion is not generated when assigning to the
diff --git a/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaArrayOfMaybeNullableWithIndexWithNotNullLoopVariableFailFast.kt b/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaArrayOfMaybeNullableWithIndexWithNotNullLoopVariableFailFast.kt
index de7f56afc60..afd9e0d5c6b 100644
--- a/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaArrayOfMaybeNullableWithIndexWithNotNullLoopVariableFailFast.kt
+++ b/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaArrayOfMaybeNullableWithIndexWithNotNullLoopVariableFailFast.kt
@@ -1,7 +1,6 @@
 // !LANGUAGE: +StrictJavaNullabilityAssertions
 // TARGET_BACKEND: JVM
 // IGNORE_BACKEND: JVM, JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
 // FIR status: not supported in JVM
 // WITH_STDLIB
 
diff --git a/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaCollectionOfExplicitNotNullWithIndexFailFast.kt b/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaCollectionOfExplicitNotNullWithIndexFailFast.kt
index f71cf4653c7..81d26e3a68b 100644
--- a/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaCollectionOfExplicitNotNullWithIndexFailFast.kt
+++ b/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaCollectionOfExplicitNotNullWithIndexFailFast.kt
@@ -1,6 +1,6 @@
 // !LANGUAGE: +StrictJavaNullabilityAssertions
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND: JVM, JVM_IR
+// IGNORE_BACKEND_K1: JVM, JVM_IR
 // WITH_STDLIB
 // JVM_TARGET: 1.8
 
diff --git a/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaCollectionOfMaybeNullableWithIndexWithNotNullLoopVariableFailFast.kt b/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaCollectionOfMaybeNullableWithIndexWithNotNullLoopVariableFailFast.kt
index 0cc50f5e3d3..adda589656b 100644
--- a/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaCollectionOfMaybeNullableWithIndexWithNotNullLoopVariableFailFast.kt
+++ b/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaCollectionOfMaybeNullableWithIndexWithNotNullLoopVariableFailFast.kt
@@ -1,7 +1,6 @@
 // !LANGUAGE: +StrictJavaNullabilityAssertions
 // TARGET_BACKEND: JVM
 // IGNORE_BACKEND: JVM, JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
 // FIR status: not supported in JVM
 // WITH_STDLIB
 
diff --git a/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaIteratorOfNotNullWithIndexFailFast.kt b/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaIteratorOfNotNullWithIndexFailFast.kt
index b8be79ac157..e5e4cd9287f 100644
--- a/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaIteratorOfNotNullWithIndexFailFast.kt
+++ b/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaIteratorOfNotNullWithIndexFailFast.kt
@@ -1,6 +1,6 @@
 // !LANGUAGE: +StrictJavaNullabilityAssertions
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND: JVM, JVM_IR
+// IGNORE_BACKEND_K1: JVM, JVM_IR
 // WITH_STDLIB
 // JVM_TARGET: 1.8
 
diff --git a/compiler/testData/codegen/box/reflection/classes/nestedClassesInScript.kt b/compiler/testData/codegen/box/reflection/classes/nestedClassesInScript.kt
index 9f1439a4a76..344fc96f19d 100644
--- a/compiler/testData/codegen/box/reflection/classes/nestedClassesInScript.kt
+++ b/compiler/testData/codegen/box/reflection/classes/nestedClassesInScript.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: scripts aren't supported yet
 // IGNORE_LIGHT_ANALYSIS
 // WITH_STDLIB
diff --git a/compiler/testData/codegen/box/reflection/typeOf/flexibleTypes_after.kt b/compiler/testData/codegen/box/reflection/typeOf/flexibleTypes_after.kt
index 9e2dc78f049..7969a29fa72 100644
--- a/compiler/testData/codegen/box/reflection/typeOf/flexibleTypes_after.kt
+++ b/compiler/testData/codegen/box/reflection/typeOf/flexibleTypes_after.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: Fail 2: kotlin.collections.List<kotlin.String!>
 // WITH_REFLECT
 // FILE: box.kt
diff --git a/compiler/testData/codegen/box/reflection/typeOf/rawTypes_after.kt b/compiler/testData/codegen/box/reflection/typeOf/rawTypes_after.kt
index 962dd66f84e..a49f948d9e4 100644
--- a/compiler/testData/codegen/box/reflection/typeOf/rawTypes_after.kt
+++ b/compiler/testData/codegen/box/reflection/typeOf/rawTypes_after.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: Fail 3: (kotlin.collections.MutableList<kotlin.Any?>..kotlin.collections.MutableList<*>?)
 // WITH_REFLECT
 // FILE: box.kt
diff --git a/compiler/testData/codegen/box/safeCall/augmentedAssigmentPlus.kt b/compiler/testData/codegen/box/safeCall/augmentedAssigmentPlus.kt
index 66576145de8..91741281197 100644
--- a/compiler/testData/codegen/box/safeCall/augmentedAssigmentPlus.kt
+++ b/compiler/testData/codegen/box/safeCall/augmentedAssigmentPlus.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM_IR
-// IGNORE_BACKEND: JVM_IR
+// IGNORE_BACKEND_K1: JVM_IR
 
 var cnt = 0
 
diff --git a/compiler/testData/codegen/box/safeCall/augmentedAssigmentPlusAssign.kt b/compiler/testData/codegen/box/safeCall/augmentedAssigmentPlusAssign.kt
index 724b99957b7..1dc6fd15dc6 100644
--- a/compiler/testData/codegen/box/safeCall/augmentedAssigmentPlusAssign.kt
+++ b/compiler/testData/codegen/box/safeCall/augmentedAssigmentPlusAssign.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM_IR
-// IGNORE_BACKEND: JVM_IR
+// IGNORE_BACKEND_K1: JVM_IR
 
 var cnt = 0
 
diff --git a/compiler/testData/codegen/box/safeCall/incrementPostfix.kt b/compiler/testData/codegen/box/safeCall/incrementPostfix.kt
index 09bc64655e9..ed275dd1ed4 100644
--- a/compiler/testData/codegen/box/safeCall/incrementPostfix.kt
+++ b/compiler/testData/codegen/box/safeCall/incrementPostfix.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM_IR
-// IGNORE_BACKEND: JVM_IR
+// IGNORE_BACKEND_K1: JVM_IR
 
 var cnt = 0
 
diff --git a/compiler/testData/codegen/box/safeCall/incrementPrefix.kt b/compiler/testData/codegen/box/safeCall/incrementPrefix.kt
index 9d04653017e..9957d7e2b07 100644
--- a/compiler/testData/codegen/box/safeCall/incrementPrefix.kt
+++ b/compiler/testData/codegen/box/safeCall/incrementPrefix.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM_IR
-// IGNORE_BACKEND: JVM_IR
+// IGNORE_BACKEND_K1: JVM_IR
 
 var cnt = 0
 
diff --git a/compiler/testData/codegen/box/safeCall/withAssignment.kt b/compiler/testData/codegen/box/safeCall/withAssignment.kt
index fcb18ef7245..14389648c07 100644
--- a/compiler/testData/codegen/box/safeCall/withAssignment.kt
+++ b/compiler/testData/codegen/box/safeCall/withAssignment.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM_IR
-// IGNORE_BACKEND: JVM_IR
+// IGNORE_BACKEND_K1: JVM_IR
 
 var cnt = 0
 
diff --git a/compiler/testData/codegen/box/sam/adapters/operators/legacyModOperator.kt b/compiler/testData/codegen/box/sam/adapters/operators/legacyModOperator.kt
index 4b7e4431401..766450fa6d3 100644
--- a/compiler/testData/codegen/box/sam/adapters/operators/legacyModOperator.kt
+++ b/compiler/testData/codegen/box/sam/adapters/operators/legacyModOperator.kt
@@ -1,6 +1,6 @@
 // TARGET_BACKEND: JVM
 // !LANGUAGE: -ProhibitOperatorMod
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: don't support legacy feature
 // MODULE: lib
 // FILE: Java.java
diff --git a/compiler/testData/codegen/box/sam/arrayAsVarargAfterSamArgument.kt b/compiler/testData/codegen/box/sam/arrayAsVarargAfterSamArgument.kt
index 4b6051efdbe..2d0c0ab2afe 100644
--- a/compiler/testData/codegen/box/sam/arrayAsVarargAfterSamArgument.kt
+++ b/compiler/testData/codegen/box/sam/arrayAsVarargAfterSamArgument.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: -ProhibitVarargAsArrayAfterSamArgument
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: don't support legacy feature
 // TARGET_BACKEND: JVM
 
diff --git a/compiler/testData/codegen/box/sameFileInSourceAndDependencies/differingNumberOfGenericTypeParameters.kt b/compiler/testData/codegen/box/sameFileInSourceAndDependencies/differingNumberOfGenericTypeParameters.kt
index 4c8a4e954ba..1a9258cab3e 100644
--- a/compiler/testData/codegen/box/sameFileInSourceAndDependencies/differingNumberOfGenericTypeParameters.kt
+++ b/compiler/testData/codegen/box/sameFileInSourceAndDependencies/differingNumberOfGenericTypeParameters.kt
@@ -1,5 +1,5 @@
 // IGNORE_BACKEND: NATIVE, JS_IR, WASM
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // MODULE: lib
 // FILE: 1.kt
 interface B<X>
diff --git a/compiler/testData/codegen/box/script/classReference.kt b/compiler/testData/codegen/box/script/classReference.kt
index ed0a4eea058..d90781b3d6c 100644
--- a/compiler/testData/codegen/box/script/classReference.kt
+++ b/compiler/testData/codegen/box/script/classReference.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: scripts aren't supported yet
 // IGNORE_LIGHT_ANALYSIS
 // WITH_STDLIB
diff --git a/compiler/testData/codegen/box/script/localCaptureTests.kt b/compiler/testData/codegen/box/script/localCaptureTests.kt
index 286b97acbb8..5788622f99a 100644
--- a/compiler/testData/codegen/box/script/localCaptureTests.kt
+++ b/compiler/testData/codegen/box/script/localCaptureTests.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: scripts aren't supported yet
 // IGNORE_LIGHT_ANALYSIS
 // WITH_STDLIB
diff --git a/compiler/testData/codegen/box/script/scripInstance.kt b/compiler/testData/codegen/box/script/scripInstance.kt
index 58a9a6a6bf1..1e85bec3999 100644
--- a/compiler/testData/codegen/box/script/scripInstance.kt
+++ b/compiler/testData/codegen/box/script/scripInstance.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: scripts aren't supported yet
 // IGNORE_LIGHT_ANALYSIS
 // WITH_STDLIB
diff --git a/compiler/testData/codegen/box/script/scriptNestedClassInstance.kt b/compiler/testData/codegen/box/script/scriptNestedClassInstance.kt
index 77e4c6017b4..eee189c3d46 100644
--- a/compiler/testData/codegen/box/script/scriptNestedClassInstance.kt
+++ b/compiler/testData/codegen/box/script/scriptNestedClassInstance.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: scripts aren't supported yet
 // IGNORE_LIGHT_ANALYSIS
 // WITH_STDLIB
diff --git a/compiler/testData/codegen/box/secondaryConstructors/fieldInitializerOptimization_inlineClass.kt b/compiler/testData/codegen/box/secondaryConstructors/fieldInitializerOptimization_inlineClass.kt
index 52dce657947..e12a0a6dd11 100644
--- a/compiler/testData/codegen/box/secondaryConstructors/fieldInitializerOptimization_inlineClass.kt
+++ b/compiler/testData/codegen/box/secondaryConstructors/fieldInitializerOptimization_inlineClass.kt
@@ -6,7 +6,6 @@
 // IGNORE_BACKEND: JS_IR_ES6
 // IGNORE_BACKEND: JVM
 // IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
 // FIR status: not supported in JVM
 
 open class Base {
diff --git a/compiler/testData/codegen/box/smartCasts/resolveToMemberOfSuperclass_overrideWithDifferentType.kt b/compiler/testData/codegen/box/smartCasts/resolveToMemberOfSuperclass_overrideWithDifferentType.kt
index ec592a08cd7..86b6d3af7a4 100644
--- a/compiler/testData/codegen/box/smartCasts/resolveToMemberOfSuperclass_overrideWithDifferentType.kt
+++ b/compiler/testData/codegen/box/smartCasts/resolveToMemberOfSuperclass_overrideWithDifferentType.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM_IR
-// IGNORE_BACKEND: JVM_IR
+// IGNORE_BACKEND_K1: JVM_IR
 // ISSUE: KT-51460, KT-51827
 
 open class Base {
diff --git a/compiler/testData/codegen/box/typealias/kt45308.kt b/compiler/testData/codegen/box/typealias/kt45308.kt
index 422f5b2ec61..1503596941a 100644
--- a/compiler/testData/codegen/box/typealias/kt45308.kt
+++ b/compiler/testData/codegen/box/typealias/kt45308.kt
@@ -1,7 +1,7 @@
 // This test checks that unresolved typealias in an abbreviated type does not crash the compiler or result in a compilation error.
 // Apparently, there's some demand for this behavior, see KT-45308.
 
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: reports RETURN_TYPE_MISMATCH: Return type mismatch: expected kotlin/String, actual a/A
 
 // MODULE: a
diff --git a/compiler/testData/codegen/box/unaryOp/call.kt b/compiler/testData/codegen/box/unaryOp/call.kt
index 54184883ba6..d58b72968e7 100644
--- a/compiler/testData/codegen/box/unaryOp/call.kt
+++ b/compiler/testData/codegen/box/unaryOp/call.kt
@@ -1,5 +1,5 @@
 // LANGUAGE: -ApproximateIntegerLiteralTypesInReceiverPosition
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: don't support legacy feature; for reasons this test is ignored, go to KT-46419
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/unaryOp/callNullable.kt b/compiler/testData/codegen/box/unaryOp/callNullable.kt
index 46edced2f89..8411e7210f0 100644
--- a/compiler/testData/codegen/box/unaryOp/callNullable.kt
+++ b/compiler/testData/codegen/box/unaryOp/callNullable.kt
@@ -1,5 +1,5 @@
 // LANGUAGE: -ApproximateIntegerLiteralTypesInReceiverPosition
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: don't support legacy feature; for reasons this test is ignored, go to KT-46419
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/valueClasses/classFlattening.kt b/compiler/testData/codegen/box/valueClasses/classFlattening.kt
index 614a9fdcdae..8ba2abd774f 100644
--- a/compiler/testData/codegen/box/valueClasses/classFlattening.kt
+++ b/compiler/testData/codegen/box/valueClasses/classFlattening.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
 // WORKS_WHEN_VALUE_CLASS
diff --git a/compiler/testData/codegen/box/valueClasses/complex.kt b/compiler/testData/codegen/box/valueClasses/complex.kt
index dfa495c948d..3aa854b7877 100644
--- a/compiler/testData/codegen/box/valueClasses/complex.kt
+++ b/compiler/testData/codegen/box/valueClasses/complex.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // https://youtrack.jetbrains.com/issue/KT-52236/Different-modality-in-psi-and-fir
 // CHECK_BYTECODE_LISTING
 // FIR_IDENTICAL
diff --git a/compiler/testData/codegen/box/valueClasses/equality.kt b/compiler/testData/codegen/box/valueClasses/equality.kt
index 62a3849a871..1583894eee7 100644
--- a/compiler/testData/codegen/box/valueClasses/equality.kt
+++ b/compiler/testData/codegen/box/valueClasses/equality.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // https://youtrack.jetbrains.com/issue/KT-52236/Different-modality-in-psi-and-fir
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
diff --git a/compiler/testData/codegen/box/valueClasses/overrides.kt b/compiler/testData/codegen/box/valueClasses/overrides.kt
index 901462b7b42..37eca660580 100644
--- a/compiler/testData/codegen/box/valueClasses/overrides.kt
+++ b/compiler/testData/codegen/box/valueClasses/overrides.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // https://youtrack.jetbrains.com/issue/KT-52236/Different-modality-in-psi-and-fir
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
diff --git a/compiler/testData/codegen/box/valueClasses/overrides_inlineClass.kt b/compiler/testData/codegen/box/valueClasses/overrides_inlineClass.kt
index 9abe0346f15..aba32f675e0 100644
--- a/compiler/testData/codegen/box/valueClasses/overrides_inlineClass.kt
+++ b/compiler/testData/codegen/box/valueClasses/overrides_inlineClass.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // https://youtrack.jetbrains.com/issue/KT-52236/Different-modality-in-psi-and-fir
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
diff --git a/compiler/testData/codegen/box/valueClasses/overrides_typeParameters.kt b/compiler/testData/codegen/box/valueClasses/overrides_typeParameters.kt
index 58e5e0285fc..97ce2a2540b 100644
--- a/compiler/testData/codegen/box/valueClasses/overrides_typeParameters.kt
+++ b/compiler/testData/codegen/box/valueClasses/overrides_typeParameters.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // https://youtrack.jetbrains.com/issue/KT-52236/Different-modality-in-psi-and-fir
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
diff --git a/compiler/testData/codegen/box/vararg/singleAssignmentToVarargsInFunction.kt b/compiler/testData/codegen/box/vararg/singleAssignmentToVarargsInFunction.kt
index ef1554c97a8..e3323becaf8 100644
--- a/compiler/testData/codegen/box/vararg/singleAssignmentToVarargsInFunction.kt
+++ b/compiler/testData/codegen/box/vararg/singleAssignmentToVarargsInFunction.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // !LANGUAGE: -ProhibitAssigningSingleElementsToVarargsInNamedForm -AllowAssigningArrayElementsToVarargsInNamedFormForFunctions
 // FIR status: don't support legacy feature
 
diff --git a/compiler/testData/codegen/box/when/exhaustiveBoolean.kt b/compiler/testData/codegen/box/when/exhaustiveBoolean.kt
index e1d6d67ef78..f117da7a70f 100644
--- a/compiler/testData/codegen/box/when/exhaustiveBoolean.kt
+++ b/compiler/testData/codegen/box/when/exhaustiveBoolean.kt
@@ -1,5 +1,5 @@
 // LANGUAGE: -ProhibitSimplificationOfNonTrivialConstBooleanExpressions
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR status: don't support legacy feature
 fun box() : String = when (true) {
     ((true)) -> "OK"
diff --git a/compiler/testData/codegen/boxInline/anonymousObject/kt30696.kt b/compiler/testData/codegen/boxInline/anonymousObject/kt30696.kt
index dfaddf22270..c27fd29a4d6 100644
--- a/compiler/testData/codegen/boxInline/anonymousObject/kt30696.kt
+++ b/compiler/testData/codegen/boxInline/anonymousObject/kt30696.kt
@@ -2,9 +2,8 @@
 // NO_CHECK_LAMBDA_INLINING
 // WITH_STDLIB
 // IGNORE_BACKEND: JVM, JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND_MULTI_MODULE: JVM, JVM_IR, JVM_MULTI_MODULE_OLD_AGAINST_IR, JVM_MULTI_MODULE_IR_AGAINST_OLD
-// IGNORE_BACKEND_FIR_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
+// IGNORE_BACKEND_K2_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
 // FILE: 1.kt
 
 interface Flow<T> {
diff --git a/compiler/testData/codegen/boxInline/anonymousObject/withInlineMethod.kt b/compiler/testData/codegen/boxInline/anonymousObject/withInlineMethod.kt
index c6e7f4ea4de..2573c9a74ed 100644
--- a/compiler/testData/codegen/boxInline/anonymousObject/withInlineMethod.kt
+++ b/compiler/testData/codegen/boxInline/anonymousObject/withInlineMethod.kt
@@ -1,7 +1,6 @@
 // IGNORE_BACKEND: JVM, JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND_MULTI_MODULE: JVM, JVM_IR, JVM_MULTI_MODULE_OLD_AGAINST_IR, JVM_MULTI_MODULE_IR_AGAINST_OLD
-// IGNORE_BACKEND_FIR_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
+// IGNORE_BACKEND_K2_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
 // FILE: 1.kt
 package test
 
diff --git a/compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVararg.kt b/compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVararg.kt
index f0069652ca5..c89929297e6 100644
--- a/compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVararg.kt
+++ b/compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVararg.kt
@@ -1,8 +1,8 @@
 // WITH_STDLIB
 // !LANGUAGE: -UseCorrectExecutionOrderForVarargArguments
 // IGNORE_BACKEND: JS
-// IGNORE_BACKEND_FIR: JVM_IR
-// IGNORE_BACKEND_FIR_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
+// IGNORE_BACKEND_K2: JVM_IR
+// IGNORE_BACKEND_K2_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
 // NO_CHECK_LAMBDA_INLINING
 // KJS_WITH_FULL_RUNTIME
 // FILE: 1.kt
diff --git a/compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt b/compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt
index 8e88a3fe650..150a0005ec3 100644
--- a/compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt
+++ b/compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt
@@ -6,8 +6,7 @@
 // IGNORE_BACKEND: JS, JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // IGNORE_BACKEND_MULTI_MODULE: JVM_IR, JVM_MULTI_MODULE_IR_AGAINST_OLD
-// IGNORE_BACKEND_FIR: JVM_IR
-// IGNORE_BACKEND_FIR_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
+// IGNORE_BACKEND_K2_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
 // NO_CHECK_LAMBDA_INLINING
 // KJS_WITH_FULL_RUNTIME
 // FILE: 1.kt
diff --git a/compiler/testData/codegen/boxInline/multiplatform/defaultArguments/receiversAndParametersInLambda.kt b/compiler/testData/codegen/boxInline/multiplatform/defaultArguments/receiversAndParametersInLambda.kt
index 68ca44c05a9..f3b426017ab 100644
--- a/compiler/testData/codegen/boxInline/multiplatform/defaultArguments/receiversAndParametersInLambda.kt
+++ b/compiler/testData/codegen/boxInline/multiplatform/defaultArguments/receiversAndParametersInLambda.kt
@@ -1,7 +1,7 @@
 // !LANGUAGE: +MultiPlatformProjects
 // IGNORE_BACKEND: WASM
-// IGNORE_BACKEND_FIR: JVM_IR
-// IGNORE_BACKEND_FIR_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
+// IGNORE_BACKEND_K2: JVM_IR
+// IGNORE_BACKEND_K2_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
 // NO_CHECK_LAMBDA_INLINING
 // TODO: replace all references on expected declarations and their members to actuals,
 //  otherwise DCE keeps members of expect D referenced from lambdas in default arguments instead of members of actual D
diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/kt9304.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/kt9304.kt
index 07e82acb8ab..94aae721805 100644
--- a/compiler/testData/codegen/boxInline/nonLocalReturns/kt9304.kt
+++ b/compiler/testData/codegen/boxInline/nonLocalReturns/kt9304.kt
@@ -1,7 +1,7 @@
 // IGNORE_BACKEND: JVM
 // IGNORE_BACKEND_MULTI_MODULE: JVM, JVM_MULTI_MODULE_OLD_AGAINST_IR
-// IGNORE_BACKEND_FIR: JVM_IR
-// IGNORE_BACKEND_FIR_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
+// IGNORE_BACKEND_K2: JVM_IR
+// IGNORE_BACKEND_K2_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
 // NO_CHECK_LAMBDA_INLINING
 // FILE: 1.kt
 
diff --git a/compiler/testData/codegen/boxInline/property/augAssignmentAndIncOnExtension.kt b/compiler/testData/codegen/boxInline/property/augAssignmentAndIncOnExtension.kt
index ad010098a1f..5512f7d0776 100644
--- a/compiler/testData/codegen/boxInline/property/augAssignmentAndIncOnExtension.kt
+++ b/compiler/testData/codegen/boxInline/property/augAssignmentAndIncOnExtension.kt
@@ -1,5 +1,5 @@
-// IGNORE_BACKEND_FIR: JVM_IR
-// IGNORE_BACKEND_FIR_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
+// IGNORE_BACKEND_K2: JVM_IR
+// IGNORE_BACKEND_K2_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
 // FILE: 1.kt
 package test
 
diff --git a/compiler/testData/codegen/boxInline/property/augAssignmentAndIncOnExtensionInClass.kt b/compiler/testData/codegen/boxInline/property/augAssignmentAndIncOnExtensionInClass.kt
index 75d19563b48..679fc897c96 100644
--- a/compiler/testData/codegen/boxInline/property/augAssignmentAndIncOnExtensionInClass.kt
+++ b/compiler/testData/codegen/boxInline/property/augAssignmentAndIncOnExtensionInClass.kt
@@ -1,5 +1,5 @@
-// IGNORE_BACKEND_FIR: JVM_IR
-// IGNORE_BACKEND_FIR_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
+// IGNORE_BACKEND_K2: JVM_IR
+// IGNORE_BACKEND_K2_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
 // FILE: 1.kt
 package test
 
diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.kt b/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.kt
index b55d01bc196..503f9f2c4de 100644
--- a/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.kt
+++ b/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.kt
@@ -1,8 +1,7 @@
 // IGNORE_BACKEND_MULTI_MODULE: JVM_IR, JVM_MULTI_MODULE_IR_AGAINST_OLD
 // NO_CHECK_LAMBDA_INLINING
 // IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
-// IGNORE_BACKEND_FIR_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
+// IGNORE_BACKEND_K2_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
 // FILE: 1.kt
 package builders
 inline fun call(crossinline init: () -> Unit) {
diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.smap b/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.smap
index a52d220134e..cb3869e00a4 100644
--- a/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.smap
+++ b/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.smap
@@ -11,20 +11,20 @@ _2Kt
 + 2 1.kt
 builders/_1Kt
 *L
-1#1,33:1
-18#1,3:35
-21#1,6:39
-9#2:34
-9#2:38
+1#1,32:1
+17#1,3:34
+20#1,6:38
+8#2:33
+8#2:37
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-31#1:35,3
-31#1:39,6
-20#1:34
-31#1:38
+30#1:34,3
+30#1:38,6
+19#1:33
+30#1:37
 *E
 
 SMAP
@@ -35,7 +35,7 @@ Kotlin
 + 1 2.kt
 _2Kt$test$1$1
 *L
-1#1,33:1
+1#1,32:1
 *E
 
 SMAP
@@ -46,6 +46,6 @@ Kotlin
 + 1 2.kt
 _2Kt$test$1$1
 *L
-1#1,33:1
+1#1,32:1
 *E
 
diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.kt b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.kt
index d2e7c88ee30..9d276c9c78e 100644
--- a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.kt
+++ b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.kt
@@ -1,7 +1,6 @@
 // IGNORE_BACKEND_MULTI_MODULE: JVM_IR, JVM_MULTI_MODULE_IR_AGAINST_OLD
 // IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
-// IGNORE_BACKEND_FIR_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
+// IGNORE_BACKEND_K2_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
 // NO_CHECK_LAMBDA_INLINING
 // FILE: 1.kt
 package builders
diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.smap b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.smap
index 790df1ecabd..d123ab534ff 100644
--- a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.smap
+++ b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.smap
@@ -11,20 +11,20 @@ _2Kt
 + 2 1.kt
 builders/_1Kt
 *L
-1#1,35:1
-18#1,3:37
-21#1,8:41
-9#2:36
-9#2:40
+1#1,34:1
+17#1,3:36
+20#1,8:40
+8#2:35
+8#2:39
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-33#1:37,3
-33#1:41,8
-20#1:36
-33#1:40
+32#1:36,3
+32#1:40,8
+19#1:35
+32#1:39
 *E
 
 SMAP
@@ -35,7 +35,7 @@ Kotlin
 + 1 2.kt
 _2Kt$test$1$1
 *L
-1#1,35:1
+1#1,34:1
 *E
 
 SMAP
@@ -46,6 +46,6 @@ Kotlin
 + 1 2.kt
 _2Kt$test$1$1
 *L
-1#1,35:1
+1#1,34:1
 *E
 
diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite2.kt b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite2.kt
index d08cce83998..797663d4f41 100644
--- a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite2.kt
+++ b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite2.kt
@@ -1,7 +1,7 @@
 // IGNORE
 // NO_CHECK_LAMBDA_INLINING
 // IGNORE_BACKEND_MULTI_MODULE: JVM, JVM_IR, JVM_MULTI_MODULE_OLD_AGAINST_IR, JVM_MULTI_MODULE_IR_AGAINST_OLD
-// IGNORE_BACKEND_FIR_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
+// IGNORE_BACKEND_K2_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
 // FILE: 1.kt
 // NO_SMAP_DUMP
 
diff --git a/compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultInlineLambda.kt b/compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultInlineLambda.kt
index 5282ed87636..17fa8855f5d 100644
--- a/compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultInlineLambda.kt
+++ b/compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultInlineLambda.kt
@@ -2,9 +2,8 @@
 // WITH_STDLIB
 // WITH_COROUTINES
 // IGNORE_BACKEND: JVM, JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND_MULTI_MODULE: JVM, JVM_IR, JVM_MULTI_MODULE_OLD_AGAINST_IR, JVM_MULTI_MODULE_IR_AGAINST_OLD
-// IGNORE_BACKEND_FIR_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
+// IGNORE_BACKEND_K2_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
 // FILE: 1.kt
 package test
 
diff --git a/compiler/testData/codegen/boxInline/syntheticAccessors/superCall.kt b/compiler/testData/codegen/boxInline/syntheticAccessors/superCall.kt
index bde5425aafd..17e47feaf26 100644
--- a/compiler/testData/codegen/boxInline/syntheticAccessors/superCall.kt
+++ b/compiler/testData/codegen/boxInline/syntheticAccessors/superCall.kt
@@ -1,5 +1,5 @@
-// IGNORE_BACKEND_FIR: JVM_IR
-// IGNORE_BACKEND_FIR_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
+// IGNORE_BACKEND_K2: JVM_IR
+// IGNORE_BACKEND_K2_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
 // !LANGUAGE: -ProhibitSuperCallsFromPublicInline
 // FILE: 1.kt
 
diff --git a/compiler/testData/codegen/boxInline/syntheticAccessors/superCallFromMultipleSubclasses.kt b/compiler/testData/codegen/boxInline/syntheticAccessors/superCallFromMultipleSubclasses.kt
index 98f0e3f9afd..80d2274852e 100644
--- a/compiler/testData/codegen/boxInline/syntheticAccessors/superCallFromMultipleSubclasses.kt
+++ b/compiler/testData/codegen/boxInline/syntheticAccessors/superCallFromMultipleSubclasses.kt
@@ -1,5 +1,5 @@
-// IGNORE_BACKEND_FIR: JVM_IR
-// IGNORE_BACKEND_FIR_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
+// IGNORE_BACKEND_K2: JVM_IR
+// IGNORE_BACKEND_K2_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
 // !LANGUAGE: -ProhibitSuperCallsFromPublicInline
 // FILE: 1.kt
 
diff --git a/compiler/testData/codegen/boxInline/syntheticAccessors/superProperty.kt b/compiler/testData/codegen/boxInline/syntheticAccessors/superProperty.kt
index d2bda02d132..c49a5421030 100644
--- a/compiler/testData/codegen/boxInline/syntheticAccessors/superProperty.kt
+++ b/compiler/testData/codegen/boxInline/syntheticAccessors/superProperty.kt
@@ -1,5 +1,5 @@
-// IGNORE_BACKEND_FIR: JVM_IR
-// IGNORE_BACKEND_FIR_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
+// IGNORE_BACKEND_K2: JVM_IR
+// IGNORE_BACKEND_K2_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
 // !LANGUAGE: -ProhibitSuperCallsFromPublicInline
 // FILE: 1.kt
 
diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava11/kt36984.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava11/kt36984.kt
index 88fd94c65ee..dc68041de20 100644
--- a/compiler/testData/codegen/boxModernJdk/testsWithJava11/kt36984.kt
+++ b/compiler/testData/codegen/boxModernJdk/testsWithJava11/kt36984.kt
@@ -1,7 +1,6 @@
 // TARGET_BACKEND: JVM
 // IGNORE_BACKEND: JVM_IR
 //  ^ JVM_IR back-end generates SAM conversion with invokedynamic
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_STDLIB
 
 fun box(): String {
diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/kt44233.kt b/compiler/testData/codegen/bytecodeListing/collectionStubs/kt44233.kt
index 4772276359a..ee8d1c784f9 100644
--- a/compiler/testData/codegen/bytecodeListing/collectionStubs/kt44233.kt
+++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/kt44233.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FULL_JDK
 
 import java.util.concurrent.*
diff --git a/compiler/testData/codegen/bytecodeListing/contextReceivers/class.kt b/compiler/testData/codegen/bytecodeListing/contextReceivers/class.kt
index 16e5ee0ff75..55b8f853ce3 100644
--- a/compiler/testData/codegen/bytecodeListing/contextReceivers/class.kt
+++ b/compiler/testData/codegen/bytecodeListing/contextReceivers/class.kt
@@ -1,6 +1,6 @@
 // !LANGUAGE: +ContextReceivers
 // TARGET_BACKEND: JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // IGNORE_BACKEND: JVM
 
 class Outer {
diff --git a/compiler/testData/codegen/bytecodeListing/contextReceivers/fromKEEP/canvas.kt b/compiler/testData/codegen/bytecodeListing/contextReceivers/fromKEEP/canvas.kt
index 9a477643290..8ff4525fff6 100644
--- a/compiler/testData/codegen/bytecodeListing/contextReceivers/fromKEEP/canvas.kt
+++ b/compiler/testData/codegen/bytecodeListing/contextReceivers/fromKEEP/canvas.kt
@@ -1,6 +1,6 @@
 // !LANGUAGE: +ContextReceivers
 // TARGET_BACKEND: JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // IGNORE_BACKEND: JVM
 
 interface Canvas {
diff --git a/compiler/testData/codegen/bytecodeListing/contextReceivers/fromKEEP/compareTo.kt b/compiler/testData/codegen/bytecodeListing/contextReceivers/fromKEEP/compareTo.kt
index b788972fc3d..c96e0494573 100644
--- a/compiler/testData/codegen/bytecodeListing/contextReceivers/fromKEEP/compareTo.kt
+++ b/compiler/testData/codegen/bytecodeListing/contextReceivers/fromKEEP/compareTo.kt
@@ -1,6 +1,6 @@
 // !LANGUAGE: +ContextReceivers
 // TARGET_BACKEND: JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // IGNORE_BACKEND: JVM
 
 data class Pair<A, B>(val first: A, val second: B)
diff --git a/compiler/testData/codegen/bytecodeListing/contextReceivers/fromKEEP/dp.kt b/compiler/testData/codegen/bytecodeListing/contextReceivers/fromKEEP/dp.kt
index 1b2b3436887..3ba18876c0a 100644
--- a/compiler/testData/codegen/bytecodeListing/contextReceivers/fromKEEP/dp.kt
+++ b/compiler/testData/codegen/bytecodeListing/contextReceivers/fromKEEP/dp.kt
@@ -1,6 +1,6 @@
 // !LANGUAGE: +ContextReceivers
 // TARGET_BACKEND: JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // IGNORE_BACKEND: JVM
 
 class View {
diff --git a/compiler/testData/codegen/bytecodeListing/contextReceivers/fromKEEP/functionalType.kt b/compiler/testData/codegen/bytecodeListing/contextReceivers/fromKEEP/functionalType.kt
index 1b2d205dd32..a13c57f65e2 100644
--- a/compiler/testData/codegen/bytecodeListing/contextReceivers/fromKEEP/functionalType.kt
+++ b/compiler/testData/codegen/bytecodeListing/contextReceivers/fromKEEP/functionalType.kt
@@ -1,6 +1,6 @@
 // !LANGUAGE: +ContextReceivers
 // TARGET_BACKEND: JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // IGNORE_BACKEND: JVM
 
 class Param
diff --git a/compiler/testData/codegen/bytecodeListing/contextReceivers/fromKEEP/monoidSum.kt b/compiler/testData/codegen/bytecodeListing/contextReceivers/fromKEEP/monoidSum.kt
index 9301d7706d1..bd9872ffb6f 100644
--- a/compiler/testData/codegen/bytecodeListing/contextReceivers/fromKEEP/monoidSum.kt
+++ b/compiler/testData/codegen/bytecodeListing/contextReceivers/fromKEEP/monoidSum.kt
@@ -1,6 +1,6 @@
 // !LANGUAGE: +ContextReceivers
 // TARGET_BACKEND: JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // IGNORE_BACKEND: JVM
 // WITH_STDLIB
 
diff --git a/compiler/testData/codegen/bytecodeListing/contextReceivers/function.kt b/compiler/testData/codegen/bytecodeListing/contextReceivers/function.kt
index c76e73d2c80..b937cd4d8b9 100644
--- a/compiler/testData/codegen/bytecodeListing/contextReceivers/function.kt
+++ b/compiler/testData/codegen/bytecodeListing/contextReceivers/function.kt
@@ -1,6 +1,6 @@
 // !LANGUAGE: +ContextReceivers
 // TARGET_BACKEND: JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // IGNORE_BACKEND: JVM
 
 class C {
diff --git a/compiler/testData/codegen/bytecodeListing/contextReceivers/property.kt b/compiler/testData/codegen/bytecodeListing/contextReceivers/property.kt
index b51fda52b86..f67519a7b66 100644
--- a/compiler/testData/codegen/bytecodeListing/contextReceivers/property.kt
+++ b/compiler/testData/codegen/bytecodeListing/contextReceivers/property.kt
@@ -1,6 +1,6 @@
 // !LANGUAGE: +ContextReceivers
 // TARGET_BACKEND: JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // IGNORE_BACKEND: JVM
 
 interface A {
diff --git a/compiler/testData/codegen/bytecodeText/boxingOptimization/unsignedRangeIteratorSpecialization.kt b/compiler/testData/codegen/bytecodeText/boxingOptimization/unsignedRangeIteratorSpecialization.kt
index 5fc6c965466..ab81029c2bb 100644
--- a/compiler/testData/codegen/bytecodeText/boxingOptimization/unsignedRangeIteratorSpecialization.kt
+++ b/compiler/testData/codegen/bytecodeText/boxingOptimization/unsignedRangeIteratorSpecialization.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_STDLIB
 // IGNORE_BACKEND: JVM, JVM_IR
 // ^ TODO support new mangling rules in optimizer
diff --git a/compiler/testData/codegen/bytecodeText/constProperty/nonConstValHasNoDefaultValue_before.kt b/compiler/testData/codegen/bytecodeText/constProperty/nonConstValHasNoDefaultValue_before.kt
index 68a10cf6872..22256d7a6d5 100644
--- a/compiler/testData/codegen/bytecodeText/constProperty/nonConstValHasNoDefaultValue_before.kt
+++ b/compiler/testData/codegen/bytecodeText/constProperty/nonConstValHasNoDefaultValue_before.kt
@@ -1,7 +1,6 @@
 // TARGET_BACKEND: JVM
 // IGNORE_BACKEND: JVM_IR
 // ^ Disables a language feature introduced in 1.4. This test checks old backend's behavior and is needed as long as we support language version 1.3.
-// IGNORE_BACKEND_FIR: JVM_IR
 // FIR status: don't support legacy feature
 // !LANGUAGE: -NoConstantValueAttributeForNonConstVals
 
diff --git a/compiler/testData/codegen/bytecodeText/constants/byte.kt b/compiler/testData/codegen/bytecodeText/constants/byte.kt
index 8dede564aa1..705b2e29396 100644
--- a/compiler/testData/codegen/bytecodeText/constants/byte.kt
+++ b/compiler/testData/codegen/bytecodeText/constants/byte.kt
@@ -1,5 +1,5 @@
 // LANGUAGE: -ApproximateIntegerLiteralTypesInReceiverPosition
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // For reasons this test is ignored, go to KT-46419
 
 val a: Byte = 1 + 10
diff --git a/compiler/testData/codegen/bytecodeText/constants/short.kt b/compiler/testData/codegen/bytecodeText/constants/short.kt
index 190a50095b1..d14189253ec 100644
--- a/compiler/testData/codegen/bytecodeText/constants/short.kt
+++ b/compiler/testData/codegen/bytecodeText/constants/short.kt
@@ -1,5 +1,5 @@
 // LANGUAGE: -ApproximateIntegerLiteralTypesInReceiverPosition
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // For reasons this test is ignored, go to KT-46419
 
 val a: Short = 1 + 255
diff --git a/compiler/testData/codegen/bytecodeText/coroutines/debug/localVariableCorrectLabel.kt b/compiler/testData/codegen/bytecodeText/coroutines/debug/localVariableCorrectLabel.kt
index 6ddcd892ad3..8ddd4c23c39 100644
--- a/compiler/testData/codegen/bytecodeText/coroutines/debug/localVariableCorrectLabel.kt
+++ b/compiler/testData/codegen/bytecodeText/coroutines/debug/localVariableCorrectLabel.kt
@@ -21,4 +21,4 @@ suspend fun SequenceScope<Int>.awaitSeq(): Int = 42
 // 1 LINENUMBER 9 L18
 // 1 LOCALVARIABLE a I L[0-9]+ L18
 
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
diff --git a/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTable.kt b/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTable.kt
index b92d1eb0e52..dcb6be3cfa8 100644
--- a/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTable.kt
+++ b/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTable.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // This test checks, that different variables occupy the same slot
 // In JVM_IR, however, loop variable's lifetime goes beyond the loop itself, thus the test has no sense in JVM_IR
 // IGNORE_BACKEND: JVM_IR
diff --git a/compiler/testData/codegen/bytecodeText/falseSmartCast.kt b/compiler/testData/codegen/bytecodeText/falseSmartCast.kt
index d294cdadabd..8f4a85968ed 100644
--- a/compiler/testData/codegen/bytecodeText/falseSmartCast.kt
+++ b/compiler/testData/codegen/bytecodeText/falseSmartCast.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 open class SuperFoo {
     public fun bar() {
         if (this is Foo) {
diff --git a/compiler/testData/codegen/bytecodeText/inlineClasses/delegatedPropertyMangling.kt b/compiler/testData/codegen/bytecodeText/inlineClasses/delegatedPropertyMangling.kt
index f23d758ada9..28a5e4396ff 100644
--- a/compiler/testData/codegen/bytecodeText/inlineClasses/delegatedPropertyMangling.kt
+++ b/compiler/testData/codegen/bytecodeText/inlineClasses/delegatedPropertyMangling.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // LANGUAGE: +InlineClasses
 import kotlin.reflect.KProperty
 
diff --git a/compiler/testData/codegen/bytecodeText/inlineClasses/mangledInlineClassInterfaceImplementation.kt b/compiler/testData/codegen/bytecodeText/inlineClasses/mangledInlineClassInterfaceImplementation.kt
index 8985cef4739..37c78da457b 100644
--- a/compiler/testData/codegen/bytecodeText/inlineClasses/mangledInlineClassInterfaceImplementation.kt
+++ b/compiler/testData/codegen/bytecodeText/inlineClasses/mangledInlineClassInterfaceImplementation.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: +InlineClasses
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 
 interface A<T> {
     fun foo(a: T): String
diff --git a/compiler/testData/codegen/bytecodeText/inlineClasses/resultApiRunCatchingDoesntBox.kt b/compiler/testData/codegen/bytecodeText/inlineClasses/resultApiRunCatchingDoesntBox.kt
index ae64165a487..5445a78b354 100644
--- a/compiler/testData/codegen/bytecodeText/inlineClasses/resultApiRunCatchingDoesntBox.kt
+++ b/compiler/testData/codegen/bytecodeText/inlineClasses/resultApiRunCatchingDoesntBox.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JVM
 // IGNORE_BACKEND: JVM_IR
 // WITH_STDLIB
diff --git a/compiler/testData/codegen/bytecodeText/intrinsicsCompare/shortSmartCast_after.kt b/compiler/testData/codegen/bytecodeText/intrinsicsCompare/shortSmartCast_after.kt
index 3525c638bec..d0eae9f50a5 100644
--- a/compiler/testData/codegen/bytecodeText/intrinsicsCompare/shortSmartCast_after.kt
+++ b/compiler/testData/codegen/bytecodeText/intrinsicsCompare/shortSmartCast_after.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: +ProperIeee754Comparisons
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JVM_IR
 
 fun equals3(a: Short?, b: Short?) = a != null && b != null && a == b
diff --git a/compiler/testData/codegen/bytecodeText/intrinsicsCompare/shortSmartCast_before.kt b/compiler/testData/codegen/bytecodeText/intrinsicsCompare/shortSmartCast_before.kt
index aac811e8c9e..94aac9757c0 100644
--- a/compiler/testData/codegen/bytecodeText/intrinsicsCompare/shortSmartCast_before.kt
+++ b/compiler/testData/codegen/bytecodeText/intrinsicsCompare/shortSmartCast_before.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: -ProperIeee754Comparisons
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JVM_IR
 
 fun equals3(a: Short?, b: Short?) = a != null && b != null && a == b
diff --git a/compiler/testData/codegen/bytecodeText/javaStatics.kt b/compiler/testData/codegen/bytecodeText/javaStatics.kt
index 78dd5d4735e..3e30d3dea0f 100644
--- a/compiler/testData/codegen/bytecodeText/javaStatics.kt
+++ b/compiler/testData/codegen/bytecodeText/javaStatics.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FILE: Child.java
 
 class Child extends Parent {
diff --git a/compiler/testData/codegen/bytecodeText/when/exhaustiveWhenSpecialCases.kt b/compiler/testData/codegen/bytecodeText/when/exhaustiveWhenSpecialCases.kt
index e1b65a80a17..cc27a24e498 100644
--- a/compiler/testData/codegen/bytecodeText/when/exhaustiveWhenSpecialCases.kt
+++ b/compiler/testData/codegen/bytecodeText/when/exhaustiveWhenSpecialCases.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 
 enum class A { V1 }
 
diff --git a/compiler/testData/codegen/bytecodeText/when/exhaustiveWhenUnitStatement.kt b/compiler/testData/codegen/bytecodeText/when/exhaustiveWhenUnitStatement.kt
index 20fec8e5647..cf0d0c526bc 100644
--- a/compiler/testData/codegen/bytecodeText/when/exhaustiveWhenUnitStatement.kt
+++ b/compiler/testData/codegen/bytecodeText/when/exhaustiveWhenUnitStatement.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 
 enum class AccessMode { READ, WRITE, EXECUTE }
 
diff --git a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/nestedWhenInCondition.kt b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/nestedWhenInCondition.kt
index d247302496d..aa30214ea7c 100644
--- a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/nestedWhenInCondition.kt
+++ b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/nestedWhenInCondition.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // FIR_STATUS: FIR+JVM_IR generates TABLESWITCH for nested 'when' only, doesn't look critical.
 
 // JVM_IR_TEMPLATES
diff --git a/compiler/testData/debug/localVariables/assignment.kt b/compiler/testData/debug/localVariables/assignment.kt
index 933a4ea5c34..42df0b49887 100644
--- a/compiler/testData/debug/localVariables/assignment.kt
+++ b/compiler/testData/debug/localVariables/assignment.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 
 // FILE: test.kt
 fun box(): String {
diff --git a/compiler/testData/debug/localVariables/destructuring/assignmentCustomComponentNsMultiline.kt b/compiler/testData/debug/localVariables/destructuring/assignmentCustomComponentNsMultiline.kt
index 0ad25420609..a632541d5f1 100644
--- a/compiler/testData/debug/localVariables/destructuring/assignmentCustomComponentNsMultiline.kt
+++ b/compiler/testData/debug/localVariables/destructuring/assignmentCustomComponentNsMultiline.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 
 // FILE: test.kt
 class MyPair(val x: String, val y: String) {
diff --git a/compiler/testData/debug/localVariables/destructuring/assignmentMultiline.kt b/compiler/testData/debug/localVariables/destructuring/assignmentMultiline.kt
index 9856af060e1..54c56b7c59b 100644
--- a/compiler/testData/debug/localVariables/destructuring/assignmentMultiline.kt
+++ b/compiler/testData/debug/localVariables/destructuring/assignmentMultiline.kt
@@ -1,5 +1,5 @@
 // WITH_STDLIB
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 
 // FILE: test.kt
 fun box(): String {
diff --git a/compiler/testData/debug/localVariables/destructuring/assignmentUnderscoreNamesMultiline.kt b/compiler/testData/debug/localVariables/destructuring/assignmentUnderscoreNamesMultiline.kt
index 3386420c56e..a116e4d712b 100644
--- a/compiler/testData/debug/localVariables/destructuring/assignmentUnderscoreNamesMultiline.kt
+++ b/compiler/testData/debug/localVariables/destructuring/assignmentUnderscoreNamesMultiline.kt
@@ -1,5 +1,5 @@
 // WITH_STDLIB
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 
 // FILE: test.kt
 fun box(): String {
diff --git a/compiler/testData/debug/localVariables/destructuring/forLoopMultiline.kt b/compiler/testData/debug/localVariables/destructuring/forLoopMultiline.kt
index 107783ae5f9..a07f1c0c6f2 100644
--- a/compiler/testData/debug/localVariables/destructuring/forLoopMultiline.kt
+++ b/compiler/testData/debug/localVariables/destructuring/forLoopMultiline.kt
@@ -1,5 +1,4 @@
 // WITH_STDLIB
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JVM_IR
 // FILE: test.kt
 fun box() {
@@ -21,14 +20,14 @@ fun box() {
 }
 
 // EXPECTATIONS JVM
-// test.kt:6 box:
-// test.kt:16 box: map:java.util.Map=java.util.Collections$SingletonMap
-// test.kt:8 box: map:java.util.Map=java.util.Collections$SingletonMap
-// test.kt:11 box: map:java.util.Map=java.util.Collections$SingletonMap
-// test.kt:13 box: map:java.util.Map=java.util.Collections$SingletonMap
-// test.kt:19 box: map:java.util.Map=java.util.Collections$SingletonMap, a:java.lang.String="1":java.lang.String, b:java.lang.String="23":java.lang.String
-// test.kt:8 box: map:java.util.Map=java.util.Collections$SingletonMap
-// test.kt:21 box: map:java.util.Map=java.util.Collections$SingletonMap
+// test.kt:5 box:
+// test.kt:15 box: map:java.util.Map=java.util.Collections$SingletonMap
+// test.kt:7 box: map:java.util.Map=java.util.Collections$SingletonMap
+// test.kt:10 box: map:java.util.Map=java.util.Collections$SingletonMap
+// test.kt:12 box: map:java.util.Map=java.util.Collections$SingletonMap
+// test.kt:18 box: map:java.util.Map=java.util.Collections$SingletonMap, a:java.lang.String="1":java.lang.String, b:java.lang.String="23":java.lang.String
+// test.kt:7 box: map:java.util.Map=java.util.Collections$SingletonMap
+// test.kt:20 box: map:java.util.Map=java.util.Collections$SingletonMap
 
 // EXPECTATIONS JVM_IR
 // test.kt:6 box:
@@ -40,13 +39,13 @@ fun box() {
 // test.kt:21 box: map:java.util.Map=java.util.Collections$SingletonMap
 
 // EXPECTATIONS JS_IR
-// test.kt:6 box:
-// test.kt:6 box:
-// test.kt:16 box: map=kotlin.collections.HashMap
-// test.kt:16 box: map=kotlin.collections.HashMap
-// test.kt:16 box: map=kotlin.collections.HashMap
-// test.kt:11 box: map=kotlin.collections.HashMap
-// test.kt:13 box: map=kotlin.collections.HashMap, a="1":kotlin.String
-// test.kt:19 box: map=kotlin.collections.HashMap, a="1":kotlin.String, b="23":kotlin.String
-// test.kt:16 box: map=kotlin.collections.HashMap, a="1":kotlin.String, b="23":kotlin.String
-// test.kt:21 box: map=kotlin.collections.HashMap, a="1":kotlin.String, b="23":kotlin.String
+// test.kt:5 box:
+// test.kt:5 box:
+// test.kt:15 box: map=kotlin.collections.HashMap
+// test.kt:15 box: map=kotlin.collections.HashMap
+// test.kt:15 box: map=kotlin.collections.HashMap
+// test.kt:10 box: map=kotlin.collections.HashMap
+// test.kt:12 box: map=kotlin.collections.HashMap, a="1":kotlin.String
+// test.kt:18 box: map=kotlin.collections.HashMap, a="1":kotlin.String, b="23":kotlin.String
+// test.kt:15 box: map=kotlin.collections.HashMap, a="1":kotlin.String, b="23":kotlin.String
+// test.kt:20 box: map=kotlin.collections.HashMap, a="1":kotlin.String, b="23":kotlin.String
\ No newline at end of file
diff --git a/compiler/testData/debug/localVariables/destructuring/lambda.kt b/compiler/testData/debug/localVariables/destructuring/lambda.kt
index 1fb7c53a255..9bb6622321a 100644
--- a/compiler/testData/debug/localVariables/destructuring/lambda.kt
+++ b/compiler/testData/debug/localVariables/destructuring/lambda.kt
@@ -1,5 +1,4 @@
 // IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
 // FILE: test.kt
 data class A(val x: String, val y: Int)
 
@@ -10,14 +9,14 @@ fun box() {
 }
 
 // EXPECTATIONS JVM
+// test.kt:8 box:
+// test.kt:3 <init>: x:java.lang.String="O":java.lang.String, y:int=123:int
+// test.kt:8 box:
+// test.kt:5 foo: a:A=A, block:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:8 invoke: $dstr$x$y:A=A
+// test.kt:5 foo: a:A=A, block:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:8 box:
 // test.kt:9 box:
-// test.kt:4 <init>: x:java.lang.String="O":java.lang.String, y:int=123:int
-// test.kt:9 box:
-// test.kt:6 foo: a:A=A, block:kotlin.jvm.functions.Function1=TestKt$box$1
-// test.kt:9 invoke: $dstr$x$y:A=A
-// test.kt:6 foo: a:A=A, block:kotlin.jvm.functions.Function1=TestKt$box$1
-// test.kt:9 box:
-// test.kt:10 box:
 
 // EXPECTATIONS JVM_IR
 // test.kt:9 box:
@@ -30,15 +29,15 @@ fun box() {
 // test.kt:10 box:
 
 // EXPECTATIONS JS_IR
-// test.kt:9 box:
-// test.kt:4 <init>: x="O":kotlin.String, y=123:number
-// test.kt:4 <init>: x="O":kotlin.String, y=123:number
-// test.kt:4 <init>: x="O":kotlin.String, y=123:number
-// test.kt:9 box:
-// test.kt:6 foo: a=A, block=Function1
-// test.kt:9 box$lambda:
+// test.kt:8 box:
+// test.kt:3 <init>: x="O":kotlin.String, y=123:number
+// test.kt:3 <init>: x="O":kotlin.String, y=123:number
+// test.kt:3 <init>: x="O":kotlin.String, y=123:number
+// test.kt:8 box:
+// test.kt:5 foo: a=A, block=Function1
+// test.kt:8 box$lambda:
 // test.kt:1 component1:
-// test.kt:9 box$lambda: x="O":kotlin.String
+// test.kt:8 box$lambda: x="O":kotlin.String
 // test.kt:1 component2:
-// test.kt:9 box$lambda: x="O":kotlin.String, y=123:number
-// test.kt:10 box:
+// test.kt:8 box$lambda: x="O":kotlin.String, y=123:number
+// test.kt:9 box:
\ No newline at end of file
diff --git a/compiler/testData/debug/localVariables/destructuring/lambdaCustomComponentNs.kt b/compiler/testData/debug/localVariables/destructuring/lambdaCustomComponentNs.kt
index 2a25af61902..c8b64a5c3e7 100644
--- a/compiler/testData/debug/localVariables/destructuring/lambdaCustomComponentNs.kt
+++ b/compiler/testData/debug/localVariables/destructuring/lambdaCustomComponentNs.kt
@@ -1,5 +1,4 @@
 // IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
 // FILE: test.kt
 class MyPair(val x: String, val y: String) {
     operator fun component1(): String {
@@ -18,18 +17,18 @@ fun box() {
 }
 
 // EXPECTATIONS JVM
+// test.kt:16 box:
+// test.kt:3 <init>: x:java.lang.String="X":java.lang.String, y:java.lang.String="Y":java.lang.String
+// test.kt:16 box:
+// test.kt:13 foo: a:MyPair=MyPair, block:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:16 invoke: $dstr$x$y:MyPair=MyPair
+// test.kt:5 component1:
+// test.kt:16 invoke: $dstr$x$y:MyPair=MyPair
+// test.kt:9 component2:
+// test.kt:16 invoke: $dstr$x$y:MyPair=MyPair
+// test.kt:13 foo: a:MyPair=MyPair, block:kotlin.jvm.functions.Function1=TestKt$box$1
+// test.kt:16 box:
 // test.kt:17 box:
-// test.kt:4 <init>: x:java.lang.String="X":java.lang.String, y:java.lang.String="Y":java.lang.String
-// test.kt:17 box:
-// test.kt:14 foo: a:MyPair=MyPair, block:kotlin.jvm.functions.Function1=TestKt$box$1
-// test.kt:17 invoke: $dstr$x$y:MyPair=MyPair
-// test.kt:6 component1:
-// test.kt:17 invoke: $dstr$x$y:MyPair=MyPair
-// test.kt:10 component2:
-// test.kt:17 invoke: $dstr$x$y:MyPair=MyPair
-// test.kt:14 foo: a:MyPair=MyPair, block:kotlin.jvm.functions.Function1=TestKt$box$1
-// test.kt:17 box:
-// test.kt:18 box:
 
 // EXPECTATIONS JVM_IR
 // test.kt:17 box:
@@ -46,15 +45,15 @@ fun box() {
 // test.kt:18 box:
 
 // EXPECTATIONS JS_IR
-// test.kt:17 box:
-// test.kt:4 <init>: x="X":kotlin.String, y="Y":kotlin.String
-// test.kt:4 <init>: x="X":kotlin.String, y="Y":kotlin.String
-// test.kt:4 <init>: x="X":kotlin.String, y="Y":kotlin.String
-// test.kt:17 box:
-// test.kt:14 foo: a=MyPair, block=Function1
-// test.kt:17 box$lambda:
-// test.kt:6 component1:
-// test.kt:17 box$lambda: x="O":kotlin.String
-// test.kt:10 component2:
-// test.kt:17 box$lambda: x="O":kotlin.String, y="K":kotlin.String
-// test.kt:18 box:
+// test.kt:16 box:
+// test.kt:3 <init>: x="X":kotlin.String, y="Y":kotlin.String
+// test.kt:3 <init>: x="X":kotlin.String, y="Y":kotlin.String
+// test.kt:3 <init>: x="X":kotlin.String, y="Y":kotlin.String
+// test.kt:16 box:
+// test.kt:13 foo: a=MyPair, block=Function1
+// test.kt:16 box$lambda:
+// test.kt:5 component1:
+// test.kt:16 box$lambda: x="O":kotlin.String
+// test.kt:9 component2:
+// test.kt:16 box$lambda: x="O":kotlin.String, y="K":kotlin.String
+// test.kt:17 box:
\ No newline at end of file
diff --git a/compiler/testData/debug/localVariables/destructuring/lambdaCustomComponentNsMultiline.kt b/compiler/testData/debug/localVariables/destructuring/lambdaCustomComponentNsMultiline.kt
index 5f1fe59aae2..becf7266c62 100644
--- a/compiler/testData/debug/localVariables/destructuring/lambdaCustomComponentNsMultiline.kt
+++ b/compiler/testData/debug/localVariables/destructuring/lambdaCustomComponentNsMultiline.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 
 // FILE: test.kt
 class MyPair(val x: String, val y: String) {
diff --git a/compiler/testData/debug/localVariables/destructuring/lambdaMultiline.kt b/compiler/testData/debug/localVariables/destructuring/lambdaMultiline.kt
index f28ef82a347..767841542ec 100644
--- a/compiler/testData/debug/localVariables/destructuring/lambdaMultiline.kt
+++ b/compiler/testData/debug/localVariables/destructuring/lambdaMultiline.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 
 // FILE: test.kt
 data class A(val x: String, val y: Int)
diff --git a/compiler/testData/debug/localVariables/destructuring/lambdaMultipleDestructs.kt b/compiler/testData/debug/localVariables/destructuring/lambdaMultipleDestructs.kt
index 71beec84313..a392586c1b5 100644
--- a/compiler/testData/debug/localVariables/destructuring/lambdaMultipleDestructs.kt
+++ b/compiler/testData/debug/localVariables/destructuring/lambdaMultipleDestructs.kt
@@ -1,5 +1,4 @@
 // IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
 // FILE: test.kt
 data class A(val x: String, val y: Int)
 
@@ -10,16 +9,16 @@ fun box() {
 }
 
 // EXPECTATIONS JVM
+// test.kt:8 box:
+// test.kt:3 <init>: x:java.lang.String="O":java.lang.String, y:int=123:int
+// test.kt:8 box:
+// test.kt:3 <init>: x:java.lang.String="K":java.lang.String, y:int=877:int
+// test.kt:8 box:
+// test.kt:5 foo: a:A=A, b:A=A, block:kotlin.jvm.functions.Function2=TestKt$box$1
+// test.kt:8 invoke: $dstr$x$y:A=A, $dstr$z$w:A=A
+// test.kt:5 foo: a:A=A, b:A=A, block:kotlin.jvm.functions.Function2=TestKt$box$1
+// test.kt:8 box:
 // test.kt:9 box:
-// test.kt:4 <init>: x:java.lang.String="O":java.lang.String, y:int=123:int
-// test.kt:9 box:
-// test.kt:4 <init>: x:java.lang.String="K":java.lang.String, y:int=877:int
-// test.kt:9 box:
-// test.kt:6 foo: a:A=A, b:A=A, block:kotlin.jvm.functions.Function2=TestKt$box$1
-// test.kt:9 invoke: $dstr$x$y:A=A, $dstr$z$w:A=A
-// test.kt:6 foo: a:A=A, b:A=A, block:kotlin.jvm.functions.Function2=TestKt$box$1
-// test.kt:9 box:
-// test.kt:10 box:
 
 // EXPECTATIONS JVM_IR
 // test.kt:9 box:
@@ -34,23 +33,23 @@ fun box() {
 // test.kt:10 box:
 
 // EXPECTATIONS JS_IR
-// test.kt:9 box:
-// test.kt:4 <init>: x="O":kotlin.String, y=123:number
-// test.kt:4 <init>: x="O":kotlin.String, y=123:number
-// test.kt:4 <init>: x="O":kotlin.String, y=123:number
-// test.kt:9 box:
-// test.kt:4 <init>: x="K":kotlin.String, y=877:number
-// test.kt:4 <init>: x="K":kotlin.String, y=877:number
-// test.kt:4 <init>: x="K":kotlin.String, y=877:number
-// test.kt:9 box:
-// test.kt:6 foo: a=A, b=A, block=Function2
-// test.kt:9 box$lambda:
+// test.kt:8 box:
+// test.kt:3 <init>: x="O":kotlin.String, y=123:number
+// test.kt:3 <init>: x="O":kotlin.String, y=123:number
+// test.kt:3 <init>: x="O":kotlin.String, y=123:number
+// test.kt:8 box:
+// test.kt:3 <init>: x="K":kotlin.String, y=877:number
+// test.kt:3 <init>: x="K":kotlin.String, y=877:number
+// test.kt:3 <init>: x="K":kotlin.String, y=877:number
+// test.kt:8 box:
+// test.kt:5 foo: a=A, b=A, block=Function2
+// test.kt:8 box$lambda:
 // test.kt:1 component1:
-// test.kt:9 box$lambda: x="O":kotlin.String
+// test.kt:8 box$lambda: x="O":kotlin.String
 // test.kt:1 component2:
-// test.kt:9 box$lambda: x="O":kotlin.String, y=123:number
+// test.kt:8 box$lambda: x="O":kotlin.String, y=123:number
 // test.kt:1 component1:
-// test.kt:9 box$lambda: x="O":kotlin.String, y=123:number, z="K":kotlin.String
+// test.kt:8 box$lambda: x="O":kotlin.String, y=123:number, z="K":kotlin.String
 // test.kt:1 component2:
-// test.kt:9 box$lambda: x="O":kotlin.String, y=123:number, z="K":kotlin.String, w=877:number
-// test.kt:10 box:
+// test.kt:8 box$lambda: x="O":kotlin.String, y=123:number, z="K":kotlin.String, w=877:number
+// test.kt:9 box:
\ No newline at end of file
diff --git a/compiler/testData/debug/localVariables/forLoopMultiline.kt b/compiler/testData/debug/localVariables/forLoopMultiline.kt
index 7b9e006a033..a1948dc0a0b 100644
--- a/compiler/testData/debug/localVariables/forLoopMultiline.kt
+++ b/compiler/testData/debug/localVariables/forLoopMultiline.kt
@@ -1,5 +1,4 @@
 // WITH_STDLIB
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JVM_IR
 // FILE: test.kt
 fun box() {
@@ -17,28 +16,28 @@ fun box() {
 }
 
 // EXPECTATIONS JVM
-// test.kt:6 box:
-// test.kt:12 box: map:java.util.Map=java.util.Collections$SingletonMap
-// test.kt:8 box: map:java.util.Map=java.util.Collections$SingletonMap
-// test.kt:15 box: map:java.util.Map=java.util.Collections$SingletonMap, e:java.util.Map$Entry=java.util.AbstractMap$SimpleImmutableEntry
-// test.kt:8 box: map:java.util.Map=java.util.Collections$SingletonMap
-// test.kt:17 box: map:java.util.Map=java.util.Collections$SingletonMap
+// test.kt:5 box:
+// test.kt:11 box: map:java.util.Map=java.util.Collections$SingletonMap
+// test.kt:7 box: map:java.util.Map=java.util.Collections$SingletonMap
+// test.kt:14 box: map:java.util.Map=java.util.Collections$SingletonMap, e:java.util.Map$Entry=java.util.AbstractMap$SimpleImmutableEntry
+// test.kt:7 box: map:java.util.Map=java.util.Collections$SingletonMap
+// test.kt:16 box: map:java.util.Map=java.util.Collections$SingletonMap
 
 // EXPECTATIONS JVM_IR
-// test.kt:6 box:
-// test.kt:12 box: map:java.util.Map=java.util.Collections$SingletonMap
-// test.kt:10 box: map:java.util.Map=java.util.Collections$SingletonMap
-// test.kt:15 box: map:java.util.Map=java.util.Collections$SingletonMap, e:java.util.Map$Entry=java.util.AbstractMap$SimpleImmutableEntry
-// test.kt:8 box: map:java.util.Map=java.util.Collections$SingletonMap
-// test.kt:17 box: map:java.util.Map=java.util.Collections$SingletonMap
+// test.kt:5 box:
+// test.kt:11 box: map:java.util.Map=java.util.Collections$SingletonMap
+// test.kt:7 box: map:java.util.Map=java.util.Collections$SingletonMap
+// test.kt:14 box: map:java.util.Map=java.util.Collections$SingletonMap, e:java.util.Map$Entry=java.util.AbstractMap$SimpleImmutableEntry
+// test.kt:7 box: map:java.util.Map=java.util.Collections$SingletonMap
+// test.kt:16 box: map:java.util.Map=java.util.Collections$SingletonMap
 
 // EXPECTATIONS JS_IR
-// test.kt:6 box:
-// test.kt:6 box:
-// test.kt:12 box: map=kotlin.collections.HashMap
-// test.kt:12 box: map=kotlin.collections.HashMap
-// test.kt:12 box: map=kotlin.collections.HashMap
-// test.kt:15 box: map=kotlin.collections.HashMap, e=kotlin.collections.AbstractMutableMap.SimpleEntry
-// test.kt:15 box: map=kotlin.collections.HashMap, e=kotlin.collections.AbstractMutableMap.SimpleEntry
-// test.kt:12 box: map=kotlin.collections.HashMap, e=kotlin.collections.AbstractMutableMap.SimpleEntry
-// test.kt:17 box: map=kotlin.collections.HashMap, e=kotlin.collections.AbstractMutableMap.SimpleEntry
+// test.kt:5 box:
+// test.kt:5 box:
+// test.kt:11 box: map=kotlin.collections.HashMap
+// test.kt:11 box: map=kotlin.collections.HashMap
+// test.kt:11 box: map=kotlin.collections.HashMap
+// test.kt:14 box: map=kotlin.collections.HashMap, e=kotlin.collections.AbstractMutableMap.SimpleEntry
+// test.kt:14 box: map=kotlin.collections.HashMap, e=kotlin.collections.AbstractMutableMap.SimpleEntry
+// test.kt:11 box: map=kotlin.collections.HashMap, e=kotlin.collections.AbstractMutableMap.SimpleEntry
+// test.kt:16 box: map=kotlin.collections.HashMap, e=kotlin.collections.AbstractMutableMap.SimpleEntry
\ No newline at end of file
diff --git a/compiler/testData/debug/stepping/kt15259.kt b/compiler/testData/debug/stepping/kt15259.kt
index f8544a3e2dd..360d75b08ae 100644
--- a/compiler/testData/debug/stepping/kt15259.kt
+++ b/compiler/testData/debug/stepping/kt15259.kt
@@ -1,5 +1,4 @@
 // IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
 // FILE: test.kt
 interface ObjectFace
 
@@ -15,16 +14,16 @@ fun box() {
 // IR backend has additional steps on the way _out_ of the init block.
 
 // EXPECTATIONS JVM JVM_IR
+// test.kt:11 box
+// test.kt:5 makeFace
+// test.kt:5 <init>
+// test.kt:7 <init>
+// test.kt:8 makeFace
+// test.kt:11 box
 // test.kt:12 box
-// test.kt:6 makeFace
-// test.kt:6 <init>
-// test.kt:8 <init>
-// test.kt:9 makeFace
-// test.kt:12 box
-// test.kt:13 box
 
 // EXPECTATIONS JS_IR
-// test.kt:12 box
-// test.kt:9 makeFace
-// test.kt:6 <init>
-// test.kt:13 box
\ No newline at end of file
+// test.kt:11 box
+// test.kt:8 makeFace
+// test.kt:5 <init>
+// test.kt:12 box
\ No newline at end of file
diff --git a/compiler/testData/debug/stepping/kt29179.kt b/compiler/testData/debug/stepping/kt29179.kt
index 34d972afba9..dcdb5b7b7b4 100644
--- a/compiler/testData/debug/stepping/kt29179.kt
+++ b/compiler/testData/debug/stepping/kt29179.kt
@@ -1,5 +1,4 @@
 // IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_FIR: JVM_IR
 // FILE: test.kt
 class A {
     val a = 1
@@ -16,19 +15,19 @@ fun box() {
 }
 
 // EXPECTATIONS JVM JVM_IR
-// test.kt:15 box
+// test.kt:14 box
+// test.kt:3 <init>
 // test.kt:4 <init>
-// test.kt:5 <init>
-// test.kt:15 box
-// test.kt:8 foo
+// test.kt:14 box
+// test.kt:7 foo
+// test.kt:9 foo
 // test.kt:10 foo
-// test.kt:11 foo
-// test.kt:16 box
+// test.kt:15 box
 
 // EXPECTATIONS JS_IR
-// test.kt:15 box
-// test.kt:5 <init>
+// test.kt:14 box
 // test.kt:4 <init>
-// test.kt:15 box
-// test.kt:11 foo
-// test.kt:16 box
\ No newline at end of file
+// test.kt:3 <init>
+// test.kt:14 box
+// test.kt:10 foo
+// test.kt:15 box
\ No newline at end of file
diff --git a/compiler/testData/debug/stepping/localProperty.kt b/compiler/testData/debug/stepping/localProperty.kt
index be56de80e4d..ec68870b977 100644
--- a/compiler/testData/debug/stepping/localProperty.kt
+++ b/compiler/testData/debug/stepping/localProperty.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 
 // FILE: test.kt
 fun box(): String {
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/typeParameterAsContextReceiver.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/typeParameterAsContextReceiver.kt
index 366cde034e4..43cd27109bf 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/typeParameterAsContextReceiver.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/typeParameterAsContextReceiver.kt
@@ -1,6 +1,6 @@
 // FIR_IDENTICAL
 // !LANGUAGE: +ContextReceivers
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 
 context(T)
 fun <T> useContext(block: (T) -> Unit) { }
diff --git a/compiler/testData/diagnostics/tests/multiplatform/hmpp/simple.kt b/compiler/testData/diagnostics/tests/multiplatform/hmpp/simple.kt
index 957667347bb..b9a2a1a3419 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/hmpp/simple.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/hmpp/simple.kt
@@ -6,7 +6,7 @@
  */
 
 
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // TARGET_BACKEND: JVM
 
 // MODULE: common
diff --git a/compiler/testData/ir/interpreter/instanceOf.kt b/compiler/testData/ir/interpreter/instanceOf.kt
index d8f5c5afb66..b8fe637da37 100644
--- a/compiler/testData/ir/interpreter/instanceOf.kt
+++ b/compiler/testData/ir/interpreter/instanceOf.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND: JVM_IR
+// IGNORE_BACKEND_K1: JVM_IR
 interface Base
 
 @CompileTimeCalculation
diff --git a/compiler/testData/ir/interpreter/jvm/classReference.kt b/compiler/testData/ir/interpreter/jvm/classReference.kt
index ecbf265f511..696c5c10e7d 100644
--- a/compiler/testData/ir/interpreter/jvm/classReference.kt
+++ b/compiler/testData/ir/interpreter/jvm/classReference.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND: JVM_IR
+// IGNORE_BACKEND_K1: JVM_IR
 package test
 
 import kotlin.reflect.KFunction
diff --git a/compiler/testData/ir/interpreter/jvm/parameterReference.kt b/compiler/testData/ir/interpreter/jvm/parameterReference.kt
index 3578e3245e5..d7fac6dc64c 100644
--- a/compiler/testData/ir/interpreter/jvm/parameterReference.kt
+++ b/compiler/testData/ir/interpreter/jvm/parameterReference.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND: JVM_IR
+// IGNORE_BACKEND_K1: JVM_IR
 package test
 
 import kotlin.reflect.KFunction
diff --git a/compiler/testData/ir/irText/classes/clashingFakeOverrideSignatures.kt b/compiler/testData/ir/irText/classes/clashingFakeOverrideSignatures.kt
index 51d4c8b9478..6ced15c1fd5 100644
--- a/compiler/testData/ir/irText/classes/clashingFakeOverrideSignatures.kt
+++ b/compiler/testData/ir/irText/classes/clashingFakeOverrideSignatures.kt
@@ -1,6 +1,6 @@
 // SKIP_KLIB_TEST
 // See KT-44312
-// IGNORE_BACKEND_FIR: ANY
+// IGNORE_BACKEND_K2: ANY
 //  ^ TODO decide if we want to fix KT-42020 for FIR as well
 
 open class Base<T> {
diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.kt b/compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.kt
index 210d0f047e7..a5af6231876 100644
--- a/compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.kt
+++ b/compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // !LANGUAGE: +MultiPlatformProjects
 
 expect abstract class A protected constructor() {
diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.kt b/compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.kt
index 90c156bc659..7eaf87dd8e5 100644
--- a/compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.kt
+++ b/compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // !LANGUAGE: +MultiPlatformProjects
 
 expect sealed class Ops()
diff --git a/compiler/testData/ir/irText/errors/unresolvedReference.kt b/compiler/testData/ir/irText/errors/unresolvedReference.kt
index 7c9a713ab2a..e18dcfe9b9a 100644
--- a/compiler/testData/ir/irText/errors/unresolvedReference.kt
+++ b/compiler/testData/ir/irText/errors/unresolvedReference.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // !IGNORE_ERRORS
 
 val test1 = unresolved
diff --git a/compiler/testData/ir/irText/expressions/badBreakContinue.kt b/compiler/testData/ir/irText/expressions/badBreakContinue.kt
index 29fe8515b3c..9044899bb8c 100644
--- a/compiler/testData/ir/irText/expressions/badBreakContinue.kt
+++ b/compiler/testData/ir/irText/expressions/badBreakContinue.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // !IGNORE_ERRORS
 
 fun test1() {
diff --git a/compiler/testData/ir/irText/expressions/badInlinedBreakContinue.kt b/compiler/testData/ir/irText/expressions/badInlinedBreakContinue.kt
index f8099036a6d..b5dde8d52fe 100644
--- a/compiler/testData/ir/irText/expressions/badInlinedBreakContinue.kt
+++ b/compiler/testData/ir/irText/expressions/badInlinedBreakContinue.kt
@@ -1,5 +1,5 @@
 // LANGUAGE: +BreakContinueInInlineLambdas
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // !IGNORE_ERRORS
 // WITH_STDLIB
 
diff --git a/compiler/testData/ir/irText/expressions/kt24804.kt b/compiler/testData/ir/irText/expressions/kt24804.kt
index f10daa66750..ec73e2b06e6 100644
--- a/compiler/testData/ir/irText/expressions/kt24804.kt
+++ b/compiler/testData/ir/irText/expressions/kt24804.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 inline fun foo() = false
 
 fun run(x: Boolean, y: Boolean): String {
diff --git a/compiler/testData/ir/irText/expressions/kt42321.kt b/compiler/testData/ir/irText/expressions/kt42321.kt
index 044d7c61761..7a97279da4e 100644
--- a/compiler/testData/ir/irText/expressions/kt42321.kt
+++ b/compiler/testData/ir/irText/expressions/kt42321.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: -ApproximateIntegerLiteralTypesInReceiverPosition
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // SKIP_KT_DUMP
 // This test exists only to check that we don't accidentally break the buggy behavior of the old JVM backend in JVM IR (KT-42321).
 // Feel free to remove it as soon as there's no language version where such code is allowed (KT-38895).
diff --git a/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.kt b/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.kt
index d3e44843321..48723ca063f 100644
--- a/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.kt
+++ b/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.kt
@@ -1,5 +1,5 @@
 // LANGUAGE: -ApproximateIntegerLiteralTypesInReceiverPosition
-// IGNORE_BACKEND_FIR: ANY
+// IGNORE_BACKEND_K2: ANY
 // For reasons this test is ignored, go to KT-46419
 
 val test1: Long = 42
diff --git a/compiler/testData/ir/irText/expressions/sam/arrayAsVarargAfterSamArgument.kt b/compiler/testData/ir/irText/expressions/sam/arrayAsVarargAfterSamArgument.kt
index efe29ac8f2d..93e8f118eac 100644
--- a/compiler/testData/ir/irText/expressions/sam/arrayAsVarargAfterSamArgument.kt
+++ b/compiler/testData/ir/irText/expressions/sam/arrayAsVarargAfterSamArgument.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // TARGET_BACKEND: JVM
 // !LANGUAGE: -ProhibitVarargAsArrayAfterSamArgument
 // WITH_JDK
diff --git a/compiler/testData/ir/irText/expressions/signedToUnsignedConversions.kt b/compiler/testData/ir/irText/expressions/signedToUnsignedConversions.kt
index 791f56d27b4..c5d2730d9cd 100644
--- a/compiler/testData/ir/irText/expressions/signedToUnsignedConversions.kt
+++ b/compiler/testData/ir/irText/expressions/signedToUnsignedConversions.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // WITH_STDLIB
 
 // FILE: signedToUnsignedConversions_annotation.kt
diff --git a/compiler/testData/ir/irText/expressions/whenWithSubjectVariable.kt b/compiler/testData/ir/irText/expressions/whenWithSubjectVariable.kt
index b4a0c459620..f5bba3ccf51 100644
--- a/compiler/testData/ir/irText/expressions/whenWithSubjectVariable.kt
+++ b/compiler/testData/ir/irText/expressions/whenWithSubjectVariable.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // !LANGUAGE: +VariableDeclarationInWhenSubject
 
 fun foo(): Any = 1
diff --git a/compiler/testData/writeFlags/jvm8/defaults/privateAccessorNaming.kt b/compiler/testData/writeFlags/jvm8/defaults/privateAccessorNaming.kt
index 341c90082c5..8bd44a4074f 100644
--- a/compiler/testData/writeFlags/jvm8/defaults/privateAccessorNaming.kt
+++ b/compiler/testData/writeFlags/jvm8/defaults/privateAccessorNaming.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // TARGET_BACKEND: JVM
 // !JVM_DEFAULT_MODE: enable
 // JVM_TARGET: 1.8
diff --git a/compiler/testData/writeFlags/protectedAccessToBaseMethod.kt b/compiler/testData/writeFlags/protectedAccessToBaseMethod.kt
index 8f8d14e0026..724f75f63f2 100644
--- a/compiler/testData/writeFlags/protectedAccessToBaseMethod.kt
+++ b/compiler/testData/writeFlags/protectedAccessToBaseMethod.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // TARGET_BACKEND: JVM
 // FILE: Base.java
 public class Base {
diff --git a/compiler/testData/writeFlags/protectedAccessToBaseMethodDifferentPackage.kt b/compiler/testData/writeFlags/protectedAccessToBaseMethodDifferentPackage.kt
index d94eb597a6c..a09996db4fa 100644
--- a/compiler/testData/writeFlags/protectedAccessToBaseMethodDifferentPackage.kt
+++ b/compiler/testData/writeFlags/protectedAccessToBaseMethodDifferentPackage.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // TARGET_BACKEND: JVM
 // FILE: Base.java
 public class Base {
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/BlackBoxCodegenSuppressor.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/BlackBoxCodegenSuppressor.kt
index d66743c7f96..f8d3e7a7b26 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/BlackBoxCodegenSuppressor.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/BlackBoxCodegenSuppressor.kt
@@ -9,12 +9,10 @@ import org.jetbrains.kotlin.test.TargetBackend
 import org.jetbrains.kotlin.test.WrappedException
 import org.jetbrains.kotlin.test.bind
 import org.jetbrains.kotlin.test.directives.CodegenTestDirectives
-import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.IGNORE_BACKEND
-import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.IGNORE_BACKEND_FIR
+import org.jetbrains.kotlin.test.directives.extractIgnoredDirectiveForTargetBackend
 import org.jetbrains.kotlin.test.directives.model.DirectivesContainer
 import org.jetbrains.kotlin.test.directives.model.ValueDirective
 import org.jetbrains.kotlin.test.model.AfterAnalysisChecker
-import org.jetbrains.kotlin.test.model.FrontendKinds
 import org.jetbrains.kotlin.test.model.TestModule
 import org.jetbrains.kotlin.test.services.*
 
@@ -47,7 +45,9 @@ class BlackBoxCodegenSuppressor(
         return if (failedAssertions.isNotEmpty()) emptyList()
         else {
             val message = buildString {
-                append("Looks like this test can be unmuted. Remove ${directive.name} directive")
+                val module = testServices.moduleStructure.modules.first()
+                val targetBackend = testServices.defaultsProvider.defaultTargetBackend ?: module.targetBackend
+                append("Looks like this test can be unmuted. Remove ${targetBackend?.name?.let { "$it from" } ?: "" } ${directive.name} directive for ${module.frontendKind}")
                 if (additionalMessage.isNotEmpty()) {
                     append(" ")
                     append(additionalMessage)
@@ -59,11 +59,8 @@ class BlackBoxCodegenSuppressor(
 
     class SuppressionChecker(val testServices: TestServices, val customIgnoreDirective: ValueDirective<TargetBackend>?) : TestService {
         fun extractIgnoreDirective(module: TestModule): ValueDirective<TargetBackend>? {
-            return when (module.frontendKind) {
-                FrontendKinds.ClassicFrontend -> customIgnoreDirective ?: IGNORE_BACKEND
-                FrontendKinds.FIR -> customIgnoreDirective ?: IGNORE_BACKEND_FIR
-                else -> null
-            }
+            val targetBackend = testServices.defaultsProvider.defaultTargetBackend ?: module.targetBackend ?: return null
+            return extractIgnoredDirectiveForTargetBackend(module, targetBackend, customIgnoreDirective)
         }
 
         fun failuresInModuleAreIgnored(module: TestModule): Boolean {
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/CodegenTestDirectives.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/CodegenTestDirectives.kt
index a22b327e3de..8ba03daabb8 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/CodegenTestDirectives.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/CodegenTestDirectives.kt
@@ -12,6 +12,9 @@ import org.jetbrains.kotlin.test.backend.ir.JvmIrBackendFacade
 import org.jetbrains.kotlin.test.directives.model.DirectiveApplicability.File
 import org.jetbrains.kotlin.test.directives.model.DirectiveApplicability.Global
 import org.jetbrains.kotlin.test.directives.model.SimpleDirectivesContainer
+import org.jetbrains.kotlin.test.directives.model.ValueDirective
+import org.jetbrains.kotlin.test.model.FrontendKinds
+import org.jetbrains.kotlin.test.model.TestModule
 
 object CodegenTestDirectives : SimpleDirectivesContainer() {
     val IGNORE_BACKEND by enumDirective<TargetBackend>(
@@ -19,8 +22,13 @@ object CodegenTestDirectives : SimpleDirectivesContainer() {
         applicability = Global
     )
 
-    val IGNORE_BACKEND_FIR by enumDirective<TargetBackend>(
-        description = "Ignore specific backend if test uses FIR",
+    val IGNORE_BACKEND_K1 by enumDirective<TargetBackend>(
+        description = "Ignore specific backend if test uses K1 frontend",
+        applicability = Global
+    )
+
+    val IGNORE_BACKEND_K2 by enumDirective<TargetBackend>(
+        description = "Ignore specific backend if test uses K2 frontend",
         applicability = Global
     )
 
@@ -29,8 +37,8 @@ object CodegenTestDirectives : SimpleDirectivesContainer() {
         applicability = Global
     )
 
-    val IGNORE_BACKEND_FIR_MULTI_MODULE by enumDirective<TargetBackend>(
-        description = "Ignore failures of multimodule test on target backend if test uses FIR",
+    val IGNORE_BACKEND_K2_MULTI_MODULE by enumDirective<TargetBackend>(
+        description = "Ignore failures of multimodule test on target backend if test uses K2 frontend",
         applicability = Global
     )
 
@@ -177,3 +185,28 @@ object CodegenTestDirectives : SimpleDirectivesContainer() {
         """.trimIndent()
     )
 }
+
+fun extractIgnoredDirectiveForTargetBackend(
+    module: TestModule,
+    targetBackend: TargetBackend,
+    customIgnoreDirective: ValueDirective<TargetBackend>? = null
+): ValueDirective<TargetBackend>? =
+    when (module.frontendKind) {
+        FrontendKinds.ClassicFrontend -> CodegenTestDirectives.IGNORE_BACKEND_K1
+        FrontendKinds.FIR -> CodegenTestDirectives.IGNORE_BACKEND_K2
+        else -> null
+    }?.let { specificIgnoreDirective ->
+        when {
+            customIgnoreDirective != null -> customIgnoreDirective
+            !module.directives.contains(specificIgnoreDirective) -> CodegenTestDirectives.IGNORE_BACKEND
+            else -> {
+                val inCommonIgnored = module.directives[CodegenTestDirectives.IGNORE_BACKEND].let { targetBackend in it || TargetBackend.ANY in it }
+                val inSpecificIgnored = module.directives[specificIgnoreDirective].let { targetBackend in it || TargetBackend.ANY in it }
+                if (inCommonIgnored && inSpecificIgnored) {
+                    throw AssertionError("Both, IGNORE_BACKEND and ${specificIgnoreDirective.name} contain target backend ${targetBackend.name}. Please remove one of them.")
+                }
+                if (inCommonIgnored) CodegenTestDirectives.IGNORE_BACKEND else specificIgnoreDirective
+            }
+        }
+    }
+
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractCompileKotlinAgainstInlineKotlinTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractCompileKotlinAgainstInlineKotlinTest.kt
index 53572687247..32180c5bf5c 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractCompileKotlinAgainstInlineKotlinTest.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractCompileKotlinAgainstInlineKotlinTest.kt
@@ -18,7 +18,7 @@ import org.jetbrains.kotlin.test.backend.ir.JvmIrBackendFacade
 import org.jetbrains.kotlin.test.bind
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
 import org.jetbrains.kotlin.test.builders.configureIrHandlersStep
-import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.IGNORE_BACKEND_FIR_MULTI_MODULE
+import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.IGNORE_BACKEND_K2_MULTI_MODULE
 import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.IGNORE_BACKEND_MULTI_MODULE
 import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.SERIALIZE_IR
 import org.jetbrains.kotlin.test.directives.model.ValueDirective
@@ -114,7 +114,7 @@ open class AbstractFirSerializeCompileKotlinAgainstInlineKotlinTest :
     override val backendFacade: Constructor<BackendFacade<IrBackendInput, BinaryArtifacts.Jvm>>
         get() = ::JvmIrBackendFacade
 
-    override val directiveToSuppressTest = IGNORE_BACKEND_FIR_MULTI_MODULE
+    override val directiveToSuppressTest = IGNORE_BACKEND_K2_MULTI_MODULE
 
     override fun configure(builder: TestConfigurationBuilder) {
         super.configure(builder)
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
index 8b28dca0fc9..1e2c4e34e99 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
@@ -659,7 +659,7 @@ public abstract class CodegenTestCase extends KotlinBaseTest<KotlinBaseTest.Test
         }
     }
 
-    protected String getIgnoreBackendDirectivePrefix() {
-        return InTextDirectivesUtils.IGNORE_BACKEND_DIRECTIVE_PREFIX;
+    protected String[] getIgnoreBackendDirectivePrefix() {
+        return InTextDirectivesUtils.IGNORE_BACKEND_DIRECTIVE_PREFIXES;
     }
 }
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
index 240c3c5aecd..9da2ef4df60 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
@@ -63,7 +63,7 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static org.jetbrains.kotlin.test.InTextDirectivesUtils.IGNORE_BACKEND_DIRECTIVE_PREFIX;
+import static org.jetbrains.kotlin.test.InTextDirectivesUtils.IGNORE_BACKEND_DIRECTIVE_PREFIXES;
 import static org.jetbrains.kotlin.test.InTextDirectivesUtils.isIgnoredTarget;
 
 public class KotlinTestUtils {
@@ -431,7 +431,7 @@ public class KotlinTestUtils {
     }
 
     public static void runTest(@NotNull DoTest test, @NotNull TestCase testCase, @TestDataFile String testDataFile) throws Exception {
-        runTestImpl(testWithCustomIgnoreDirective(test, TargetBackend.ANY, IGNORE_BACKEND_DIRECTIVE_PREFIX), testCase, testDataFile);
+        runTestImpl(testWithCustomIgnoreDirective(test, TargetBackend.ANY, IGNORE_BACKEND_DIRECTIVE_PREFIXES), testCase, testDataFile);
     }
 
     public static void runTest(@NotNull TestCase testCase, @NotNull Function0<Unit> test) {
@@ -469,7 +469,7 @@ public class KotlinTestUtils {
     // * sometimes, for too common/general names, it shows many variants to navigate
     // * it adds an additional step for navigation -- you must choose an exact file to navigate
     public static void runTest0(DoTest test, TargetBackend targetBackend, String testDataFilePath) throws Exception {
-        runTestImpl(testWithCustomIgnoreDirective(test, targetBackend, IGNORE_BACKEND_DIRECTIVE_PREFIX), null, testDataFilePath);
+        runTestImpl(testWithCustomIgnoreDirective(test, targetBackend, IGNORE_BACKEND_DIRECTIVE_PREFIXES), null, testDataFilePath);
     }
 
     private static void runTestImpl(@NotNull DoTest test, @Nullable TestCase testCase, String testDataFilePath) throws Exception {
@@ -504,11 +504,11 @@ public class KotlinTestUtils {
         return false;
     }
 
-    private static DoTest testWithCustomIgnoreDirective(DoTest test, TargetBackend targetBackend, String ignoreDirective) throws Exception {
+    private static DoTest testWithCustomIgnoreDirective(DoTest test, TargetBackend targetBackend, String... ignoreDirectives) throws Exception {
         return filePath -> {
             File testDataFile = new File(filePath);
 
-            boolean isIgnored = isIgnoredTarget(targetBackend, testDataFile, ignoreDirective);
+            boolean isIgnored = isIgnoredTarget(targetBackend, testDataFile, ignoreDirectives);
 
             if (DONT_IGNORE_TESTS_WORKING_ON_COMPATIBLE_BACKEND) {
                 // Only ignore if it is ignored for both backends
@@ -523,7 +523,7 @@ public class KotlinTestUtils {
             catch (Throwable e) {
                 if (!isIgnored && AUTOMATICALLY_MUTE_FAILED_TESTS) {
                     String text = KtTestUtil.doLoadFile(testDataFile);
-                    String directive = ignoreDirective + targetBackend.name() + "\n";
+                    String directive = ignoreDirectives[0] + targetBackend.name() + "\n";
 
                     String newText;
                     if (text.startsWith("// !")) {
@@ -556,23 +556,28 @@ public class KotlinTestUtils {
                 if (PRINT_STACKTRACE_FOR_IGNORED_TESTS) {
                     e.printStackTrace();
                 } else {
-                    System.err.println("MUTED TEST with `" + ignoreDirective + "`");
+                    System.err.println("MUTED TEST with `" + ignoreDirectives[0] + "`");
                 }
                 return;
             }
 
             if (isIgnored) {
+                StringBuilder directivesToRemove = new StringBuilder();
                 if (AUTOMATICALLY_UNMUTE_PASSED_TESTS) {
-                    String text = KtTestUtil.doLoadFile(testDataFile);
-                    String directive = ignoreDirective + targetBackend.name();
-                    String newText = Pattern.compile("^" + directive + "\n", Pattern.MULTILINE).matcher(text).replaceAll("");
-                    if (!newText.equals(text)) {
-                        System.err.println("\"" + directive + "\" was removed from \"" + testDataFile + "\"");
-                        FileUtil.writeToFile(testDataFile, newText);
+                    for (String ignoreDirective: ignoreDirectives){
+                        String text = KtTestUtil.doLoadFile(testDataFile);
+                        String directive = ignoreDirective + targetBackend.name();
+                        directivesToRemove.append(directive);
+                        directivesToRemove.append(", ");
+                        String newText = Pattern.compile("^" + directive + "\n", Pattern.MULTILINE).matcher(text).replaceAll("");
+                        if (!newText.equals(text)) {
+                            System.err.println("\"" + directive + "\" was removed from \"" + testDataFile + "\"");
+                            FileUtil.writeToFile(testDataFile, newText);
+                        }
                     }
                 }
 
-                throw new AssertionError(String.format("Looks like this test can be unmuted. Remove \"%s%s\" directive.", ignoreDirective, targetBackend));
+                throw new AssertionError(String.format("Looks like this test can be unmuted. Remove \"%s\" directive.", directivesToRemove.toString()));
             }
         };
     }
diff --git a/js/js.translator/testData/box/native/passExtLambdaToNative.kt b/js/js.translator/testData/box/native/passExtLambdaToNative.kt
index 3cc4ed67a1f..a6cd9dfc0d1 100644
--- a/js/js.translator/testData/box/native/passExtLambdaToNative.kt
+++ b/js/js.translator/testData/box/native/passExtLambdaToNative.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND: JS_IR
+// IGNORE_BACKEND_K1: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: Unmute when extension functions are supported in external declarations.
 // IGNORE_BACKEND: JS
diff --git a/js/js.translator/testData/box/native/passMemberOrExtToNative.kt b/js/js.translator/testData/box/native/passMemberOrExtToNative.kt
index b5e857a8400..409d72e01ad 100644
--- a/js/js.translator/testData/box/native/passMemberOrExtToNative.kt
+++ b/js/js.translator/testData/box/native/passMemberOrExtToNative.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND: JS_IR
+// IGNORE_BACKEND_K1: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // TODO: Unmute when extension functions are supported in external declarations.
 // IGNORE_BACKEND: JS
diff --git a/plugins/allopen/testData/bytecodeListing/anonymousObject.kt b/plugins/allopen/testData/bytecodeListing/anonymousObject.kt
index c7c8c592da6..5fe6ea2be5b 100644
--- a/plugins/allopen/testData/bytecodeListing/anonymousObject.kt
+++ b/plugins/allopen/testData/bytecodeListing/anonymousObject.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 //   FIR version does not go inside bodies
 //   Also it's quiestionable do we even need to transform local classes and anonymous objects
 annotation class AllOpen
diff --git a/plugins/allopen/testData/bytecodeListing/metaAnnotation.kt b/plugins/allopen/testData/bytecodeListing/metaAnnotation.kt
index f891df84c63..98f8e6e55cc 100644
--- a/plugins/allopen/testData/bytecodeListing/metaAnnotation.kt
+++ b/plugins/allopen/testData/bytecodeListing/metaAnnotation.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 //   FIR version does not support double-transitive annotations by design
 annotation class AllOpen
 
diff --git a/plugins/kotlinx-serialization/testData/boxIr/intrinsicsBox.kt b/plugins/kotlinx-serialization/testData/boxIr/intrinsicsBox.kt
index 1b5be590af7..cb88655eaa2 100644
--- a/plugins/kotlinx-serialization/testData/boxIr/intrinsicsBox.kt
+++ b/plugins/kotlinx-serialization/testData/boxIr/intrinsicsBox.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // TARGET_BACKEND: JVM_IR
 
 // WITH_STDLIB
diff --git a/plugins/kotlinx-serialization/testData/boxIr/multimoduleInheritance.kt b/plugins/kotlinx-serialization/testData/boxIr/multimoduleInheritance.kt
index 00abcb216e4..7aa87ff4646 100644
--- a/plugins/kotlinx-serialization/testData/boxIr/multimoduleInheritance.kt
+++ b/plugins/kotlinx-serialization/testData/boxIr/multimoduleInheritance.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // TARGET_BACKEND: JVM_IR
 
 // WITH_STDLIB
diff --git a/plugins/kotlinx-serialization/testData/boxWithoutRuntime/basic.kt b/plugins/kotlinx-serialization/testData/boxWithoutRuntime/basic.kt
index a22d8a3857a..acf1fcd40fe 100644
--- a/plugins/kotlinx-serialization/testData/boxWithoutRuntime/basic.kt
+++ b/plugins/kotlinx-serialization/testData/boxWithoutRuntime/basic.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 // TARGET_BACKEND: JVM_IR
 
 // WITH_STDLIB
diff --git a/plugins/parcelize/parcelize-compiler/testData/box/customSerializerSimple.kt b/plugins/parcelize/parcelize-compiler/testData/box/customSerializerSimple.kt
index 2bffb874ed4..421cda48b0e 100644
--- a/plugins/parcelize/parcelize-compiler/testData/box/customSerializerSimple.kt
+++ b/plugins/parcelize/parcelize-compiler/testData/box/customSerializerSimple.kt
@@ -1,6 +1,6 @@
 // WITH_STDLIB
 // fir doesn't support annotations with type arguments
-// IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND_K2: JVM_IR
 
 @file:JvmName("TestKt")
 package test