diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
index 9a4e0218017..b99f56109fe 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
@@ -22805,6 +22805,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
                     runTest("compiler/testData/diagnostics/tests/modifiers/const/kt15913.kt");
                 }
 
+                @Test
+                @TestMetadata("kt57802.kt")
+                public void testKt57802() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/modifiers/const/kt57802.kt");
+                }
+
                 @Test
                 @TestMetadata("stdlibConstFun.kt")
                 public void testStdlibConstFun() throws Exception {
diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
index eb95c94bdd2..ed6089547e0 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
@@ -22805,6 +22805,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
                     runTest("compiler/testData/diagnostics/tests/modifiers/const/kt15913.kt");
                 }
 
+                @Test
+                @TestMetadata("kt57802.kt")
+                public void testKt57802() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/modifiers/const/kt57802.kt");
+                }
+
                 @Test
                 @TestMetadata("stdlibConstFun.kt")
                 public void testStdlibConstFun() throws Exception {
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
index bb5052d0bfd..6b51daca58b 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
@@ -22805,6 +22805,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
                     runTest("compiler/testData/diagnostics/tests/modifiers/const/kt15913.kt");
                 }
 
+                @Test
+                @TestMetadata("kt57802.kt")
+                public void testKt57802() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/modifiers/const/kt57802.kt");
+                }
+
                 @Test
                 @TestMetadata("stdlibConstFun.kt")
                 public void testStdlibConstFun() throws Exception {
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
index d41cf4f36ce..91af4fc1aed 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
@@ -22811,6 +22811,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
                     runTest("compiler/testData/diagnostics/tests/modifiers/const/kt15913.kt");
                 }
 
+                @Test
+                @TestMetadata("kt57802.kt")
+                public void testKt57802() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/modifiers/const/kt57802.kt");
+                }
+
                 @Test
                 @TestMetadata("stdlibConstFun.kt")
                 public void testStdlibConstFun() throws Exception {
diff --git a/compiler/testData/diagnostics/tests/modifiers/const/kt57802.fir.kt b/compiler/testData/diagnostics/tests/modifiers/const/kt57802.fir.kt
new file mode 100644
index 00000000000..9882d7ad854
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/modifiers/const/kt57802.fir.kt
@@ -0,0 +1,24 @@
+// TARGET_BACKEND: JVM
+// FILE: Bar.java
+package one.two;
+
+public class Bar {
+    public static final int BAR1 = SOME_WRONG_EXPRESSION;
+    public static final int BAR2 = MainKt.FOO + 1;
+    public static final int BAR3 = Doo.DOO + 1;
+}
+
+// FILE: Main.kt
+package one.two
+
+const val FOO = 1
+
+class Doo {
+    companion object {
+        const val DOO = 1
+    }
+}
+
+const val BAZ1 = Bar.BAR1 + 1
+const val BAZ2 = Bar.BAR2 + 1
+const val BAZ3 = Bar.BAR3 + 1
diff --git a/compiler/testData/diagnostics/tests/modifiers/const/kt57802.kt b/compiler/testData/diagnostics/tests/modifiers/const/kt57802.kt
new file mode 100644
index 00000000000..7af93403bb7
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/modifiers/const/kt57802.kt
@@ -0,0 +1,24 @@
+// TARGET_BACKEND: JVM
+// FILE: Bar.java
+package one.two;
+
+public class Bar {
+    public static final int BAR1 = SOME_WRONG_EXPRESSION;
+    public static final int BAR2 = MainKt.FOO + 1;
+    public static final int BAR3 = Doo.DOO + 1;
+}
+
+// FILE: Main.kt
+package one.two
+
+const val FOO = 1
+
+class Doo {
+    companion object {
+        const val DOO = 1
+    }
+}
+
+const val BAZ1 = <!CONST_VAL_WITH_NON_CONST_INITIALIZER!>Bar.BAR1 + 1<!>
+const val BAZ2 = Bar.BAR2 + 1
+const val BAZ3 = Bar.BAR3 + 1
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
index b2be7815403..284f920b222 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
@@ -22811,6 +22811,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                     runTest("compiler/testData/diagnostics/tests/modifiers/const/kt15913.kt");
                 }
 
+                @Test
+                @TestMetadata("kt57802.kt")
+                public void testKt57802() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/modifiers/const/kt57802.kt");
+                }
+
                 @Test
                 @TestMetadata("stdlibConstFun.kt")
                 public void testStdlibConstFun() throws Exception {