diff --git a/java/java-tests/testData/psi/optimizeImports/SameNamedImportedClasses.java b/java/java-tests/testData/psi/optimizeImports/SameNamedImportedClasses.java
new file mode 100644
index 000000000000..b93cf94f6441
--- /dev/null
+++ b/java/java-tests/testData/psi/optimizeImports/SameNamedImportedClasses.java
@@ -0,0 +1,24 @@
+package foo;
+
+import foo.A.*;
+import foo.A.Person;
+import foo.B.BasicPerson;
+
+class Client {
+  public void method(OtherClass otherClass) {
+    Person person = null;
+    BasicPerson person2 = null;
+  }
+}
+
+class A {
+  public interface Person {}
+  public static class BasicPerson implements Person {}
+  public static class OtherClass {}
+}
+
+class B {
+  public interface Person {}
+  public static class BasicPerson implements Person {}
+  public static class OtherClass {}
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/psi/OptimizeImportsTest.java b/java/java-tests/testSrc/com/intellij/psi/OptimizeImportsTest.java
index efa556b0a803..a817cff824c0 100644
--- a/java/java-tests/testSrc/com/intellij/psi/OptimizeImportsTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/OptimizeImportsTest.java
@@ -45,6 +45,10 @@ public class OptimizeImportsTest extends OptimizeImportsTestCase {
     doTest();
   }
 
+  public void testSameNamedImportedClasses() throws Exception {
+    doTest();
+  }
+
   private void doTest() throws Exception {
     doTest(".java");
   }