diff --git a/idea/testData/editor/optimizeImports/Enums/Enums.after.kt b/idea/testData/editor/optimizeImports/Enums/Enums.after.kt
new file mode 100644
index 00000000000..a962c24e712
--- /dev/null
+++ b/idea/testData/editor/optimizeImports/Enums/Enums.after.kt
@@ -0,0 +1,11 @@
+package foo
+
+import dependency.D
+import dependency.D.E1.E11
+import dependency.D.E3
+
+fun foo {
+    E11
+    D.E2.E22
+    E3.E31
+}
\ No newline at end of file
diff --git a/idea/testData/editor/optimizeImports/Enums/Enums.dependency.kt b/idea/testData/editor/optimizeImports/Enums/Enums.dependency.kt
new file mode 100644
index 00000000000..36cb4446aae
--- /dev/null
+++ b/idea/testData/editor/optimizeImports/Enums/Enums.dependency.kt
@@ -0,0 +1,16 @@
+package dependency
+
+class D {
+    enum class E1 {
+        E11
+        E12
+    }
+    enum class E2 {
+        E21
+        E22
+    }
+    enum class E3 {
+        E31
+        E32
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/editor/optimizeImports/Enums/Enums.kt b/idea/testData/editor/optimizeImports/Enums/Enums.kt
new file mode 100644
index 00000000000..ceaaaedfabb
--- /dev/null
+++ b/idea/testData/editor/optimizeImports/Enums/Enums.kt
@@ -0,0 +1,18 @@
+package foo
+
+import dependency.D
+import dependency.D.E1
+import dependency.D.E1.E11
+import dependency.D.E1.E12
+import dependency.D.E2
+import dependency.D.E2.E21
+import dependency.D.E2.E22
+import dependency.D.E3
+import dependency.D.E3.E31
+import dependency.D.E3.E32
+
+fun foo {
+    E11
+    D.E2.E22
+    E3.E31
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java
index 0ecb24ad83f..a45f9e35f8e 100644
--- a/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java
@@ -66,6 +66,11 @@ public class OptimizeImportsTestGenerated extends AbstractOptimizeImportsTest {
         doTest("idea/testData/editor/optimizeImports/DuplicatedImports");
     }
     
+    @TestMetadata("Enums")
+    public void testEnums() throws Exception {
+        doTest("idea/testData/editor/optimizeImports/Enums");
+    }
+    
     @TestMetadata("InvokeFunction")
     public void testInvokeFunction() throws Exception {
         doTest("idea/testData/editor/optimizeImports/InvokeFunction");