diff --git a/compiler/testData/diagnostics/tests/typeParameters/implicitNothingInReturnPosition.fir.kt b/compiler/testData/diagnostics/tests/typeParameters/implicitNothingInReturnPosition.fir.kt
index d7962a6e56e..ebe07df208b 100644
--- a/compiler/testData/diagnostics/tests/typeParameters/implicitNothingInReturnPosition.fir.kt
+++ b/compiler/testData/diagnostics/tests/typeParameters/implicitNothingInReturnPosition.fir.kt
@@ -39,7 +39,7 @@ class Context<T>
 fun <T> Any.decodeIn(typeFrom: Context<in T>): T = something()
 
 fun <T> Any?.decodeOut1(typeFrom: Context<out T>): T {
-    return <!RETURN_TYPE_MISMATCH!>this?.decodeIn(typeFrom) ?: kotlin.Unit<!>
+    return this?.decodeIn(typeFrom) ?: kotlin.Unit
 }
 
 fun <T> Any.decodeOut2(typeFrom: Context<out T>): T {
diff --git a/compiler/testData/diagnostics/tests/when/kt9972.fir.kt b/compiler/testData/diagnostics/tests/when/kt9972.fir.kt
index 12843090fd3..c603b5ede70 100644
--- a/compiler/testData/diagnostics/tests/when/kt9972.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/kt9972.fir.kt
@@ -20,9 +20,9 @@ fun test1(): Int {
 }
 
 fun test2(): Int {
-    val x: String = <!INITIALIZER_TYPE_MISMATCH!>when {
+    val x: String = when {
                         true -> Any()
                         else -> null
-                    } ?: return 0<!>
+                    } ?: return 0
     return x.hashCode()
 }