diff --git a/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/jvmInlineExpectValueClass.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/jvmInlineExpectValueClass.fir.kt
deleted file mode 100644
index 4fcdf8e4ca9..00000000000
--- a/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/jvmInlineExpectValueClass.fir.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-// !LANGUAGE: +MultiPlatformProjects
-// SKIP_TXT
-// MODULE: m1-common
-// FILE: common.kt
-
-package kotlin.jvm
-
-annotation class JvmInline
-
-expect value class VC(val a: Any)
-
-// MODULE: m2-jvm(m1-common)
-// FILE: jvm.kt
-
-package kotlin.jvm
-
-@JvmInline
-actual value class VC(val a: Any)
diff --git a/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/jvmInlineExpectValueClass.kt b/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/jvmInlineExpectValueClass.kt
index 4fcdf8e4ca9..625a959438e 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/jvmInlineExpectValueClass.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/jvmInlineExpectValueClass.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !LANGUAGE: +MultiPlatformProjects
 // SKIP_TXT
 // MODULE: m1-common
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/allowNullOperatorsForResult_1_3.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/allowNullOperatorsForResult_1_3.fir.kt
deleted file mode 100644
index ed5dc2c90dd..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/allowNullOperatorsForResult_1_3.fir.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-// !LANGUAGE: -AllowNullOperatorsForResult
-// !DIAGNOSTICS: -UNUSED_EXPRESSION
-
-fun test(r: Result<Int>?) {
-    r ?: 0
-    r?.isFailure
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/allowNullOperatorsForResult_1_3.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/allowNullOperatorsForResult_1_3.kt
index ed5dc2c90dd..ab841279b84 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/allowNullOperatorsForResult_1_3.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/allowNullOperatorsForResult_1_3.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !LANGUAGE: -AllowNullOperatorsForResult
 // !DIAGNOSTICS: -UNUSED_EXPRESSION
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/allowResultInReturnType_1_3.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/allowResultInReturnType_1_3.fir.kt
deleted file mode 100644
index 6a97c6b91ef..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/allowResultInReturnType_1_3.fir.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-// !LANGUAGE: +InlineClasses -AllowResultInReturnType
-
-fun result(): Result<Int> = TODO()
-val resultP: Result<Int> = result()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/allowResultInReturnType_1_3.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/allowResultInReturnType_1_3.kt
index 6a97c6b91ef..a1cbed33280 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/allowResultInReturnType_1_3.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/allowResultInReturnType_1_3.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !LANGUAGE: +InlineClasses -AllowResultInReturnType
 
 fun result(): Result<Int> = TODO()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/usageOfResultTypeWithNullableOperators.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/usageOfResultTypeWithNullableOperators.fir.kt
deleted file mode 100644
index 968a83ad72e..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/usageOfResultTypeWithNullableOperators.fir.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_EXPRESSION
-// !LANGUAGE: -AllowNullOperatorsForResult -AllowResultInReturnType
-
-fun <T> id(x: T): T = x
-
-private val asFun: () -> Result<Int>? = TODO()
-private val Int.intResult: Result<Int>?
-    get() = null
-
-fun returnInt(): Int? = 0
-
-
-fun nullableOperators(r1: Result<Int>?, b: Boolean) {
-    if (b) {
-        r1!!
-        asFun()!!
-        returnInt()?.intResult!!.toString()
-    }
-
-    if (b) {
-        id(r1)!!
-    }
-
-    if (b) {
-        r1?.toString()
-        r1?.let { }
-        returnInt()?.intResult?.toString()
-        asFun()?.toString()
-        id(r1)?.toString()
-    }
-
-    if (b) {
-        r1 ?: 0
-        r1 ?: r1
-        asFun() ?: r1 ?: 0
-        id(asFun()) ?: 0
-
-        returnInt() ?: returnInt() ?: asFun() ?: 0
-    }
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/usageOfResultTypeWithNullableOperators.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/usageOfResultTypeWithNullableOperators.kt
index 968a83ad72e..e2a40134004 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/usageOfResultTypeWithNullableOperators.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/usageOfResultTypeWithNullableOperators.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_EXPRESSION
 // !LANGUAGE: -AllowNullOperatorsForResult -AllowResultInReturnType