diff --git a/compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClassMemberResolve.kt b/compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClassMemberResolve.kt
new file mode 100644
index 00000000000..36aca591b84
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClassMemberResolve.kt
@@ -0,0 +1,13 @@
+// !LANGUAGE: +InnerClassInEnumEntryClass
+
+enum class A {
+    X {
+        val x = 1
+        fun foo() {}
+
+        inner class Inner {
+            val y = x
+            fun bar() = foo()
+        }
+    }
+}
diff --git a/compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClassMemberResolve.txt b/compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClassMemberResolve.txt
new file mode 100644
index 00000000000..0d2301c37f2
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClassMemberResolve.txt
@@ -0,0 +1,20 @@
+package
+
+public final enum class A : kotlin.Enum<A> {
+    enum entry X
+
+    private constructor A()
+    public final override /*1*/ /*fake_override*/ val name: kotlin.String
+    public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
+    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
+    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit
+    public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<A!>!
+    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
+    public final /*synthesized*/ fun values(): kotlin.Array<A>
+}
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
index bdefbe53fea..16cc64c68d5 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
@@ -11860,6 +11860,12 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("innerClassInEnumEntryClassMemberResolve.kt")
+            public void testInnerClassInEnumEntryClassMemberResolve() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClassMemberResolve.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("innerClassInEnumEntryClass_lv11.kt")
             public void testInnerClassInEnumEntryClass_lv11() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClass_lv11.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
index b804df496e6..fdc1e40aad8 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
@@ -11860,6 +11860,12 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
                 doTest(fileName);
             }
 
+            @TestMetadata("innerClassInEnumEntryClassMemberResolve.kt")
+            public void testInnerClassInEnumEntryClassMemberResolve() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClassMemberResolve.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("innerClassInEnumEntryClass_lv11.kt")
             public void testInnerClassInEnumEntryClass_lv11() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClass_lv11.kt");