diff --git a/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesWithQualificationNew.fir.kt b/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesWithQualificationNew.fir.kt
index 4a72ff41864..f41297aaf61 100644
--- a/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesWithQualificationNew.fir.kt
+++ b/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesWithQualificationNew.fir.kt
@@ -119,8 +119,8 @@ class C : O.B() {
     val b = O.A::foo
 
     // DEPRECATED: Classifiers from companions of direct superclasses
-    val e = O.A.Companion.FromCompanionA::foo
-    val f = O.B.Companion.FromCompanionB::foo
+    val e = O.A.<!AMBIGUITY!>Companion<!>.<!UNRESOLVED_REFERENCE!>FromCompanionA<!>::foo
+    val f = O.B.<!AMBIGUITY!>Companion<!>.<!UNRESOLVED_REFERENCE!>FromCompanionB<!>::foo
 
     // INVISIBLE: "cousin" supertypes themselves
     val g = O.Alpha::foo
diff --git a/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesWithQualificationOld.fir.kt b/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesWithQualificationOld.fir.kt
index 365ce45f7b7..db6ecab54d1 100644
--- a/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesWithQualificationOld.fir.kt
+++ b/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesWithQualificationOld.fir.kt
@@ -119,8 +119,8 @@ class C : O.B() {
     val b = O.A::foo
 
     // DEPRECATED: Classifiers from companions of direct superclasses
-    val e = O.A.Companion.FromCompanionA::foo
-    val f = O.B.Companion.FromCompanionB::foo
+    val e = O.A.<!AMBIGUITY!>Companion<!>.<!UNRESOLVED_REFERENCE!>FromCompanionA<!>::foo
+    val f = O.B.<!AMBIGUITY!>Companion<!>.<!UNRESOLVED_REFERENCE!>FromCompanionB<!>::foo
 
     // INVISIBLE: "cousin" supertypes themselves
     val g = O.Alpha::foo
diff --git a/compiler/testData/diagnostics/tests/objects/kt21515/useDeprecatedConstructorWithQualificationNew.fir.kt b/compiler/testData/diagnostics/tests/objects/kt21515/useDeprecatedConstructorWithQualificationNew.fir.kt
index 2a1da9d91d3..605356b2a8f 100644
--- a/compiler/testData/diagnostics/tests/objects/kt21515/useDeprecatedConstructorWithQualificationNew.fir.kt
+++ b/compiler/testData/diagnostics/tests/objects/kt21515/useDeprecatedConstructorWithQualificationNew.fir.kt
@@ -77,8 +77,8 @@ class C : O.B() {
     val b = O.B()
 
     // DEPRECATED: Classifiers from companions of direct superclasses
-    val e = O.A.Companion.FromCompanionA()
-    val f = O.B.Companion.FromCompanionB()
+    val e = O.A.<!AMBIGUITY!>Companion<!>.<!UNRESOLVED_REFERENCE!>FromCompanionA<!>()
+    val f = O.B.<!AMBIGUITY!>Companion<!>.<!UNRESOLVED_REFERENCE!>FromCompanionB<!>()
 
     // INVISIBLE: "cousin" supertypes themselves
     val g = O.Alpha()
diff --git a/compiler/testData/diagnostics/tests/objects/kt21515/useDeprecatedConstructorWithQualificationOld.fir.kt b/compiler/testData/diagnostics/tests/objects/kt21515/useDeprecatedConstructorWithQualificationOld.fir.kt
index ab80273e1c2..16f4361d02c 100644
--- a/compiler/testData/diagnostics/tests/objects/kt21515/useDeprecatedConstructorWithQualificationOld.fir.kt
+++ b/compiler/testData/diagnostics/tests/objects/kt21515/useDeprecatedConstructorWithQualificationOld.fir.kt
@@ -77,8 +77,8 @@ class C : O.B() {
     val b = O.B()
 
     // DEPRECATED: Classifiers from companions of direct superclasses
-    val e = O.A.Companion.FromCompanionA()
-    val f = O.B.Companion.FromCompanionB()
+    val e = O.A.<!AMBIGUITY!>Companion<!>.<!UNRESOLVED_REFERENCE!>FromCompanionA<!>()
+    val f = O.B.<!AMBIGUITY!>Companion<!>.<!UNRESOLVED_REFERENCE!>FromCompanionB<!>()
 
     // INVISIBLE: "cousin" supertypes themselves
     val g = O.Alpha()
diff --git a/compiler/testData/diagnostics/tests/resolve/priority/kt9965.fir.kt b/compiler/testData/diagnostics/tests/resolve/priority/kt9965.fir.kt
index 0be29b963af..83044f795c9 100644
--- a/compiler/testData/diagnostics/tests/resolve/priority/kt9965.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/priority/kt9965.fir.kt
@@ -12,9 +12,9 @@ enum class Foo {
 }
 
 fun test() {
-    Foo.values() checkType { <!UNRESOLVED_REFERENCE!>_<!><Array<Foo>>() }
+    Foo.<!AMBIGUITY!>values<!>() <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Array<Foo>>() }
     Foo.Companion.values() checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
 
-    Foo.valueOf("") checkType { <!UNRESOLVED_REFERENCE!>_<!><Foo>() }
+    Foo.<!AMBIGUITY!>valueOf<!>("") <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Foo>() }
     Foo.Companion.valueOf("") checkType { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
 }
\ No newline at end of file