diff --git a/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/NonPredictableSmartCast1.fir.kt b/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/NonPredictableSmartCast1.fir.kt
deleted file mode 100644
index 5cb05fbff325..000000000000
--- a/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/NonPredictableSmartCast1.fir.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-// FIR_COMPARISON
-import java.io.File
-
-class C : File("") {
-    override fun isFile(): Boolean {
-        return true
-    }
-}
-
-fun f(pair: Pair<out File, out Any>) {
-    if (pair.first !is C) return
-    pair.first.<caret>
-}
-
-// EXIST: {"lookupString":"absolutePath","tailText":" (from getAbsolutePath())","typeText":"String!","attributes":"bold","allLookupStrings":"absolutePath, getAbsolutePath","itemText":"absolutePath", icon:"org/jetbrains/kotlin/idea/icons/field_value.svg"}
-// EXIST: { lookupString: "isFile", itemText: "isFile", tailText: " (from isFile())", typeText: "Boolean", attributes: "bold", icon: "org/jetbrains/kotlin/idea/icons/field_value.svg"}
diff --git a/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/NonPredictableSmartCast1.kt b/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/NonPredictableSmartCast1.kt
index 1f2e7fb8beee..1a5f0a16f57e 100644
--- a/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/NonPredictableSmartCast1.kt
+++ b/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/NonPredictableSmartCast1.kt
@@ -1,4 +1,3 @@
-// FIR_COMPARISON
 import java.io.File
 
 class C : File("") {
diff --git a/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/NonPredictableSmartCast2.fir.kt b/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/NonPredictableSmartCast2.fir.kt
deleted file mode 100644
index 35c27dd17e5c..000000000000
--- a/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/NonPredictableSmartCast2.fir.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-// FIR_COMPARISON
-import java.io.File
-
-class C : File("") {
-    val v: Int = 0
-}
-
-fun f(pair: Pair<out Any, out Any>) {
-    if (pair.first !is C) return
-    pair.first.<caret>
-}
-
-// EXIST: {"lookupString":"absolutePath","tailText":" (from getAbsolutePath())","typeText":"String!","attributes":"grayed","allLookupStrings":"absolutePath, getAbsolutePath","itemText":"absolutePath"}
diff --git a/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/NonPredictableSmartCast2.kt b/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/NonPredictableSmartCast2.kt
index 3bf7d64b66ab..5202072e5600 100644
--- a/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/NonPredictableSmartCast2.kt
+++ b/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/NonPredictableSmartCast2.kt
@@ -1,4 +1,3 @@
-// FIR_COMPARISON
 import java.io.File
 
 class C : File("") {
diff --git a/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/SyntheticJavaProperties1.fir.kt b/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/SyntheticJavaProperties1.fir.kt
deleted file mode 100644
index dfe7a6664d3f..000000000000
--- a/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/SyntheticJavaProperties1.fir.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-// FIR_COMPARISON
-import java.io.File
-
-class C : File("") {
-    val v: Int = 0
-
-    override fun isFile(): Boolean {
-        return true
-    }
-}
-
-fun foo(c: C) {
-    c.<caret>
-}
-
-// EXIST: {"lookupString":"absolutePath","tailText":" (from getAbsolutePath())","typeText":"String!","attributes":"","allLookupStrings":"absolutePath, getAbsolutePath","itemText":"absolutePath","icon":"org/jetbrains/kotlin/idea/icons/field_value.svg"}
-// EXIST: { lookupString: "isFile", itemText: "isFile", tailText: " (from isFile())", typeText: "Boolean", attributes: "", icon: "org/jetbrains/kotlin/idea/icons/field_value.svg"}
-// EXIST: { lookupString: "v", itemText: "v", attributes: "bold", icon: "org/jetbrains/kotlin/idea/icons/field_value.svg"}
diff --git a/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/SyntheticJavaProperties1.kt b/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/SyntheticJavaProperties1.kt
index 69474a94c0d3..aeb3d9b7589e 100644
--- a/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/SyntheticJavaProperties1.kt
+++ b/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/SyntheticJavaProperties1.kt
@@ -1,4 +1,3 @@
-// FIR_COMPARISON
 import java.io.File
 
 class C : File("") {
diff --git a/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/SyntheticJavaProperties2.fir.kt b/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/SyntheticJavaProperties2.fir.kt
deleted file mode 100644
index 858bd93beb18..000000000000
--- a/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/SyntheticJavaProperties2.fir.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-// FIR_COMPARISON
-import java.io.File
-
-fun foo(file: File) {
-    file.<caret>
-}
-
-// EXIST: {"lookupString":"absolutePath","tailText":" (from getAbsolutePath())","typeText":"String!","attributes":"bold","allLookupStrings":"absolutePath, getAbsolutePath","itemText":"absolutePath","icon":"org/jetbrains/kotlin/idea/icons/field_value.svg"}
-// EXIST: { lookupString: "isFile", itemText: "isFile", tailText: " (from isFile())", typeText: "Boolean", attributes: "bold", icon: "org/jetbrains/kotlin/idea/icons/field_value.svg"}
diff --git a/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/SyntheticJavaProperties2.kt b/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/SyntheticJavaProperties2.kt
index e702746944ba..34cef7115cc5 100644
--- a/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/SyntheticJavaProperties2.kt
+++ b/plugins/kotlin/completion/testData/basic/java/boldOrGrayed/SyntheticJavaProperties2.kt
@@ -1,4 +1,3 @@
-// FIR_COMPARISON
 import java.io.File
 
 fun foo(file: File) {
diff --git a/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/AfterSuper.fir.kt b/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/AfterSuper.fir.kt
index 05070291f4c3..5218c9c46110 100644
--- a/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/AfterSuper.fir.kt
+++ b/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/AfterSuper.fir.kt
@@ -7,7 +7,7 @@ class A: File("") {
     }
 }
 
-// EXIST: {"lookupString":"absolutePath","tailText":" (from getAbsolutePath())","typeText":"String!"}
+// EXIST: {"lookupString":"absolutePath","tailText":" (from getAbsolutePath())","typeText":"String"}
 // ABSENT: getAbsolutePath
 
 /* K2 allows references to synthetic Java properties after super, see KT-55551 */
\ No newline at end of file
diff --git a/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/NullableReceiver.fir.kt b/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/NullableReceiver.fir.kt
deleted file mode 100644
index 2bfd7dde87e6..000000000000
--- a/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/NullableReceiver.fir.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-// FIR_COMPARISON
-import java.io.File
-
-fun foo(file: File?) {
-    file.<caret>
-}
-
-// EXIST: {"lookupString":"absolutePath","tailText":" (from getAbsolutePath())","typeText":"String!","attributes":"grayed","allLookupStrings":"absolutePath, getAbsolutePath","itemText":"absolutePath"}
-// ABSENT: getAbsolutePath
diff --git a/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/NullableReceiver.kt b/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/NullableReceiver.kt
index 0c4287ecbb3e..44776b949db5 100644
--- a/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/NullableReceiver.kt
+++ b/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/NullableReceiver.kt
@@ -1,4 +1,3 @@
-// FIR_COMPARISON
 import java.io.File
 
 fun foo(file: File?) {
diff --git a/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SafeCall.fir.kt b/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SafeCall.fir.kt
deleted file mode 100644
index 462932a14eb4..000000000000
--- a/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SafeCall.fir.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-// FIR_COMPARISON
-import java.io.File
-
-fun foo(file: File?) {
-    file?.<caret>
-}
-
-// EXIST: {"lookupString":"absolutePath","tailText":" (from getAbsolutePath())","typeText":"String!","attributes":"bold","allLookupStrings":"absolutePath, getAbsolutePath","itemText":"absolutePath"}
-// ABSENT: getAbsolutePath
diff --git a/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SafeCall.kt b/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SafeCall.kt
index f42b1c25492f..ed9225210f82 100644
--- a/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SafeCall.kt
+++ b/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SafeCall.kt
@@ -1,4 +1,3 @@
-// FIR_COMPARISON
 import java.io.File
 
 fun foo(file: File?) {
diff --git a/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SmartCast.fir.kt b/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SmartCast.fir.kt
deleted file mode 100644
index a92f28f4d279..000000000000
--- a/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SmartCast.fir.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-// FIR_COMPARISON
-import java.io.File
-
-fun foo(o: Any) {
-    if (o is File) {
-        o.<caret>
-    }
-}
-
-// EXIST: {"lookupString":"absolutePath","tailText":" (from getAbsolutePath())","typeText":"String!","attributes":"bold","allLookupStrings":"absolutePath, getAbsolutePath","itemText":"absolutePath"}
-// ABSENT: getAbsolutePath
diff --git a/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SmartCast.kt b/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SmartCast.kt
index e6749833e8a1..24dd6c050ef5 100644
--- a/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SmartCast.kt
+++ b/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SmartCast.kt
@@ -1,4 +1,3 @@
-// FIR_COMPARISON
 import java.io.File
 
 fun foo(o: Any) {
diff --git a/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SmartCast2.fir.kt b/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SmartCast2.fir.kt
deleted file mode 100644
index 9af469e8c835..000000000000
--- a/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SmartCast2.fir.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-// FIR_COMPARISON
-import java.io.File
-
-fun Any.foo() {
-    if (this is File) {
-        <caret>
-    }
-}
-
-// EXIST: {"lookupString":"absolutePath","tailText":" (from getAbsolutePath())","typeText":"String!","attributes":"bold","allLookupStrings":"absolutePath, getAbsolutePath","itemText":"absolutePath"}
-// ABSENT: getAbsolutePath
diff --git a/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SmartCast2.kt b/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SmartCast2.kt
index eacefb76bc59..4ade1fc25b97 100644
--- a/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SmartCast2.kt
+++ b/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SmartCast2.kt
@@ -1,4 +1,3 @@
-// FIR_COMPARISON
 import java.io.File
 
 fun Any.foo() {
diff --git a/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SyntheticExtensions1.fir.kt b/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SyntheticExtensions1.fir.kt
deleted file mode 100644
index 7276874aabb9..000000000000
--- a/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SyntheticExtensions1.fir.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-// FIR_COMPARISON
-import java.io.File
-
-fun foo(file: File) {
-    file.<caret>
-}
-
-// EXIST: {"lookupString":"absolutePath","tailText":" (from getAbsolutePath())","typeText":"String!","attributes":"bold","allLookupStrings":"absolutePath, getAbsolutePath","itemText":"absolutePath"}
-// ABSENT: getAbsolutePath
diff --git a/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SyntheticExtensions1.kt b/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SyntheticExtensions1.kt
index 6f7eb4333f97..ef055c68eab5 100644
--- a/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SyntheticExtensions1.kt
+++ b/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/SyntheticExtensions1.kt
@@ -1,4 +1,3 @@
-// FIR_COMPARISON
 import java.io.File
 
 fun foo(file: File) {
diff --git a/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/WithoutReceiver.fir.kt b/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/WithoutReceiver.fir.kt
deleted file mode 100644
index 8f6cd2fc444f..000000000000
--- a/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/WithoutReceiver.fir.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-// FIR_COMPARISON
-import java.io.*
-
-class A : File("") {
-    fun test() {
-        absolu<caret>
-    }
-}
-
-// EXIST: {"lookupString":"absolutePath","tailText":" (from getAbsolutePath())","typeText":"String!"}
-// ABSENT: getAbsolutePath
\ No newline at end of file
diff --git a/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/WithoutReceiver.kt b/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/WithoutReceiver.kt
index 4a0843e78fdf..d73875bf8124 100644
--- a/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/WithoutReceiver.kt
+++ b/plugins/kotlin/completion/testData/basic/java/syntheticExtensions/WithoutReceiver.kt
@@ -1,4 +1,3 @@
-// FIR_COMPARISON
 import java.io.*
 
 class A : File("") {
diff --git a/plugins/kotlin/completion/testData/basic/multifile/EnhancementFlexibleTypes/EnhancementFlexibleTypes.kt b/plugins/kotlin/completion/testData/basic/multifile/EnhancementFlexibleTypes/EnhancementFlexibleTypes.kt
index 8298b2e3f572..c763f8fa23e0 100644
--- a/plugins/kotlin/completion/testData/basic/multifile/EnhancementFlexibleTypes/EnhancementFlexibleTypes.kt
+++ b/plugins/kotlin/completion/testData/basic/multifile/EnhancementFlexibleTypes/EnhancementFlexibleTypes.kt
@@ -2,6 +2,5 @@ fun temp() {
     EnhancementFlexibleTypes.test<caret>
 }
 
-// IGNORE_K2
 // EXIST: { lookupString: "testNotNull", tailText:"(string: String)", icon: "Method"}
 // EXIST: { lookupString: "testNullable", tailText:"(string: String?)", icon: "Method"}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/androidxNotNull/foo/Impl.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/androidxNotNull/foo/Impl.kt
index f365dbda7e3e..61358138da14 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/androidxNotNull/foo/Impl.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/androidxNotNull/foo/Impl.kt
@@ -1,4 +1,4 @@
-// IGNORE_K2
+// FIR_IDENTICAL
 import foo.A
 
 class B : A() {
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/androidxNotNull/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/androidxNotNull/foo/Impl.kt.after
index 7cd0cce320ce..1f98f2183ae9 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/androidxNotNull/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/androidxNotNull/foo/Impl.kt.after
@@ -1,4 +1,4 @@
-// IGNORE_K2
+// FIR_IDENTICAL
 import foo.A
 
 class B : A() {
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertToBlockBody/implicitlyNonUnitFun.kt.after.k2 b/plugins/kotlin/idea/tests/testData/intentions/convertToBlockBody/implicitlyNonUnitFun.kt.after.k2
new file mode 100644
index 000000000000..952e1a815aee
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/intentions/convertToBlockBody/implicitlyNonUnitFun.kt.after.k2
@@ -0,0 +1,5 @@
+// WITH_STDLIB
+
+fun foo(): String {
+    return java.io.File("x").getAbsolutePath()
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertToBlockBody/overrideWithPlatformType.kt.after.k2 b/plugins/kotlin/idea/tests/testData/intentions/convertToBlockBody/overrideWithPlatformType.kt.after.k2
deleted file mode 100644
index 1feea3bb9164..000000000000
--- a/plugins/kotlin/idea/tests/testData/intentions/convertToBlockBody/overrideWithPlatformType.kt.after.k2
+++ /dev/null
@@ -1,10 +0,0 @@
-// WITH_STDLIB
-interface Foo {
-    fun foo(): String
-}
-
-class Bar : Foo {
-    override fun foo(): String? {
-        return java.lang.String.valueOf(42)
-    }
-}
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/Nullability.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/Nullability.kt
index 497a548cfeb6..3ce8eb02660e 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/Nullability.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/Nullability.kt
@@ -1,4 +1,3 @@
-// IGNORE_K2
 fun test() {
     J.foo(<caret>"1", "2", "3", "4", "5")
 }