diff --git a/plugins/kotlin/idea/tests/testData/checker/LocalObjects.fir.kt b/plugins/kotlin/idea/tests/testData/checker/LocalObjects.fir.kt
new file mode 100644
index 000000000000..09ad82edd1d0
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/checker/LocalObjects.fir.kt
@@ -0,0 +1,21 @@
+  object A {
+    val x : Int = 0
+  }
+
+  open class Foo {
+    fun foo() : Int = 1
+  }
+
+  fun test() {
+    A.x
+    val b = object : Foo() {
+    }
+    b.foo()
+
+    <error descr="[LOCAL_OBJECT_NOT_ALLOWED] Named object 'B' is a singleton and cannot be local. Try to use anonymous object instead">object B</error> {
+      fun foo() {}
+    }
+    B.foo()
+  }
+
+  val bb = <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: B">B</error>.foo()
diff --git a/plugins/kotlin/idea/tests/testData/checker/LocalObjects.kt b/plugins/kotlin/idea/tests/testData/checker/LocalObjects.kt
index 5ef4a7a617f7..54adfe831ffe 100644
--- a/plugins/kotlin/idea/tests/testData/checker/LocalObjects.kt
+++ b/plugins/kotlin/idea/tests/testData/checker/LocalObjects.kt
@@ -1,5 +1,3 @@
-// FIR_IDENTICAL
-// FIR_COMPARISON
   object A {
     val x : Int = 0
   }
@@ -20,4 +18,4 @@
     B.foo()
   }
 
-  val bb = <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: B">B</error>.<error descr="[UNRESOLVED_REFERENCE] Unresolved reference: foo">foo</error>()
+  val bb = <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: B">B</error>.<error descr="[DEBUG] Reference is not resolved to anything, but is not marked unresolved">foo</error>()
diff --git a/plugins/kotlin/idea/tests/testData/checker/NestedObjects.fir.kt b/plugins/kotlin/idea/tests/testData/checker/NestedObjects.fir.kt
index bcc77fbb2381..6232df7b6a23 100644
--- a/plugins/kotlin/idea/tests/testData/checker/NestedObjects.fir.kt
+++ b/plugins/kotlin/idea/tests/testData/checker/NestedObjects.fir.kt
@@ -25,4 +25,4 @@ package nestedObjects
   val b = B
   val c = A.B
   val d = A.B.A
-  val e = B.<error descr="[UNRESOLVED_REFERENCE] Unresolved reference: A">A</error>.<error descr="[UNRESOLVED_REFERENCE] Unresolved reference: B">B</error>
+  val e = B.<error descr="[UNRESOLVED_REFERENCE] Unresolved reference: A">A</error>.B
diff --git a/plugins/kotlin/idea/tests/testData/checker/Unresolved.fir.kt b/plugins/kotlin/idea/tests/testData/checker/Unresolved.fir.kt
index 9a089ddb0901..1cc971d3c58a 100644
--- a/plugins/kotlin/idea/tests/testData/checker/Unresolved.fir.kt
+++ b/plugins/kotlin/idea/tests/testData/checker/Unresolved.fir.kt
@@ -23,11 +23,11 @@ fun testUnresolved() {
         else -> <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: a">a</error>
     }
 
-    <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: hasNext"><error descr="[UNRESOLVED_REFERENCE] Unresolved reference: iterator"><error descr="[UNRESOLVED_REFERENCE] Unresolved reference: next">for (j in <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: collection">collection</error>) {
+    <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: hasNext"><error descr="[UNRESOLVED_REFERENCE] Unresolved reference: next">for (j in <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: collection">collection</error>) {
        var i: Int = j
        i += 1
        foo1(j)
-    }</error></error></error>
+    }</error></error>
 }
 
 fun foo1(i: Int) {}
diff --git a/plugins/kotlin/idea/tests/testData/checker/infos/SmartCasts.fir.kt b/plugins/kotlin/idea/tests/testData/checker/infos/SmartCasts.fir.kt
index 4aae9cdb2dd1..91c16c332fe1 100644
--- a/plugins/kotlin/idea/tests/testData/checker/infos/SmartCasts.fir.kt
+++ b/plugins/kotlin/idea/tests/testData/checker/infos/SmartCasts.fir.kt
@@ -103,7 +103,7 @@ fun f13(a : A?) {
   }
   else {
     a?.foo()
-    <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: c">c</error>.<error descr="[UNRESOLVED_REFERENCE] Unresolved reference: bar">bar</error>()
+    <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: c">c</error>.bar()
   }
 
   a?.foo()