diff --git a/compiler/testData/codegen/box/builderInference/issues/kt50453.kt b/compiler/testData/codegen/box/builderInference/issues/kt50453.kt
index a7281c6b680..8f4783573cd 100644
--- a/compiler/testData/codegen/box/builderInference/issues/kt50453.kt
+++ b/compiler/testData/codegen/box/builderInference/issues/kt50453.kt
@@ -1,12 +1,9 @@
 // ISSUE: KT-50453
 
 // IGNORE_LIGHT_ANALYSIS
-// IGNORE_BACKEND_K1: ANY
+// IGNORE_BACKEND: ANY
 // REASON: red code (see corresponding diagnostic test)
 
-// IGNORE_BACKEND_K2: JVM_IR, WASM
-// REASON: run-time failure (java.lang.ClassCastException: TargetType cannot be cast to DifferentType @ Kt50453Kt$box$1.invoke)
-
 fun box(): String {
     build {
         setTypeVariable(TargetType())
diff --git a/compiler/testData/codegen/box/builderInference/issues/kt54664.kt b/compiler/testData/codegen/box/builderInference/issues/kt54664.kt
index f02fc6cb160..12f093cb694 100644
--- a/compiler/testData/codegen/box/builderInference/issues/kt54664.kt
+++ b/compiler/testData/codegen/box/builderInference/issues/kt54664.kt
@@ -1,12 +1,9 @@
 // ISSUE: KT-54664
 
 // IGNORE_LIGHT_ANALYSIS
-// IGNORE_BACKEND_K1: ANY
+// IGNORE_BACKEND: ANY
 // REASON: red code (see corresponding diagnostic test)
 
-// IGNORE_BACKEND_K2: JVM_IR, WASM
-// REASON: run-time failure (java.lang.ClassCastException: TargetType cannot be cast to DifferentType @ Kt54664Kt.consumeDifferentTypeCallable)
-
 fun box(): String {
     build {
         setTypeVariable(TargetType())
diff --git a/compiler/testData/codegen/box/builderInference/issues/kt55056.kt b/compiler/testData/codegen/box/builderInference/issues/kt55056.kt
index 5c305986b4c..32eb112fd34 100644
--- a/compiler/testData/codegen/box/builderInference/issues/kt55056.kt
+++ b/compiler/testData/codegen/box/builderInference/issues/kt55056.kt
@@ -1,12 +1,9 @@
 // ISSUE: KT-55056
 
 // IGNORE_LIGHT_ANALYSIS
-// IGNORE_BACKEND_K1: ANY
+// IGNORE_BACKEND: ANY
 // REASON: red code (see corresponding diagnostic test)
 
-// IGNORE_BACKEND_K2: JVM_IR, WASM
-// REASON: run-time failure (java.lang.ClassCastException: TargetType cannot be cast to DifferentType @ Kt55056Kt$box$1.invoke)
-
 fun box(): String {
     build {
         setTypeVariable(TargetType())
diff --git a/compiler/testData/codegen/box/builderInference/issues/kt56949.kt b/compiler/testData/codegen/box/builderInference/issues/kt56949.kt
index cb80c3ac8d9..814b824aa7f 100644
--- a/compiler/testData/codegen/box/builderInference/issues/kt56949.kt
+++ b/compiler/testData/codegen/box/builderInference/issues/kt56949.kt
@@ -1,12 +1,9 @@
 // ISSUE: KT-56949
 
 // IGNORE_LIGHT_ANALYSIS
-// IGNORE_BACKEND_K1: ANY
+// IGNORE_BACKEND: ANY
 // REASON: red code (see corresponding diagnostic test)
 
-// IGNORE_BACKEND_K2: JVM_IR, WASM
-// REASON: run-time failure (java.lang.ClassCastException: TargetType cannot be cast to DifferentType @ Kt56949Kt$box$1.invoke)
-
 fun box(): String {
     build {
         setTypeVariable(TargetType())
diff --git a/compiler/testData/codegen/box/builderInference/issues/kt57707.kt b/compiler/testData/codegen/box/builderInference/issues/kt57707.kt
index 11b64779798..4b8fd916206 100644
--- a/compiler/testData/codegen/box/builderInference/issues/kt57707.kt
+++ b/compiler/testData/codegen/box/builderInference/issues/kt57707.kt
@@ -1,7 +1,7 @@
 // ISSUE: KT-57707
 
 // IGNORE_LIGHT_ANALYSIS
-// IGNORE_BACKEND_K1: ANY
+// IGNORE_BACKEND: ANY
 // REASON: red code (see corresponding diagnostic test)
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/builderInference/issues/kt59426.kt b/compiler/testData/codegen/box/builderInference/issues/kt59426.kt
index e841fd9c427..028031a3310 100644
--- a/compiler/testData/codegen/box/builderInference/issues/kt59426.kt
+++ b/compiler/testData/codegen/box/builderInference/issues/kt59426.kt
@@ -1,12 +1,9 @@
 // ISSUE: KT-59426
 
 // IGNORE_LIGHT_ANALYSIS
-// IGNORE_BACKEND_K1: ANY
+// IGNORE_BACKEND: ANY
 // REASON: red code (see corresponding diagnostic test)
 
-// IGNORE_BACKEND_K2: JVM_IR, WASM
-// REASON: run-time failure (java.lang.ClassCastException: DifferentType cannot be cast to TargetType @ Kt59426Kt.consumeBuildeeReceiver)
-
 fun box(): String {
     build {
         setTypeVariable(DifferentType())
diff --git a/compiler/testData/codegen/box/builderInference/issues/kt63840a.kt b/compiler/testData/codegen/box/builderInference/issues/kt63840a.kt
index 75e45569fdf..4aef087f788 100644
--- a/compiler/testData/codegen/box/builderInference/issues/kt63840a.kt
+++ b/compiler/testData/codegen/box/builderInference/issues/kt63840a.kt
@@ -2,12 +2,9 @@
 // WITH_STDLIB
 
 // IGNORE_LIGHT_ANALYSIS
-// IGNORE_BACKEND_K1: ANY
+// IGNORE_BACKEND: ANY
 // REASON: red code (see corresponding diagnostic test)
 
-// IGNORE_BACKEND_K2: JVM_IR, WASM
-// REASON: run-time failure (java.lang.ArrayStoreException: TargetType @ Kt63840aKt$box$1.invoke)
-
 fun box(): String {
     build {
         select(
diff --git a/compiler/testData/codegen/box/builderInference/issues/kt63840b.kt b/compiler/testData/codegen/box/builderInference/issues/kt63840b.kt
index 729b7fbf269..6a4c1a54bba 100644
--- a/compiler/testData/codegen/box/builderInference/issues/kt63840b.kt
+++ b/compiler/testData/codegen/box/builderInference/issues/kt63840b.kt
@@ -1,12 +1,9 @@
 // ISSUE: KT-63840
 
 // IGNORE_LIGHT_ANALYSIS
-// IGNORE_BACKEND_K1: ANY
+// IGNORE_BACKEND: ANY
 // REASON: red code (see corresponding diagnostic test)
 
-// IGNORE_BACKEND_K2: JVM_IR
-// REASON: run-time failure (java.lang.ClassCastException: TargetType cannot be cast to DifferentType @ Kt63840bKt$box$1.invoke)
-
 fun box(): String {
     build {
         if (true)
diff --git a/compiler/testData/codegen/box/builderInference/issues/kt63840c.kt b/compiler/testData/codegen/box/builderInference/issues/kt63840c.kt
index ddac18b31a6..e9fd45da643 100644
--- a/compiler/testData/codegen/box/builderInference/issues/kt63840c.kt
+++ b/compiler/testData/codegen/box/builderInference/issues/kt63840c.kt
@@ -1,12 +1,9 @@
 // ISSUE: KT-63840
 
 // IGNORE_LIGHT_ANALYSIS
-// IGNORE_BACKEND_K1: ANY
+// IGNORE_BACKEND: ANY
 // REASON: red code (see corresponding diagnostic test)
 
-// IGNORE_BACKEND_K2: JVM_IR
-// REASON: run-time failure (java.lang.ClassCastException: TargetType cannot be cast to DifferentType @ Kt63840cKt$box$1.invoke)
-
 fun box(): String {
     build {
         when {
diff --git a/compiler/testData/diagnostics/tests/builderInference/issues/kt50453.fir.kt b/compiler/testData/diagnostics/tests/builderInference/issues/kt50453.fir.kt
index 9136a144736..76e1cfe9e9a 100644
--- a/compiler/testData/diagnostics/tests/builderInference/issues/kt50453.fir.kt
+++ b/compiler/testData/diagnostics/tests/builderInference/issues/kt50453.fir.kt
@@ -4,7 +4,7 @@
 fun test() {
     val buildee = build {
         setTypeVariable(TargetType())
-        consume(getTypeVariable())
+        consume(<!ARGUMENT_TYPE_MISMATCH!>getTypeVariable()<!>)
     }
     // exact type equality check — turns unexpected compile-time behavior into red code
     // considered to be non-user-reproducible code for the purposes of these tests
diff --git a/compiler/testData/diagnostics/tests/builderInference/issues/kt54664.fir.kt b/compiler/testData/diagnostics/tests/builderInference/issues/kt54664.fir.kt
index f820a1c0695..3ec10d5b4b3 100644
--- a/compiler/testData/diagnostics/tests/builderInference/issues/kt54664.fir.kt
+++ b/compiler/testData/diagnostics/tests/builderInference/issues/kt54664.fir.kt
@@ -4,7 +4,7 @@
 fun test() {
     val buildee = build {
         setTypeVariable(TargetType())
-        consumeDifferentTypeCallable(this::getTypeVariable)
+        consumeDifferentTypeCallable(<!ARGUMENT_TYPE_MISMATCH!>this::getTypeVariable<!>)
     }
     // exact type equality check — turns unexpected compile-time behavior into red code
     // considered to be non-user-reproducible code for the purposes of these tests
diff --git a/compiler/testData/diagnostics/tests/builderInference/issues/kt55056.fir.kt b/compiler/testData/diagnostics/tests/builderInference/issues/kt55056.fir.kt
index 3fb787e9a06..a757b0af710 100644
--- a/compiler/testData/diagnostics/tests/builderInference/issues/kt55056.fir.kt
+++ b/compiler/testData/diagnostics/tests/builderInference/issues/kt55056.fir.kt
@@ -2,10 +2,10 @@
 // CHECK_TYPE_WITH_EXACT
 
 fun test() {
-    val buildee = build {
+    val buildee = <!NEW_INFERENCE_ERROR!>build {
         setTypeVariable(TargetType())
         consumeDifferentType(extensionReplaceOutProjectedTypeVariable(DifferentType()))
-    }
+    }<!>
     // exact type equality check — turns unexpected compile-time behavior into red code
     // considered to be non-user-reproducible code for the purposes of these tests
     checkExactType<Buildee<TargetType>>(buildee)
diff --git a/compiler/testData/diagnostics/tests/builderInference/issues/kt56949.fir.kt b/compiler/testData/diagnostics/tests/builderInference/issues/kt56949.fir.kt
index 42fd1be2c67..fe7f591a639 100644
--- a/compiler/testData/diagnostics/tests/builderInference/issues/kt56949.fir.kt
+++ b/compiler/testData/diagnostics/tests/builderInference/issues/kt56949.fir.kt
@@ -2,10 +2,10 @@
 // CHECK_TYPE_WITH_EXACT
 
 fun test() {
-    val buildee = build {
+    val buildee = <!NEW_INFERENCE_ERROR!>build {
         setTypeVariable(TargetType())
         consumeDifferentTypeSubtype(getTypeVariable())
-    }
+    }<!>
     // exact type equality check — turns unexpected compile-time behavior into red code
     // considered to be non-user-reproducible code for the purposes of these tests
     checkExactType<Buildee<TargetType>>(buildee)
diff --git a/compiler/testData/diagnostics/tests/builderInference/issues/kt57707.fir.kt b/compiler/testData/diagnostics/tests/builderInference/issues/kt57707.fir.kt
index efd668d09ff..afa087e6efa 100644
--- a/compiler/testData/diagnostics/tests/builderInference/issues/kt57707.fir.kt
+++ b/compiler/testData/diagnostics/tests/builderInference/issues/kt57707.fir.kt
@@ -2,10 +2,10 @@
 // CHECK_TYPE_WITH_EXACT
 
 fun test() {
-    val buildee = build {
+    val buildee = <!NEW_INFERENCE_ERROR!>build {
         setTypeVariable(TargetType())
         extensionSetOutProjectedTypeVariable(DifferentType())
-    }
+    }<!>
     // exact type equality check — turns unexpected compile-time behavior into red code
     // considered to be non-user-reproducible code for the purposes of these tests
     checkExactType<Buildee<TargetType>>(buildee)
diff --git a/compiler/testData/diagnostics/tests/builderInference/issues/kt59426.fir.kt b/compiler/testData/diagnostics/tests/builderInference/issues/kt59426.fir.kt
index 05f50f3bf0b..045ee1d902d 100644
--- a/compiler/testData/diagnostics/tests/builderInference/issues/kt59426.fir.kt
+++ b/compiler/testData/diagnostics/tests/builderInference/issues/kt59426.fir.kt
@@ -2,10 +2,10 @@
 // CHECK_TYPE_WITH_EXACT
 
 fun test() {
-    val buildee = build {
+    val buildee = <!NEW_INFERENCE_ERROR!>build {
         setTypeVariable(DifferentType())
         consumeBuildeeReceiver()
-    }
+    }<!>
     // exact type equality check — turns unexpected compile-time behavior into red code
     // considered to be non-user-reproducible code for the purposes of these tests
     checkExactType<Buildee<TargetType>>(buildee)
@@ -31,4 +31,4 @@ fun Buildee<TargetType>.consumeBuildeeReceiver() {
 
 fun <PTV> build(instructions: Buildee<PTV>.() -> Unit): Buildee<PTV> {
     return Buildee<PTV>().apply(instructions)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/builderInference/issues/kt61310.fir.kt b/compiler/testData/diagnostics/tests/builderInference/issues/kt61310.fir.kt
index 755d7b688d1..346d4773b6f 100644
--- a/compiler/testData/diagnostics/tests/builderInference/issues/kt61310.fir.kt
+++ b/compiler/testData/diagnostics/tests/builderInference/issues/kt61310.fir.kt
@@ -2,9 +2,9 @@
 // CHECK_TYPE_WITH_EXACT
 
 fun test() {
-    val buildee = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>build<!> {
+    val buildee = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>build<!> {
         if (true) {
-            setTypeVariable(<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>GenericBox<!>())
+            setTypeVariable(<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>GenericBox<!>())
         } else {
             setTypeVariable(GenericBox<TargetType>())
         }
diff --git a/compiler/testData/diagnostics/tests/builderInference/issues/kt63648.fir.kt b/compiler/testData/diagnostics/tests/builderInference/issues/kt63648.fir.kt
index bcbb7767e3b..860d8996bd6 100644
--- a/compiler/testData/diagnostics/tests/builderInference/issues/kt63648.fir.kt
+++ b/compiler/testData/diagnostics/tests/builderInference/issues/kt63648.fir.kt
@@ -2,10 +2,10 @@
 // CHECK_TYPE_WITH_EXACT
 
 fun test() {
-    val buildee = build {
+    val buildee = <!NEW_INFERENCE_ERROR!>build {
         setTypeVariable(TargetType())
         <!BUILDER_INFERENCE_STUB_RECEIVER!>getTypeVariable().consumeDifferentTypeReceiver()<!>
-    }
+    }<!>
     // exact type equality check — turns unexpected compile-time behavior into red code
     // considered to be non-user-reproducible code for the purposes of these tests
     checkExactType<Buildee<TargetType>>(buildee)
diff --git a/compiler/testData/diagnostics/tests/builderInference/issues/kt63733.fir.kt b/compiler/testData/diagnostics/tests/builderInference/issues/kt63733.fir.kt
index 7617d95762c..00517c9ae0b 100644
--- a/compiler/testData/diagnostics/tests/builderInference/issues/kt63733.fir.kt
+++ b/compiler/testData/diagnostics/tests/builderInference/issues/kt63733.fir.kt
@@ -8,10 +8,10 @@ fun test() {
         setBoundedTypeVariable(TargetType())
         setBoundedTypeVariable(DifferentType())
     }
-    val buildee = <!NEW_INFERENCE_ERROR!>boundedBuild {
+    val buildee = boundedBuild {
         setBoundedTypeVariable(TargetType())
-        setBoundedTypeVariable(DifferentType())
-    }<!>
+        setBoundedTypeVariable(<!ARGUMENT_TYPE_MISMATCH!>DifferentType()<!>)
+    }
     // exact type equality check — turns unexpected compile-time behavior into red code
     // considered to be non-user-reproducible code for the purposes of these tests
     checkExactType<BoundedBuildee<TargetType>>(<!ARGUMENT_TYPE_MISMATCH("BoundedBuildee<TargetType>; BoundedBuildee<kotlin.Any>")!>buildee<!>)
diff --git a/compiler/testData/diagnostics/tests/builderInference/issues/kt63840a.fir.kt b/compiler/testData/diagnostics/tests/builderInference/issues/kt63840a.fir.kt
index 79283de21f9..adda3ffa730 100644
--- a/compiler/testData/diagnostics/tests/builderInference/issues/kt63840a.fir.kt
+++ b/compiler/testData/diagnostics/tests/builderInference/issues/kt63840a.fir.kt
@@ -3,12 +3,12 @@
 // WITH_STDLIB
 
 fun test() {
-    val buildee = build {
+    val buildee = <!NEW_INFERENCE_ERROR!>build {
         select(
             replaceTypeVariable(TargetType()),
             DifferentType()
         )
-    }
+    }<!>
     // exact type equality check — turns unexpected compile-time behavior into red code
     // considered to be non-user-reproducible code for the purposes of these tests
     checkExactType<Buildee<TargetType>>(buildee)
diff --git a/compiler/testData/diagnostics/tests/builderInference/issues/kt63840b.fir.kt b/compiler/testData/diagnostics/tests/builderInference/issues/kt63840b.fir.kt
index b5641d28760..598b3511415 100644
--- a/compiler/testData/diagnostics/tests/builderInference/issues/kt63840b.fir.kt
+++ b/compiler/testData/diagnostics/tests/builderInference/issues/kt63840b.fir.kt
@@ -2,12 +2,12 @@
 // CHECK_TYPE_WITH_EXACT
 
 fun test() {
-    val buildee = build {
+    val buildee = <!NEW_INFERENCE_ERROR!>build {
         if (true)
             replaceTypeVariable(TargetType())
         else
             DifferentType()
-    }
+    }<!>
     // exact type equality check — turns unexpected compile-time behavior into red code
     // considered to be non-user-reproducible code for the purposes of these tests
     checkExactType<Buildee<TargetType>>(buildee)
diff --git a/compiler/testData/diagnostics/tests/builderInference/issues/kt63840c.fir.kt b/compiler/testData/diagnostics/tests/builderInference/issues/kt63840c.fir.kt
index e254c838b96..223c7a69324 100644
--- a/compiler/testData/diagnostics/tests/builderInference/issues/kt63840c.fir.kt
+++ b/compiler/testData/diagnostics/tests/builderInference/issues/kt63840c.fir.kt
@@ -2,12 +2,12 @@
 // CHECK_TYPE_WITH_EXACT
 
 fun test() {
-    val buildee = build {
+    val buildee = <!NEW_INFERENCE_ERROR!>build {
         when {
             true -> replaceTypeVariable(TargetType())
             else -> DifferentType()
         }
-    }
+    }<!>
     // exact type equality check — turns unexpected compile-time behavior into red code
     // considered to be non-user-reproducible code for the purposes of these tests
     checkExactType<Buildee<TargetType>>(buildee)