diff --git a/compiler/testData/diagnostics/tests/AbstractEnum.kt b/compiler/testData/diagnostics/tests/enum/AbstractEnum.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/AbstractEnum.kt
rename to compiler/testData/diagnostics/tests/enum/AbstractEnum.kt
diff --git a/compiler/testData/diagnostics/tests/AbstractInEnum.kt b/compiler/testData/diagnostics/tests/enum/AbstractInEnum.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/AbstractInEnum.kt
rename to compiler/testData/diagnostics/tests/enum/AbstractInEnum.kt
diff --git a/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.kt b/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.kt
new file mode 100644
index 00000000000..06d6499e3bc
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.kt
@@ -0,0 +1,9 @@
+enum class E {
+    E1
+    E2
+}
+
+fun foo() {
+    var <!ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE!>e<!> = E.E1
+    e = <!UNUSED_VALUE!>E.E2<!>
+}
\ No newline at end of file
diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
index 5f42b6e5954..cc4183dce25 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
@@ -40,11 +40,6 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
             doTest("compiler/testData/diagnostics/tests/Abstract.kt");
         }
         
-        @TestMetadata("AbstractEnum.kt")
-        public void testAbstractEnum() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/AbstractEnum.kt");
-        }
-        
         @TestMetadata("AbstractInAbstractClass.kt")
         public void testAbstractInAbstractClass() throws Exception {
             doTest("compiler/testData/diagnostics/tests/AbstractInAbstractClass.kt");
@@ -55,11 +50,6 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
             doTest("compiler/testData/diagnostics/tests/AbstractInClass.kt");
         }
         
-        @TestMetadata("AbstractInEnum.kt")
-        public void testAbstractInEnum() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/AbstractInEnum.kt");
-        }
-        
         @TestMetadata("AbstractInTrait.kt")
         public void testAbstractInTrait() throws Exception {
             doTest("compiler/testData/diagnostics/tests/AbstractInTrait.kt");
@@ -2513,10 +2503,25 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
         @TestMetadata("compiler/testData/diagnostics/tests/enum")
         @InnerTestClasses({Enum.Inner.class})
         public static class Enum extends AbstractDiagnosticsTestWithEagerResolve {
+            @TestMetadata("AbstractEnum.kt")
+            public void testAbstractEnum() throws Exception {
+                doTest("compiler/testData/diagnostics/tests/enum/AbstractEnum.kt");
+            }
+            
+            @TestMetadata("AbstractInEnum.kt")
+            public void testAbstractInEnum() throws Exception {
+                doTest("compiler/testData/diagnostics/tests/enum/AbstractInEnum.kt");
+            }
+            
             public void testAllFilesPresentInEnum() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/enum"), Pattern.compile("^(.+)\\.kt$"), true);
             }
             
+            @TestMetadata("entryShouldBeOfEnumType.kt")
+            public void testEntryShouldBeOfEnumType() throws Exception {
+                doTest("compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.kt");
+            }
+            
             @TestMetadata("enumInheritance.kt")
             public void testEnumInheritance() throws Exception {
                 doTest("compiler/testData/diagnostics/tests/enum/enumInheritance.kt");