diff --git a/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.kt b/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.kt
index e441ee22671..b8002d72543 100644
--- a/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.kt
+++ b/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.kt
@@ -1,11 +1,11 @@
 class Test {
     @`InnerAnnotation` <!REPEATED_ANNOTATION!>@InnerAnnotation<!>
-    companion <!CYCLIC_SCOPES_WITH_COMPANION, CYCLIC_SCOPES_WITH_COMPANION!>object<!> : StaticClass(), <!DEBUG_INFO_UNRESOLVED_WITH_TARGET, MANY_CLASSES_IN_SUPERTYPE_LIST, UNRESOLVED_REFERENCE!>InnerClass<!>() {
+    companion object : StaticClass(), <!DEBUG_INFO_UNRESOLVED_WITH_TARGET, MANY_CLASSES_IN_SUPERTYPE_LIST, UNRESOLVED_REFERENCE!>InnerClass<!>() {
 
     }
 
     annotation class InnerAnnotation
-    open class <!CYCLIC_SCOPES_WITH_COMPANION!>StaticClass<!>
+    open class StaticClass
 
-    open inner class <!CYCLIC_SCOPES_WITH_COMPANION!>InnerClass<!>
+    open inner class InnerClass
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.kt b/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.kt
index 696fffe1bb4..51d1731ff46 100644
--- a/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.kt
+++ b/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.kt
@@ -5,7 +5,7 @@ class TestSome<P> {
 }
 
 class Test {
-    companion <!CYCLIC_SCOPES_WITH_COMPANION!>object<!> : <!DEBUG_INFO_UNRESOLVED_WITH_TARGET, UNRESOLVED_REFERENCE!>InnerClass<!>() {
+    companion object : <!DEBUG_INFO_UNRESOLVED_WITH_TARGET, UNRESOLVED_REFERENCE!>InnerClass<!>() {
         val a = object: <!DEBUG_INFO_UNRESOLVED_WITH_TARGET, UNRESOLVED_REFERENCE!>InnerClass<!>() {
         }
 
@@ -22,5 +22,5 @@ class Test {
     val inClass = 12
     fun foo() {}
 
-    open inner class <!CYCLIC_SCOPES_WITH_COMPANION!>InnerClass<!>
+    open inner class InnerClass
 }