diff --git a/idea/testData/shortenRefs/ClassNameConflict.kt b/idea/testData/shortenRefs/ClassNameConflict.kt
index f1614b5c7eb..e1ae0ff52d0 100644
--- a/idea/testData/shortenRefs/ClassNameConflict.kt
+++ b/idea/testData/shortenRefs/ClassNameConflict.kt
@@ -1 +1,3 @@
+fun foo(array: Array<String>){}
+
 val v: <selection>java.lang.reflect.Array</selection>
\ No newline at end of file
diff --git a/idea/testData/shortenRefs/ClassNameConflict.kt.after b/idea/testData/shortenRefs/ClassNameConflict.kt.after
index 8630ba09b22..fb6927d6d07 100644
--- a/idea/testData/shortenRefs/ClassNameConflict.kt.after
+++ b/idea/testData/shortenRefs/ClassNameConflict.kt.after
@@ -1,3 +1,5 @@
 import java.lang.reflect
 
+fun foo(array: Array<String>){}
+
 val v: reflect.Array
\ No newline at end of file
diff --git a/idea/testData/shortenRefs/type/OtherClassWithThisNameImported.kt b/idea/testData/shortenRefs/type/OtherClassWithThisNameImported.kt
new file mode 100644
index 00000000000..7b70e7aeb1d
--- /dev/null
+++ b/idea/testData/shortenRefs/type/OtherClassWithThisNameImported.kt
@@ -0,0 +1,3 @@
+import java.util.*
+
+val v: ArrayList<<selection>java.sql.Date</selection>>
\ No newline at end of file
diff --git a/idea/testData/shortenRefs/type/OtherClassWithThisNameImported.kt.after b/idea/testData/shortenRefs/type/OtherClassWithThisNameImported.kt.after
new file mode 100644
index 00000000000..48d879f0885
--- /dev/null
+++ b/idea/testData/shortenRefs/type/OtherClassWithThisNameImported.kt.after
@@ -0,0 +1,4 @@
+import java.util.*
+import java.sql.Date
+
+val v: ArrayList<Date>
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java b/idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java
index cd73cf01686..14052458666 100644
--- a/idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java
@@ -330,6 +330,12 @@ public class ShortenRefsTestGenerated extends AbstractShortenRefsTest {
             doTest(fileName);
         }
 
+        @TestMetadata("OtherClassWithThisNameImported.kt")
+        public void testOtherClassWithThisNameImported() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/OtherClassWithThisNameImported.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("SameClassTwice.kt")
         public void testSameClassTwice() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/SameClassTwice.kt");