diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/AbstractReferenceResolveTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/AbstractReferenceResolveTest.kt
index 0c83f5d0e71..8274e7a6929 100644
--- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/AbstractReferenceResolveTest.kt
+++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/AbstractReferenceResolveTest.kt
@@ -58,15 +58,10 @@ abstract class AbstractReferenceResolveTest : AbstractAnalysisApiBasedTest() {
 
         val resolvedTo = analyzeReferenceElement(ktReferences.first().element, mainModule) {
             val symbols = ktReferences.flatMap { it.resolveToSymbols() }
-            checkReferenceResultForValidity(ktReferences, mainModule, testServices, symbols)
             val renderPsiClassName = Directives.RENDER_PSI_CLASS_NAME in mainModule.directives
             renderResolvedTo(symbols, renderPsiClassName, renderingOptions) { getAdditionalSymbolInfo(it) }
         }
 
-        if (Directives.UNRESOLVED_REFERENCE in mainModule.directives) {
-            return
-        }
-
         val actual = "Resolved to:\n$resolvedTo"
         testServices.assertions.assertEqualsToTestDataFileSibling(actual)
     }
@@ -80,28 +75,7 @@ abstract class AbstractReferenceResolveTest : AbstractAnalysisApiBasedTest() {
     private fun findReferencesAtCaret(mainKtFile: KtFile, caretPosition: Int): List<KtReference> =
         mainKtFile.findReferenceAt(caretPosition)?.unwrapMultiReferences().orEmpty().filterIsInstance<KtReference>()
 
-    private fun KtAnalysisSession.checkReferenceResultForValidity(
-        references: List<KtReference>,
-        module: TestModule,
-        testServices: TestServices,
-        resolvedTo: List<KtSymbol>,
-    ) {
-        if (Directives.UNRESOLVED_REFERENCE in module.directives) {
-            testServices.assertions.assertTrue(resolvedTo.isEmpty()) {
-                "Reference should be unresolved, but was resolved to ${renderResolvedTo(resolvedTo)}"
-            }
-        } else {
-            if (resolvedTo.isEmpty()) {
-                testServices.assertions.fail { "Unresolved reference ${references.first().element.text}" }
-            }
-        }
-    }
-
     private object Directives : SimpleDirectivesContainer() {
-        val UNRESOLVED_REFERENCE by directive(
-            "Reference should be unresolved",
-        )
-
         val RENDER_PSI_CLASS_NAME by directive(
             "Render also PSI class name for resolved reference"
         )
diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/TestReferenceResolveResultRenderer.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/TestReferenceResolveResultRenderer.kt
index 5ba40e9d217..cdcb23ff29e 100644
--- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/TestReferenceResolveResultRenderer.kt
+++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/TestReferenceResolveResultRenderer.kt
@@ -15,16 +15,24 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.types.Variance
 
 object TestReferenceResolveResultRenderer {
+    private const val UNRESOLVED_REFERENCE_RESULT = "Nothing (Unresolved reference)"
+
+    /**
+     * Empty [symbols] list equals to unresolved reference.
+     */
     fun KtAnalysisSession.renderResolvedTo(
         symbols: List<KtSymbol>,
         renderPsiClassName: Boolean = false,
         renderer: KtDeclarationRenderer = KtDeclarationRendererForDebug.WITH_QUALIFIED_NAMES,
         additionalInfo: KtAnalysisSession.(KtSymbol) -> String? = { null }
-    ) =
-        symbols.map { renderResolveResult(it, renderPsiClassName, renderer, additionalInfo) }
+    ): String {
+        if (symbols.isEmpty()) return UNRESOLVED_REFERENCE_RESULT
+
+        return symbols.map { renderResolveResult(it, renderPsiClassName, renderer, additionalInfo) }
             .sorted()
             .withIndex()
             .joinToString(separator = "\n") { "${it.index}: ${it.value}" }
+    }
 
     private fun KtAnalysisSession.renderResolveResult(
         symbol: KtSymbol,
diff --git a/analysis/analysis-api/testData/referenceResolve/PlusAssignByHand.kt b/analysis/analysis-api/testData/referenceResolve/PlusAssignByHand.kt
index 75f42e725b3..dda6d4cb4b2 100644
--- a/analysis/analysis-api/testData/referenceResolve/PlusAssignByHand.kt
+++ b/analysis/analysis-api/testData/referenceResolve/PlusAssignByHand.kt
@@ -1,4 +1,3 @@
-// UNRESOLVED_REFERENCE
 package test
 
 interface Foo
diff --git a/analysis/analysis-api/testData/referenceResolve/PlusAssignByHand.txt b/analysis/analysis-api/testData/referenceResolve/PlusAssignByHand.txt
new file mode 100644
index 00000000000..db4fc56233f
--- /dev/null
+++ b/analysis/analysis-api/testData/referenceResolve/PlusAssignByHand.txt
@@ -0,0 +1,2 @@
+Resolved to:
+Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/arrayAccess/withErrors/SetOperatorInc.kt b/analysis/analysis-api/testData/referenceResolve/arrayAccess/withErrors/SetOperatorInc.kt
index 954654296f6..bd19deb67a6 100644
--- a/analysis/analysis-api/testData/referenceResolve/arrayAccess/withErrors/SetOperatorInc.kt
+++ b/analysis/analysis-api/testData/referenceResolve/arrayAccess/withErrors/SetOperatorInc.kt
@@ -1,4 +1,3 @@
-// UNRESOLVED_REFERENCE
 package test
 
 class B(val n: Int) {
diff --git a/analysis/analysis-api/testData/referenceResolve/arrayAccess/withErrors/SetOperatorInc.txt b/analysis/analysis-api/testData/referenceResolve/arrayAccess/withErrors/SetOperatorInc.txt
index 443816a50ef..db4fc56233f 100644
--- a/analysis/analysis-api/testData/referenceResolve/arrayAccess/withErrors/SetOperatorInc.txt
+++ b/analysis/analysis-api/testData/referenceResolve/arrayAccess/withErrors/SetOperatorInc.txt
@@ -1,2 +1,2 @@
 Resolved to:
-0: (in test.B) operator fun set(i: kotlin.Int, a: test.B)
\ No newline at end of file
+Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/withErrors/unresolved.kt b/analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/withErrors/unresolved.kt
index ae8b6b2de3f..3fb5f65409d 100644
--- a/analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/withErrors/unresolved.kt
+++ b/analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/withErrors/unresolved.kt
@@ -1,5 +1,3 @@
-// UNRESOLVED_REFERENCE
-
 val foo: Int <caret>by Bar()
 
 class Bar
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/withErrors/unresolved.txt b/analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/withErrors/unresolved.txt
new file mode 100644
index 00000000000..db4fc56233f
--- /dev/null
+++ b/analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/withErrors/unresolved.txt
@@ -0,0 +1,2 @@
+Resolved to:
+Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/forLoopIn/withErrors/unresolvedIterator.kt b/analysis/analysis-api/testData/referenceResolve/forLoopIn/withErrors/unresolvedIterator.kt
index e3f56f18c3d..f1e67137274 100644
--- a/analysis/analysis-api/testData/referenceResolve/forLoopIn/withErrors/unresolvedIterator.kt
+++ b/analysis/analysis-api/testData/referenceResolve/forLoopIn/withErrors/unresolvedIterator.kt
@@ -1,4 +1,3 @@
-// UNRESOLVED_REFERENCE
 fun test() {
   for (x <caret>in Y()) {}
 }
diff --git a/analysis/analysis-api/testData/referenceResolve/forLoopIn/withErrors/unresolvedIterator.txt b/analysis/analysis-api/testData/referenceResolve/forLoopIn/withErrors/unresolvedIterator.txt
new file mode 100644
index 00000000000..db4fc56233f
--- /dev/null
+++ b/analysis/analysis-api/testData/referenceResolve/forLoopIn/withErrors/unresolvedIterator.txt
@@ -0,0 +1,2 @@
+Resolved to:
+Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/kDoc/companionObject/childQualifiedFunctionFromSuperClassCompanion.kt b/analysis/analysis-api/testData/referenceResolve/kDoc/companionObject/childQualifiedFunctionFromSuperClassCompanion.kt
index af736c32008..f0da66400f9 100644
--- a/analysis/analysis-api/testData/referenceResolve/kDoc/companionObject/childQualifiedFunctionFromSuperClassCompanion.kt
+++ b/analysis/analysis-api/testData/referenceResolve/kDoc/companionObject/childQualifiedFunctionFromSuperClassCompanion.kt
@@ -1,5 +1,3 @@
-// UNRESOLVED_REFERENCE
-
 open class Base {
     companion object {
         fun foo() {}
diff --git a/analysis/analysis-api/testData/referenceResolve/kDoc/companionObject/childQualifiedFunctionFromSuperClassCompanion.txt b/analysis/analysis-api/testData/referenceResolve/kDoc/companionObject/childQualifiedFunctionFromSuperClassCompanion.txt
new file mode 100644
index 00000000000..db4fc56233f
--- /dev/null
+++ b/analysis/analysis-api/testData/referenceResolve/kDoc/companionObject/childQualifiedFunctionFromSuperClassCompanion.txt
@@ -0,0 +1,2 @@
+Resolved to:
+Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/kDoc/companionObject/unqualifiedFunctionFromSuperClassCompanion.kt b/analysis/analysis-api/testData/referenceResolve/kDoc/companionObject/unqualifiedFunctionFromSuperClassCompanion.kt
index 860ff6cf354..1f663e200c0 100644
--- a/analysis/analysis-api/testData/referenceResolve/kDoc/companionObject/unqualifiedFunctionFromSuperClassCompanion.kt
+++ b/analysis/analysis-api/testData/referenceResolve/kDoc/companionObject/unqualifiedFunctionFromSuperClassCompanion.kt
@@ -1,5 +1,3 @@
-// UNRESOLVED_REFERENCE
-
 open class Base {
     companion object {
         fun foo() {}
diff --git a/analysis/analysis-api/testData/referenceResolve/kDoc/companionObject/unqualifiedFunctionFromSuperClassCompanion.txt b/analysis/analysis-api/testData/referenceResolve/kDoc/companionObject/unqualifiedFunctionFromSuperClassCompanion.txt
new file mode 100644
index 00000000000..db4fc56233f
--- /dev/null
+++ b/analysis/analysis-api/testData/referenceResolve/kDoc/companionObject/unqualifiedFunctionFromSuperClassCompanion.txt
@@ -0,0 +1,2 @@
+Resolved to:
+Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/kDoc/javaDeclarations/StaticFunctionFromBaseClass.kt b/analysis/analysis-api/testData/referenceResolve/kDoc/javaDeclarations/StaticFunctionFromBaseClass.kt
index 618b28beb94..cfbed48b0de 100644
--- a/analysis/analysis-api/testData/referenceResolve/kDoc/javaDeclarations/StaticFunctionFromBaseClass.kt
+++ b/analysis/analysis-api/testData/referenceResolve/kDoc/javaDeclarations/StaticFunctionFromBaseClass.kt
@@ -1,4 +1,3 @@
-// UNRESOLVED_REFERENCE
 // FILE: main.kt
 import dependency.JavaBase
 
diff --git a/analysis/analysis-api/testData/referenceResolve/kDoc/javaDeclarations/StaticFunctionFromBaseClass.txt b/analysis/analysis-api/testData/referenceResolve/kDoc/javaDeclarations/StaticFunctionFromBaseClass.txt
new file mode 100644
index 00000000000..db4fc56233f
--- /dev/null
+++ b/analysis/analysis-api/testData/referenceResolve/kDoc/javaDeclarations/StaticFunctionFromBaseClass.txt
@@ -0,0 +1,2 @@
+Resolved to:
+Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/kDoc/javaDeclarations/StaticFunctionQualifiedWithKotlinSubclass.kt b/analysis/analysis-api/testData/referenceResolve/kDoc/javaDeclarations/StaticFunctionQualifiedWithKotlinSubclass.kt
index 6075feabbad..03b41890d8f 100644
--- a/analysis/analysis-api/testData/referenceResolve/kDoc/javaDeclarations/StaticFunctionQualifiedWithKotlinSubclass.kt
+++ b/analysis/analysis-api/testData/referenceResolve/kDoc/javaDeclarations/StaticFunctionQualifiedWithKotlinSubclass.kt
@@ -1,4 +1,3 @@
-// UNRESOLVED_REFERENCE
 // FILE: main.kt
 import dependency.JavaBase
 
diff --git a/analysis/analysis-api/testData/referenceResolve/kDoc/javaDeclarations/StaticFunctionQualifiedWithKotlinSubclass.txt b/analysis/analysis-api/testData/referenceResolve/kDoc/javaDeclarations/StaticFunctionQualifiedWithKotlinSubclass.txt
new file mode 100644
index 00000000000..db4fc56233f
--- /dev/null
+++ b/analysis/analysis-api/testData/referenceResolve/kDoc/javaDeclarations/StaticFunctionQualifiedWithKotlinSubclass.txt
@@ -0,0 +1,2 @@
+Resolved to:
+Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnClass.kt b/analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnClass.kt
index 89531ea20b6..60bf414554f 100644
--- a/analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnClass.kt
+++ b/analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnClass.kt
@@ -1,5 +1,3 @@
-// UNRESOLVED_REFERENCE
-
 /**
  * [th<caret>is]
  */
diff --git a/analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnClass.txt b/analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnClass.txt
new file mode 100644
index 00000000000..db4fc56233f
--- /dev/null
+++ b/analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnClass.txt
@@ -0,0 +1,2 @@
+Resolved to:
+Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnFunctionNoExtensionReceiver.kt b/analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnFunctionNoExtensionReceiver.kt
index 1b5185e24bd..d3f85de6743 100644
--- a/analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnFunctionNoExtensionReceiver.kt
+++ b/analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnFunctionNoExtensionReceiver.kt
@@ -1,5 +1,3 @@
-// UNRESOLVED_REFERENCE
-
 /**
  * [th<caret>is]
  */
diff --git a/analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnFunctionNoExtensionReceiver.txt b/analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnFunctionNoExtensionReceiver.txt
new file mode 100644
index 00000000000..db4fc56233f
--- /dev/null
+++ b/analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnFunctionNoExtensionReceiver.txt
@@ -0,0 +1,2 @@
+Resolved to:
+Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnPropertyNoExtensionReceiver.kt b/analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnPropertyNoExtensionReceiver.kt
index ec12bcae287..e3360c1edbf 100644
--- a/analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnPropertyNoExtensionReceiver.kt
+++ b/analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnPropertyNoExtensionReceiver.kt
@@ -1,5 +1,3 @@
-// UNRESOLVED_REFERENCE
-
 /**
  * [th<caret>is]
  */
diff --git a/analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnPropertyNoExtensionReceiver.txt b/analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnPropertyNoExtensionReceiver.txt
new file mode 100644
index 00000000000..db4fc56233f
--- /dev/null
+++ b/analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnPropertyNoExtensionReceiver.txt
@@ -0,0 +1,2 @@
+Resolved to:
+Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/kotlinPackage/kotlinPackageNotAllowed.kt b/analysis/analysis-api/testData/referenceResolve/kotlinPackage/kotlinPackageNotAllowed.kt
index a4b4d965d0b..56da517fe51 100644
--- a/analysis/analysis-api/testData/referenceResolve/kotlinPackage/kotlinPackageNotAllowed.kt
+++ b/analysis/analysis-api/testData/referenceResolve/kotlinPackage/kotlinPackageNotAllowed.kt
@@ -1,6 +1,5 @@
 // FE1.0 can resolve to `kotlin` package when it's not allowed
 // IGNORE_FE10
-// UNRESOLVED_REFERENCE
 // COMPILATION_ERRORS
 // FILE: a.kt
 package kotlin.pckg
diff --git a/analysis/analysis-api/testData/referenceResolve/kotlinPackage/kotlinPackageNotAllowed.txt b/analysis/analysis-api/testData/referenceResolve/kotlinPackage/kotlinPackageNotAllowed.txt
new file mode 100644
index 00000000000..db4fc56233f
--- /dev/null
+++ b/analysis/analysis-api/testData/referenceResolve/kotlinPackage/kotlinPackageNotAllowed.txt
@@ -0,0 +1,2 @@
+Resolved to:
+Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/withErrors/BuiltInImportsNoRuntime.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/BuiltInImportsNoRuntime.kt
index 6f421584221..c7a54345b25 100644
--- a/analysis/analysis-api/testData/referenceResolve/withErrors/BuiltInImportsNoRuntime.kt
+++ b/analysis/analysis-api/testData/referenceResolve/withErrors/BuiltInImportsNoRuntime.kt
@@ -1,4 +1,3 @@
 // NO_RUNTIME
-// UNRESOLVED_REFERENCE
 // IGNORE_FE10
 val (<caret>x)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/withErrors/BuiltInImportsNoRuntime.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/BuiltInImportsNoRuntime.txt
new file mode 100644
index 00000000000..db4fc56233f
--- /dev/null
+++ b/analysis/analysis-api/testData/referenceResolve/withErrors/BuiltInImportsNoRuntime.txt
@@ -0,0 +1,2 @@
+Resolved to:
+Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/withErrors/ByReturnExpression.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/ByReturnExpression.kt
index 86e890c6a47..72f0e2bff74 100644
--- a/analysis/analysis-api/testData/referenceResolve/withErrors/ByReturnExpression.kt
+++ b/analysis/analysis-api/testData/referenceResolve/withErrors/ByReturnExpression.kt
@@ -1,4 +1,3 @@
-// UNRESOLVED_REFERENCE
 fun bar(block: () -> Unit) {}
 
 fun foo() {
diff --git a/analysis/analysis-api/testData/referenceResolve/withErrors/ByReturnExpression.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/ByReturnExpression.txt
new file mode 100644
index 00000000000..db4fc56233f
--- /dev/null
+++ b/analysis/analysis-api/testData/referenceResolve/withErrors/ByReturnExpression.txt
@@ -0,0 +1,2 @@
+Resolved to:
+Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/withErrors/DanglingAnnotations.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/DanglingAnnotations.kt
index 624aefc7a76..985ed07a32a 100644
--- a/analysis/analysis-api/testData/referenceResolve/withErrors/DanglingAnnotations.kt
+++ b/analysis/analysis-api/testData/referenceResolve/withErrors/DanglingAnnotations.kt
@@ -1,4 +1,3 @@
-// UNRESOLVED_REFERENCE
 class Foo {
     fun foo() {
         class Local {
diff --git a/analysis/analysis-api/testData/referenceResolve/withErrors/DanglingAnnotations.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/DanglingAnnotations.txt
new file mode 100644
index 00000000000..db4fc56233f
--- /dev/null
+++ b/analysis/analysis-api/testData/referenceResolve/withErrors/DanglingAnnotations.txt
@@ -0,0 +1,2 @@
+Resolved to:
+Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/withErrors/DeprecatedHidden.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/DeprecatedHidden.kt
index bf1904a3900..b044b5f8242 100644
--- a/analysis/analysis-api/testData/referenceResolve/withErrors/DeprecatedHidden.kt
+++ b/analysis/analysis-api/testData/referenceResolve/withErrors/DeprecatedHidden.kt
@@ -1,5 +1,3 @@
-// UNRESOLVED_REFERENCE
-
 @Deprecated("don't use i", level = DeprecationLevel.HIDDEN)
 val i: Int = 1
 
diff --git a/analysis/analysis-api/testData/referenceResolve/withErrors/DeprecatedHidden.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/DeprecatedHidden.txt
new file mode 100644
index 00000000000..db4fc56233f
--- /dev/null
+++ b/analysis/analysis-api/testData/referenceResolve/withErrors/DeprecatedHidden.txt
@@ -0,0 +1,2 @@
+Resolved to:
+Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang1.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang1.kt
index 08ac67e72f3..15ac8f618fa 100644
--- a/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang1.kt
+++ b/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang1.kt
@@ -1,5 +1,3 @@
-// UNRESOLVED_REFERENCE
-
 // FILE: main.kt
 import java.lang.* // will not import Fake
 
diff --git a/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang1.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang1.txt
new file mode 100644
index 00000000000..db4fc56233f
--- /dev/null
+++ b/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang1.txt
@@ -0,0 +1,2 @@
+Resolved to:
+Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang2.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang2.kt
index 4322fc79853..c0cac22ecd5 100644
--- a/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang2.kt
+++ b/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang2.kt
@@ -1,4 +1,3 @@
-// UNRESOLVED_REFERENCE
 // FILE: main.kt
 fun foo() {
     <caret>Fake() // not imported within "java.lang.*" default import
diff --git a/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang2.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang2.txt
new file mode 100644
index 00000000000..db4fc56233f
--- /dev/null
+++ b/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang2.txt
@@ -0,0 +1,2 @@
+Resolved to:
+Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang3.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang3.kt
index 7ee6ea1db7b..6e913bc49de 100644
--- a/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang3.kt
+++ b/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang3.kt
@@ -1,4 +1,3 @@
-// UNRESOLVED_REFERENCE
 // FILE: main.kt
 package nonRoot
 import java.lang.*
diff --git a/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang3.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang3.txt
new file mode 100644
index 00000000000..db4fc56233f
--- /dev/null
+++ b/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang3.txt
@@ -0,0 +1,2 @@
+Resolved to:
+Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang4.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang4.kt
index c7b18277059..0cc46ed14c5 100644
--- a/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang4.kt
+++ b/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang4.kt
@@ -1,4 +1,3 @@
-// UNRESOLVED_REFERENCE
 // FILE: main.kt
 package nonRoot
 
diff --git a/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang4.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang4.txt
new file mode 100644
index 00000000000..db4fc56233f
--- /dev/null
+++ b/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang4.txt
@@ -0,0 +1,2 @@
+Resolved to:
+Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/withErrors/PropertyPlaceInClassObjectInObject.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/PropertyPlaceInClassObjectInObject.kt
index 2ec537de0f8..506d56bf261 100644
--- a/analysis/analysis-api/testData/referenceResolve/withErrors/PropertyPlaceInClassObjectInObject.kt
+++ b/analysis/analysis-api/testData/referenceResolve/withErrors/PropertyPlaceInClassObjectInObject.kt
@@ -1,5 +1,4 @@
 // Should not fall on temp references in invalid code
-// UNRESOLVED_REFERENCE
 
 object Testing {
     companion object {
diff --git a/analysis/analysis-api/testData/referenceResolve/withErrors/PropertyPlaceInClassObjectInObject.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/PropertyPlaceInClassObjectInObject.txt
new file mode 100644
index 00000000000..db4fc56233f
--- /dev/null
+++ b/analysis/analysis-api/testData/referenceResolve/withErrors/PropertyPlaceInClassObjectInObject.txt
@@ -0,0 +1,2 @@
+Resolved to:
+Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/withErrors/TopLevelDestructingDeclaration.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/TopLevelDestructingDeclaration.kt
index 119d784d498..262f9305e22 100644
--- a/analysis/analysis-api/testData/referenceResolve/withErrors/TopLevelDestructingDeclaration.kt
+++ b/analysis/analysis-api/testData/referenceResolve/withErrors/TopLevelDestructingDeclaration.kt
@@ -1,4 +1,3 @@
-// UNRESOLVED_REFERENCE
 // IGNORE_FE10
 
 fun <T : Any, Z> createTuple(a: T, b: Z&Any): Pair<T, Z&Any> {
diff --git a/analysis/analysis-api/testData/referenceResolve/withErrors/TopLevelDestructingDeclaration.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/TopLevelDestructingDeclaration.txt
new file mode 100644
index 00000000000..db4fc56233f
--- /dev/null
+++ b/analysis/analysis-api/testData/referenceResolve/withErrors/TopLevelDestructingDeclaration.txt
@@ -0,0 +1,2 @@
+Resolved to:
+Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/resolveExtensions/referenceResolve/multiModule/extendedModuleDependency/shadowedDeclaration.kt b/analysis/analysis-api/testData/resolveExtensions/referenceResolve/multiModule/extendedModuleDependency/shadowedDeclaration.kt
index d76582d4d65..07b54c91a92 100644
--- a/analysis/analysis-api/testData/resolveExtensions/referenceResolve/multiModule/extendedModuleDependency/shadowedDeclaration.kt
+++ b/analysis/analysis-api/testData/resolveExtensions/referenceResolve/multiModule/extendedModuleDependency/shadowedDeclaration.kt
@@ -1,5 +1,3 @@
-// UNRESOLVED_REFERENCE
-
 // MODULE: extendedModule
 // WITH_RESOLVE_EXTENSION
 // RESOLVE_EXTENSION_PACKAGE: generated
diff --git a/analysis/analysis-api/testData/resolveExtensions/referenceResolve/multiModule/extendedModuleDependency/shadowedDeclaration.txt b/analysis/analysis-api/testData/resolveExtensions/referenceResolve/multiModule/extendedModuleDependency/shadowedDeclaration.txt
new file mode 100644
index 00000000000..eb0ff31dd53
--- /dev/null
+++ b/analysis/analysis-api/testData/resolveExtensions/referenceResolve/multiModule/extendedModuleDependency/shadowedDeclaration.txt
@@ -0,0 +1,2 @@
+Resolved to:
+Nothing (Unresolved reference)
diff --git a/analysis/analysis-api/testData/resolveExtensions/referenceResolve/multiModule/extendedModuleDependency/shadowedJava.kt b/analysis/analysis-api/testData/resolveExtensions/referenceResolve/multiModule/extendedModuleDependency/shadowedJava.kt
index 7c0c8cd65b5..64243cdc8bf 100644
--- a/analysis/analysis-api/testData/resolveExtensions/referenceResolve/multiModule/extendedModuleDependency/shadowedJava.kt
+++ b/analysis/analysis-api/testData/resolveExtensions/referenceResolve/multiModule/extendedModuleDependency/shadowedJava.kt
@@ -1,5 +1,3 @@
-// UNRESOLVED_REFERENCE
-
 // MODULE: extendedModule
 // WITH_RESOLVE_EXTENSION
 // RESOLVE_EXTENSION_PACKAGE: generated
diff --git a/analysis/analysis-api/testData/resolveExtensions/referenceResolve/multiModule/extendedModuleDependency/shadowedJava.txt b/analysis/analysis-api/testData/resolveExtensions/referenceResolve/multiModule/extendedModuleDependency/shadowedJava.txt
new file mode 100644
index 00000000000..eb0ff31dd53
--- /dev/null
+++ b/analysis/analysis-api/testData/resolveExtensions/referenceResolve/multiModule/extendedModuleDependency/shadowedJava.txt
@@ -0,0 +1,2 @@
+Resolved to:
+Nothing (Unresolved reference)
diff --git a/analysis/analysis-api/testData/resolveExtensions/referenceResolve/singleModule/shadowedDeclaration.kt b/analysis/analysis-api/testData/resolveExtensions/referenceResolve/singleModule/shadowedDeclaration.kt
index cd867dacc00..c17cf78824f 100644
--- a/analysis/analysis-api/testData/resolveExtensions/referenceResolve/singleModule/shadowedDeclaration.kt
+++ b/analysis/analysis-api/testData/resolveExtensions/referenceResolve/singleModule/shadowedDeclaration.kt
@@ -1,7 +1,6 @@
 // WITH_RESOLVE_EXTENSION
 // RESOLVE_EXTENSION_PACKAGE: generated
 // RESOLVE_EXTENSION_SHADOWED: \.hidden\.kt$
-// UNRESOLVED_REFERENCE
 
 // FILE: declarations.hidden.kt
 package foo
diff --git a/analysis/analysis-api/testData/resolveExtensions/referenceResolve/singleModule/shadowedDeclaration.txt b/analysis/analysis-api/testData/resolveExtensions/referenceResolve/singleModule/shadowedDeclaration.txt
new file mode 100644
index 00000000000..eb0ff31dd53
--- /dev/null
+++ b/analysis/analysis-api/testData/resolveExtensions/referenceResolve/singleModule/shadowedDeclaration.txt
@@ -0,0 +1,2 @@
+Resolved to:
+Nothing (Unresolved reference)
diff --git a/analysis/analysis-api/testData/resolveExtensions/referenceResolve/singleModule/shadowedJava.kt b/analysis/analysis-api/testData/resolveExtensions/referenceResolve/singleModule/shadowedJava.kt
index 1d511a16930..19a9bcc1d3e 100644
--- a/analysis/analysis-api/testData/resolveExtensions/referenceResolve/singleModule/shadowedJava.kt
+++ b/analysis/analysis-api/testData/resolveExtensions/referenceResolve/singleModule/shadowedJava.kt
@@ -1,7 +1,6 @@
 // WITH_RESOLVE_EXTENSION
 // RESOLVE_EXTENSION_PACKAGE: generated
 // RESOLVE_EXTENSION_SHADOWED: \.hidden\.[a-z]+$
-// UNRESOLVED_REFERENCE
 
 // FILE: TestClass.hidden.java
 package foo;
diff --git a/analysis/analysis-api/testData/resolveExtensions/referenceResolve/singleModule/shadowedJava.txt b/analysis/analysis-api/testData/resolveExtensions/referenceResolve/singleModule/shadowedJava.txt
new file mode 100644
index 00000000000..eb0ff31dd53
--- /dev/null
+++ b/analysis/analysis-api/testData/resolveExtensions/referenceResolve/singleModule/shadowedJava.txt
@@ -0,0 +1,2 @@
+Resolved to:
+Nothing (Unresolved reference)