diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabels.kt b/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabels.kt
index 1cb5d2d3816..8905e01d23a 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabels.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabels.kt
@@ -13,7 +13,7 @@ fun f() {
     foo {(): Int ->
         foo {
             (): Int ->
-            return@foo 1
+            return<!LABEL_NAME_CLASH!>@foo<!> 1
         }
         return@foo 1
     }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabelsNonLocal.kt b/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabelsNonLocal.kt
index a13a41fe6f5..5b07f2a88c6 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabelsNonLocal.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabelsNonLocal.kt
@@ -2,9 +2,7 @@ fun f() {
     foo {(): Int ->
         bar {
             (): Int ->
-            // The actual error message should be "return not allowed",
-            // but due to a bug in label resolution it is "unresolved reference"
-            return<!UNRESOLVED_REFERENCE!>@foo<!> 1
+            <!RETURN_NOT_ALLOWED!>return@foo 1<!>
         }
         return@foo 1
     }