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 80ae5ab6c54..ab87131f344 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
@@ -12825,6 +12825,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
           runTest("compiler/testData/diagnostics/tests/enum/entries/entriesPropertyAsExtensionClashPrioritized.kt");
         }
 
+        @Test
+        @TestMetadata("entriesPropertyImport.kt")
+        public void testEntriesPropertyImport() {
+          runTest("compiler/testData/diagnostics/tests/enum/entries/entriesPropertyImport.kt");
+        }
+
         @Test
         @TestMetadata("entriesPropertyImportedClash.kt")
         public void testEntriesPropertyImportedClash() {
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 f8c9b269b6e..35bbf676714 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
@@ -12825,6 +12825,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
           runTest("compiler/testData/diagnostics/tests/enum/entries/entriesPropertyAsExtensionClashPrioritized.kt");
         }
 
+        @Test
+        @TestMetadata("entriesPropertyImport.kt")
+        public void testEntriesPropertyImport() {
+          runTest("compiler/testData/diagnostics/tests/enum/entries/entriesPropertyImport.kt");
+        }
+
         @Test
         @TestMetadata("entriesPropertyImportedClash.kt")
         public void testEntriesPropertyImportedClash() {
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 4992fcd659c..54670846065 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
@@ -12819,6 +12819,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
           runTest("compiler/testData/diagnostics/tests/enum/entries/entriesPropertyAsExtensionClashPrioritized.kt");
         }
 
+        @Test
+        @TestMetadata("entriesPropertyImport.kt")
+        public void testEntriesPropertyImport() {
+          runTest("compiler/testData/diagnostics/tests/enum/entries/entriesPropertyImport.kt");
+        }
+
         @Test
         @TestMetadata("entriesPropertyImportedClash.kt")
         public void testEntriesPropertyImportedClash() {
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 4631f8f2f27..430abc4c040 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
@@ -12825,6 +12825,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
           runTest("compiler/testData/diagnostics/tests/enum/entries/entriesPropertyAsExtensionClashPrioritized.kt");
         }
 
+        @Test
+        @TestMetadata("entriesPropertyImport.kt")
+        public void testEntriesPropertyImport() {
+          runTest("compiler/testData/diagnostics/tests/enum/entries/entriesPropertyImport.kt");
+        }
+
         @Test
         @TestMetadata("entriesPropertyImportedClash.kt")
         public void testEntriesPropertyImportedClash() {
diff --git a/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyImport.fir.kt b/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyImport.fir.kt
new file mode 100644
index 00000000000..6302fe5b0a0
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyImport.fir.kt
@@ -0,0 +1,11 @@
+// !LANGUAGE: -EnumEntries -PrioritizedEnumEntries
+// WITH_STDLIB
+import MyEnum.entries
+
+enum class MyEnum
+
+val entries = "local str"
+
+fun test() {
+    <!DEPRECATED_ACCESS_TO_ENTRY_PROPERTY_FROM_ENUM!>entries<!>
+}
diff --git a/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyImport.kt b/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyImport.kt
new file mode 100644
index 00000000000..a988b803dc9
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyImport.kt
@@ -0,0 +1,11 @@
+// !LANGUAGE: -EnumEntries -PrioritizedEnumEntries
+// WITH_STDLIB
+import MyEnum.entries
+
+enum class MyEnum
+
+val entries = "local str"
+
+fun test() {
+    entries
+}
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 73fd8aabaf0..e5b9dee88e1 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
@@ -12825,6 +12825,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
           runTest("compiler/testData/diagnostics/tests/enum/entries/entriesPropertyAsExtensionClashPrioritized.kt");
         }
 
+        @Test
+        @TestMetadata("entriesPropertyImport.kt")
+        public void testEntriesPropertyImport() {
+          runTest("compiler/testData/diagnostics/tests/enum/entries/entriesPropertyImport.kt");
+        }
+
         @Test
         @TestMetadata("entriesPropertyImportedClash.kt")
         public void testEntriesPropertyImportedClash() {