diff --git a/compiler/testData/diagnostics/tests/modifiers/const/kt12248.kt b/compiler/testData/diagnostics/tests/modifiers/const/kt12248.kt
new file mode 100644
index 00000000000..093c6ca967c
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/modifiers/const/kt12248.kt
@@ -0,0 +1,19 @@
+// FILE: Bar.java
+
+public class Bar {
+    public static final int BAR = Foo.FOO + 1;
+}
+
+// FILE: Test.kt
+
+class Foo {
+    companion object {
+        const val FOO = 1
+    }
+}
+
+class Baz {
+    companion object {
+        const val BAZ = Bar.BAR + 1
+    }
+}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/modifiers/const/kt12248.txt b/compiler/testData/diagnostics/tests/modifiers/const/kt12248.txt
new file mode 100644
index 00000000000..86a165255df
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/modifiers/const/kt12248.txt
@@ -0,0 +1,41 @@
+package
+
+public open class Bar {
+    public constructor Bar()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    // Static members
+    public const final val BAR: kotlin.Int = 2
+}
+
+public final class Baz {
+    public constructor Baz()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    public companion object Companion {
+        private constructor Companion()
+        public const final val BAZ: kotlin.Int = 3
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
+
+public final class Foo {
+    public constructor Foo()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    public companion object Companion {
+        private constructor Companion()
+        public const final val FOO: kotlin.Int = 1
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
diff --git a/compiler/testData/diagnostics/tests/modifiers/const/kt15913.kt b/compiler/testData/diagnostics/tests/modifiers/const/kt15913.kt
new file mode 100644
index 00000000000..13884090354
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/modifiers/const/kt15913.kt
@@ -0,0 +1,19 @@
+// FILE: Context.java
+
+public interface Context {
+    String BEAN = "context";
+}
+
+// FILE: Test.kt
+
+annotation class Resource(val name: String)
+
+class MyController {
+    companion object {
+        private const val foo = Context.BEAN
+    }
+
+    @Resource(name = Context.BEAN)
+    fun setContext() {
+    }
+}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/modifiers/const/kt15913.txt b/compiler/testData/diagnostics/tests/modifiers/const/kt15913.txt
new file mode 100644
index 00000000000..1f3ad490b6f
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/modifiers/const/kt15913.txt
@@ -0,0 +1,34 @@
+package
+
+public interface Context {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    // Static members
+    public const final val BEAN: kotlin.String = "context"
+}
+
+public final class MyController {
+    public constructor MyController()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    @Resource(name = "context") public final fun setContext(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    public companion object Companion {
+        private constructor Companion()
+        private const final val foo: kotlin.String = "context"
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
+
+public final annotation class Resource : kotlin.Annotation {
+    public constructor Resource(/*0*/ name: kotlin.String)
+    public final val name: kotlin.String
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
index 86b067fb2b1..65ab17d9739 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
@@ -12603,6 +12603,18 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
                     doTest(fileName);
                 }
 
+                @TestMetadata("kt12248.kt")
+                public void testKt12248() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/const/kt12248.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("kt15913.kt")
+                public void testKt15913() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/const/kt15913.kt");
+                    doTest(fileName);
+                }
+
                 @TestMetadata("noDivisionByZeroFeature.kt")
                 public void testNoDivisionByZeroFeature() throws Exception {
                     String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/const/noDivisionByZeroFeature.kt");