diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
index 2cd5daadd0e..1f4daa75eff 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
@@ -34701,6 +34701,12 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
             runTest("compiler/testData/diagnostics/testsWithStdLib/javaForKClass.kt");
         }
 
+        @Test
+        @TestMetadata("jvmFieldAndJavaGetter.kt")
+        public void testJvmFieldAndJavaGetter() throws Exception {
+            runTest("compiler/testData/diagnostics/testsWithStdLib/jvmFieldAndJavaGetter.kt");
+        }
+
         @Test
         @TestMetadata("kt8050.kt")
         public void testKt8050() throws Exception {
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
index 571d6738660..5602dc93fa3 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
@@ -34701,6 +34701,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
             runTest("compiler/testData/diagnostics/testsWithStdLib/javaForKClass.kt");
         }
 
+        @Test
+        @TestMetadata("jvmFieldAndJavaGetter.kt")
+        public void testJvmFieldAndJavaGetter() throws Exception {
+            runTest("compiler/testData/diagnostics/testsWithStdLib/jvmFieldAndJavaGetter.kt");
+        }
+
         @Test
         @TestMetadata("kt8050.kt")
         public void testKt8050() throws Exception {
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
index f436205f938..ceae35a2422 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
@@ -34701,6 +34701,12 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
             runTest("compiler/testData/diagnostics/testsWithStdLib/javaForKClass.kt");
         }
 
+        @Test
+        @TestMetadata("jvmFieldAndJavaGetter.kt")
+        public void testJvmFieldAndJavaGetter() throws Exception {
+            runTest("compiler/testData/diagnostics/testsWithStdLib/jvmFieldAndJavaGetter.kt");
+        }
+
         @Test
         @TestMetadata("kt8050.kt")
         public void testKt8050() throws Exception {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/jvmFieldAndJavaGetter.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/jvmFieldAndJavaGetter.fir.kt
new file mode 100644
index 00000000000..b54711f4edb
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithStdLib/jvmFieldAndJavaGetter.fir.kt
@@ -0,0 +1,14 @@
+// MODULE: lib
+// FILE: TestA.java
+
+public abstract class TestA {
+    public abstract int getProp();
+}
+
+// MODULE: main(lib)
+// FILE: TestB.kt
+
+abstract class TestB : TestA() {
+    @JvmField
+    protected var prop: Int = 0
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/jvmFieldAndJavaGetter.kt b/compiler/testData/diagnostics/testsWithStdLib/jvmFieldAndJavaGetter.kt
new file mode 100644
index 00000000000..b362b677351
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithStdLib/jvmFieldAndJavaGetter.kt
@@ -0,0 +1,14 @@
+// MODULE: lib
+// FILE: TestA.java
+
+public abstract class TestA {
+    public abstract int getProp();
+}
+
+// MODULE: main(lib)
+// FILE: TestB.kt
+
+abstract class TestB : TestA() {
+    <!ACCIDENTAL_OVERRIDE!>@JvmField
+    protected var prop: Int<!> = 0
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/jvmFieldAndJavaGetter.txt b/compiler/testData/diagnostics/testsWithStdLib/jvmFieldAndJavaGetter.txt
new file mode 100644
index 00000000000..3d3eb29dd18
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithStdLib/jvmFieldAndJavaGetter.txt
@@ -0,0 +1,23 @@
+// -- Module: <lib> --
+package
+
+public abstract class TestA {
+    public constructor TestA()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public abstract fun getProp(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+// -- Module: <main> --
+package
+
+public abstract class TestB : TestA {
+    public constructor TestB()
+    @field:kotlin.jvm.JvmField protected final var prop: kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun getProp(): kotlin.Int
+    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-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 1bfe110bd66..50c1cdae962 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
@@ -34791,6 +34791,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
             runTest("compiler/testData/diagnostics/testsWithStdLib/javaForKClass.kt");
         }
 
+        @Test
+        @TestMetadata("jvmFieldAndJavaGetter.kt")
+        public void testJvmFieldAndJavaGetter() throws Exception {
+            runTest("compiler/testData/diagnostics/testsWithStdLib/jvmFieldAndJavaGetter.kt");
+        }
+
         @Test
         @TestMetadata("kt8050.kt")
         public void testKt8050() throws Exception {