diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt
index 4891da6499e..17e4ba08126 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt
@@ -96,7 +96,7 @@ public object ModifierCheckerCore {
     )
 
     val possibleParentTargetMap = mapOf<KtModifierKeywordToken, Set<KotlinTarget>>(
-            INNER_KEYWORD     to EnumSet.of(CLASS_ONLY, INNER_CLASS, LOCAL_CLASS, ENUM_CLASS, ENUM_ENTRY),
+            INNER_KEYWORD     to EnumSet.of(CLASS_ONLY, INNER_CLASS, LOCAL_CLASS, ENUM_CLASS),
             OVERRIDE_KEYWORD  to EnumSet.of(CLASS_ONLY, INNER_CLASS, LOCAL_CLASS, OBJECT, OBJECT_LITERAL,
                                             INTERFACE, ENUM_CLASS, ENUM_ENTRY),
             PROTECTED_KEYWORD to EnumSet.of(CLASS_ONLY, INNER_CLASS, LOCAL_CLASS, ENUM_CLASS, OBJECT),
diff --git a/compiler/testData/codegen/box/enum/entrywithinner.kt b/compiler/testData/codegen/box/enum/entrywithinner.kt
deleted file mode 100644
index b919b69f5b4..00000000000
--- a/compiler/testData/codegen/box/enum/entrywithinner.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package test
-
-fun box() = IssueState.DEFAULT.ToString() + IssueState.FIXED.ToString()
-
-enum class IssueState {
-   DEFAULT {
-       inner class D {
-          val k = ToString()
-       }
-   },
-   FIXED {
-       override fun ToString() = "K"
-
-       inner class D {
-          val k = ToString()
-       }
-   };
-
-   open fun ToString() : String = "O"
-}
diff --git a/compiler/testData/diagnostics/tests/inner/illegalModifier.kt b/compiler/testData/diagnostics/tests/inner/illegalModifier.kt
index f4282b6bf84..744af34f31b 100644
--- a/compiler/testData/diagnostics/tests/inner/illegalModifier.kt
+++ b/compiler/testData/diagnostics/tests/inner/illegalModifier.kt
@@ -15,8 +15,11 @@ class D {
 }
 
 enum class H {
+    I0 {
+        <!WRONG_MODIFIER_CONTAINING_DECLARATION!>inner<!> class II0
+    },
     <!WRONG_MODIFIER_TARGET!>inner<!> I {
-        inner class II
+        <!WRONG_MODIFIER_CONTAINING_DECLARATION!>inner<!> class II
     };
     
     inner class J
diff --git a/compiler/testData/diagnostics/tests/inner/illegalModifier.txt b/compiler/testData/diagnostics/tests/inner/illegalModifier.txt
index b604dc645e4..f7f3ffe56d8 100644
--- a/compiler/testData/diagnostics/tests/inner/illegalModifier.txt
+++ b/compiler/testData/diagnostics/tests/inner/illegalModifier.txt
@@ -82,6 +82,8 @@ public final class D {
 }
 
 public final enum class H : kotlin.Enum<H> {
+    enum entry I0
+
     enum entry I
 
     private constructor H()
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java
index d1d80bdb4fa..409dd2a9633 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java
@@ -3577,12 +3577,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest(fileName);
         }
 
-        @TestMetadata("entrywithinner.kt")
-        public void testEntrywithinner() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/entrywithinner.kt");
-            doTest(fileName);
-        }
-
         @TestMetadata("enumInheritedFromTrait.kt")
         public void testEnumInheritedFromTrait() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/enumInheritedFromTrait.kt");