diff --git a/idea/testData/completion/handlers/basic/NestedTypeArg.kt b/idea/testData/completion/handlers/basic/NestedTypeArg.kt
new file mode 100644
index 00000000000..7e98b77c934
--- /dev/null
+++ b/idea/testData/completion/handlers/basic/NestedTypeArg.kt
@@ -0,0 +1,8 @@
+import java.util.ArrayList
+
+class Pair<T1, T2>
+
+private val v = ArrayList<Pair<Str<caret>>>
+
+// ELEMENT: String
+// TAIL_TEXT: "(kotlin)"
diff --git a/idea/testData/completion/handlers/basic/NestedTypeArg.kt.after b/idea/testData/completion/handlers/basic/NestedTypeArg.kt.after
new file mode 100644
index 00000000000..23ea8aa73f8
--- /dev/null
+++ b/idea/testData/completion/handlers/basic/NestedTypeArg.kt.after
@@ -0,0 +1,8 @@
+import java.util.ArrayList
+
+class Pair<T1, T2>
+
+private val v = ArrayList<Pair<String<caret>>>
+
+// ELEMENT: String
+// TAIL_TEXT: "(kotlin)"
diff --git a/idea/tests/org/jetbrains/kotlin/completion/handlers/BasicCompletionHandlerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/handlers/BasicCompletionHandlerTestGenerated.java
index e9f000444aa..74dd11a39ee 100644
--- a/idea/tests/org/jetbrains/kotlin/completion/handlers/BasicCompletionHandlerTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/handlers/BasicCompletionHandlerTestGenerated.java
@@ -60,6 +60,12 @@ public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletion
         doTest(fileName);
     }
 
+    @TestMetadata("NestedTypeArg.kt")
+    public void testNestedTypeArg() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/basic/NestedTypeArg.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("SecondTypeArg.kt")
     public void testSecondTypeArg() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/basic/SecondTypeArg.kt");