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 174058686f8..8b7f3bd0746 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
@@ -22228,6 +22228,18 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
         runTest("compiler/testData/diagnostics/tests/j+k/integerNotNullable.kt");
       }
 
+      @Test
+      @TestMetadata("internalClash.kt")
+      public void testInternalClash() {
+        runTest("compiler/testData/diagnostics/tests/j+k/internalClash.kt");
+      }
+
+      @Test
+      @TestMetadata("internalClash2.kt")
+      public void testInternalClash2() {
+        runTest("compiler/testData/diagnostics/tests/j+k/internalClash2.kt");
+      }
+
       @Test
       @TestMetadata("intersectionWithJavaVoidNothing.kt")
       public void testIntersectionWithJavaVoidNothing() {
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 940e7c99b60..3c5ec07e069 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
@@ -22228,6 +22228,18 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
         runTest("compiler/testData/diagnostics/tests/j+k/integerNotNullable.kt");
       }
 
+      @Test
+      @TestMetadata("internalClash.kt")
+      public void testInternalClash() {
+        runTest("compiler/testData/diagnostics/tests/j+k/internalClash.kt");
+      }
+
+      @Test
+      @TestMetadata("internalClash2.kt")
+      public void testInternalClash2() {
+        runTest("compiler/testData/diagnostics/tests/j+k/internalClash2.kt");
+      }
+
       @Test
       @TestMetadata("intersectionWithJavaVoidNothing.kt")
       public void testIntersectionWithJavaVoidNothing() {
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 8ed94c4ee0e..fecd4274410 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
@@ -22222,6 +22222,18 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
         runTest("compiler/testData/diagnostics/tests/j+k/integerNotNullable.kt");
       }
 
+      @Test
+      @TestMetadata("internalClash.kt")
+      public void testInternalClash() {
+        runTest("compiler/testData/diagnostics/tests/j+k/internalClash.kt");
+      }
+
+      @Test
+      @TestMetadata("internalClash2.kt")
+      public void testInternalClash2() {
+        runTest("compiler/testData/diagnostics/tests/j+k/internalClash2.kt");
+      }
+
       @Test
       @TestMetadata("intersectionWithJavaVoidNothing.kt")
       public void testIntersectionWithJavaVoidNothing() {
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 89dc9aa61f7..0ea4edd3d78 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
@@ -22228,6 +22228,18 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
         runTest("compiler/testData/diagnostics/tests/j+k/integerNotNullable.kt");
       }
 
+      @Test
+      @TestMetadata("internalClash.kt")
+      public void testInternalClash() {
+        runTest("compiler/testData/diagnostics/tests/j+k/internalClash.kt");
+      }
+
+      @Test
+      @TestMetadata("internalClash2.kt")
+      public void testInternalClash2() {
+        runTest("compiler/testData/diagnostics/tests/j+k/internalClash2.kt");
+      }
+
       @Test
       @TestMetadata("intersectionWithJavaVoidNothing.kt")
       public void testIntersectionWithJavaVoidNothing() {
diff --git a/compiler/testData/diagnostics/tests/j+k/internalClash.fir.kt b/compiler/testData/diagnostics/tests/j+k/internalClash.fir.kt
new file mode 100644
index 00000000000..2c5b187b882
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/j+k/internalClash.fir.kt
@@ -0,0 +1,17 @@
+// FILE: B.java
+
+public class B extends A {}
+
+// FILE: box.kt
+
+open class A {
+    internal open val a: String = "Fail"
+}
+
+class C : B() {
+    internal val <!VIRTUAL_MEMBER_HIDDEN!>a<!>: String = "OK"
+}
+
+fun box(): String {
+    return C().a
+}
diff --git a/compiler/testData/diagnostics/tests/j+k/internalClash.kt b/compiler/testData/diagnostics/tests/j+k/internalClash.kt
new file mode 100644
index 00000000000..7cc64ce4af0
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/j+k/internalClash.kt
@@ -0,0 +1,17 @@
+// FILE: B.java
+
+public class B extends A {}
+
+// FILE: box.kt
+
+open class A {
+    internal open val a: String = "Fail"
+}
+
+class C : B() {
+    internal val a: String = "OK"
+}
+
+fun box(): String {
+    return C().a
+}
diff --git a/compiler/testData/diagnostics/tests/j+k/internalClash2.fir.kt b/compiler/testData/diagnostics/tests/j+k/internalClash2.fir.kt
new file mode 100644
index 00000000000..ba3802d9c1a
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/j+k/internalClash2.fir.kt
@@ -0,0 +1,15 @@
+// FILE: B.java
+
+public class B extends A {}
+
+// FILE: box.kt
+
+open class A {
+    internal open val a: String = "OK"
+}
+
+class C : B()
+
+fun box(): String {
+    return C().a
+}
diff --git a/compiler/testData/diagnostics/tests/j+k/internalClash2.kt b/compiler/testData/diagnostics/tests/j+k/internalClash2.kt
new file mode 100644
index 00000000000..8cd9ecf1b64
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/j+k/internalClash2.kt
@@ -0,0 +1,15 @@
+// FILE: B.java
+
+public class B extends A {}
+
+// FILE: box.kt
+
+open class A {
+    internal open val a: String = "OK"
+}
+
+class C : B()
+
+fun box(): String {
+    return C().<!INVISIBLE_MEMBER!>a<!>
+}
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 01e33134a6a..bd8c5b4c9db 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
@@ -22228,6 +22228,18 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
         runTest("compiler/testData/diagnostics/tests/j+k/integerNotNullable.kt");
       }
 
+      @Test
+      @TestMetadata("internalClash.kt")
+      public void testInternalClash() {
+        runTest("compiler/testData/diagnostics/tests/j+k/internalClash.kt");
+      }
+
+      @Test
+      @TestMetadata("internalClash2.kt")
+      public void testInternalClash2() {
+        runTest("compiler/testData/diagnostics/tests/j+k/internalClash2.kt");
+      }
+
       @Test
       @TestMetadata("intersectionWithJavaVoidNothing.kt")
       public void testIntersectionWithJavaVoidNothing() {