diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/superIsNotAnExpression.kt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/superIsNotAnExpression.kt
index f41d78a6551..5537e7af33f 100644
--- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/superIsNotAnExpression.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/superIsNotAnExpression.kt
@@ -7,7 +7,7 @@ class B: A() {
         <!UNRESOLVED_REFERENCE!>invoke<!>()
 
         <!SUPER_IS_NOT_AN_EXPRESSION!>super<!> {
-            <!UNRESOLVED_REFERENCE{LT}!><!UNRESOLVED_REFERENCE{PSI}!>println<!>(<!ILLEGAL_CONST_EXPRESSION!>'weird'<!>)<!>
+            <!UNRESOLVED_REFERENCE!>println<!>(<!ILLEGAL_CONST_EXPRESSION!>'weird'<!>)
         }
     }
 }
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/privateObjectLiteral.kt b/compiler/fir/analysis-tests/testData/resolve/expresssions/privateObjectLiteral.kt
index 45f71375792..d7e191dbdfe 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/privateObjectLiteral.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/privateObjectLiteral.kt
@@ -9,5 +9,5 @@ class C {
         fun foo() = 13
     }
 
-    val w = z.<!UNRESOLVED_REFERENCE{LT}!><!UNRESOLVED_REFERENCE{PSI}!>foo<!>()<!> // ERROR!
+    val w = z.<!UNRESOLVED_REFERENCE!>foo<!>() // ERROR!
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.fir.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.fir.kt
index d8b760b83c7..c7009ad980b 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.fir.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.fir.kt
@@ -19,5 +19,5 @@ public class J {
 // FILE: k.kt
 
 var A by J.staticNN
-var B by J<!UNSAFE_CALL!>.<!>staticN
+var B by J<!UNSAFE_CALL, UNSAFE_CALL!>.<!>staticN
 var C by J.staticJ
\ No newline at end of file