diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionSafeCall.kt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionSafeCall.kt
index b71ebf7c011..c12b46161cd 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionSafeCall.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionSafeCall.kt
@@ -1,4 +1,4 @@
 fun bar(doIt: Int.() -> Int) {
     val i: Int? = 1
-    i?.<!INAPPLICABLE_CANDIDATE!>doIt<!>()
+    i?.doIt()
 }
diff --git a/compiler/testData/diagnostics/tests/ExtensionCallInvoke.fir.kt b/compiler/testData/diagnostics/tests/ExtensionCallInvoke.fir.kt
index 90619085ef0..9e365c301f0 100644
--- a/compiler/testData/diagnostics/tests/ExtensionCallInvoke.fir.kt
+++ b/compiler/testData/diagnostics/tests/ExtensionCallInvoke.fir.kt
@@ -3,5 +3,5 @@ fun bar(doIt: Int.() -> Int) {
     1?.doIt()
     val i: Int? = 1
     i.<!INAPPLICABLE_CANDIDATE!>doIt<!>()
-    i?.<!INAPPLICABLE_CANDIDATE!>doIt<!>()
+    i?.doIt()
 }
diff --git a/compiler/testData/diagnostics/tests/SafeCallOnFakePackage.fir.kt b/compiler/testData/diagnostics/tests/SafeCallOnFakePackage.fir.kt
index 9750c5ecc86..0567c846721 100644
--- a/compiler/testData/diagnostics/tests/SafeCallOnFakePackage.fir.kt
+++ b/compiler/testData/diagnostics/tests/SafeCallOnFakePackage.fir.kt
@@ -10,7 +10,7 @@ val s: String = "test"
 
 // FILE: test.kt
 fun ff() {
-    val a = Test?.FOO
-    val b = foo?.s
-    System?.out.println(a + b)
-}
\ No newline at end of file
+    val a = Test?.<!UNRESOLVED_REFERENCE!>FOO<!>
+    val b = foo?.<!UNRESOLVED_REFERENCE!>s<!>
+    System?.<!UNRESOLVED_REFERENCE!>out<!>.<!UNRESOLVED_REFERENCE!>println<!>(a + b)
+}
diff --git a/compiler/testData/diagnostics/tests/extensions/kt1875.fir.kt b/compiler/testData/diagnostics/tests/extensions/kt1875.fir.kt
index 216d32c9541..ceffdebe20a 100644
--- a/compiler/testData/diagnostics/tests/extensions/kt1875.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/kt1875.fir.kt
@@ -2,7 +2,7 @@
 
 package kt1875
 
-fun foo(a : Int?, b : Int.(Int)->Int) = a?.<!INAPPLICABLE_CANDIDATE!>b<!>(1) //unnecessary safe call warning
+fun foo(a : Int?, b : Int.(Int)->Int) = a?.b(1) //unnecessary safe call warning
 
 interface T {
     val f : ((i: Int) -> Unit)?
@@ -15,7 +15,7 @@ fun test(t: T) {
 
 fun test1(t: T?) {
     t.<!UNRESOLVED_REFERENCE!>f<!>(1) // todo resolve f as value and report UNSAFE_CALL
-    t?.f(1)
+    t?.<!INAPPLICABLE_CANDIDATE!>f<!>(1)
     t.<!INAPPLICABLE_CANDIDATE!>f<!>?.<!UNRESOLVED_REFERENCE!>invoke<!>(1)
     t?.f?.invoke(1)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/kt30695_2.fir.kt b/compiler/testData/diagnostics/tests/resolve/invoke/kt30695_2.fir.kt
index 3a58f4da652..cb712bf11bf 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/kt30695_2.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/kt30695_2.fir.kt
@@ -39,5 +39,5 @@ fun testFlexibleReceiver() {
     flexible.extensionProperty()
     flexible?.extensionProperty()
     flexible.<!INAPPLICABLE_CANDIDATE!>nullableExtensionProperty<!>()
-    flexible?.nullableExtensionProperty()
+    flexible?.<!INAPPLICABLE_CANDIDATE!>nullableExtensionProperty<!>()
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/safecalls/safeAccessReceiverNotNull.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/safecalls/safeAccessReceiverNotNull.fir.kt
index a38f0c4c6a0..3294fdd5dc8 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/safecalls/safeAccessReceiverNotNull.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/safecalls/safeAccessReceiverNotNull.fir.kt
@@ -130,6 +130,6 @@ class InvokableProperty(val i: Invokable)
 
 fun checkInvokable(ip: InvokableProperty?) {
     if (ip?.i() == "Hello") {
-        ip.<!INAPPLICABLE_CANDIDATE!>hashCode<!>()
+        ip.hashCode()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/javaStaticMembers.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/javaStaticMembers.fir.kt
index 56b7c6ab3f2..b6bfd0b64fa 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/javaStaticMembers.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/javaStaticMembers.fir.kt
@@ -6,7 +6,7 @@ public class Test {
 // FILE: test.kt
 fun ff() {
     val a = Test.FOO
-    val b = Test?.FOO
+    val b = Test?.<!UNRESOLVED_REFERENCE!>FOO<!>
     System.out.println(a + b)
-    System?.out.println(a + b)
-}
\ No newline at end of file
+    System?.<!UNRESOLVED_REFERENCE!>out<!>.<!UNRESOLVED_REFERENCE!>println<!>(a + b)
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/smartcasts/withChangesToNull.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/smartcasts/withChangesToNull.fir.kt
index 56035143ab2..5c2c0ec8e0d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/smartcasts/withChangesToNull.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/smartcasts/withChangesToNull.fir.kt
@@ -2,7 +2,7 @@ fun foo(y: String?) {
     var x: String? = ""
     if (x != null) {
         with(y?.let { x = null; it }) {
-            this.length
+            this.<!INAPPLICABLE_CANDIDATE!>length<!>
             x.length
         }
         x.length