diff --git a/idea/testData/completion/basic/common/SubstitutedSignature1.kt b/idea/testData/completion/basic/common/SubstitutedSignature1.kt
new file mode 100644
index 00000000000..3854f88f50c
--- /dev/null
+++ b/idea/testData/completion/basic/common/SubstitutedSignature1.kt
@@ -0,0 +1,6 @@
+fun foo(list: MutableList<String>) {
+    list.<caret>
+}
+
+// EXIST: { itemText: "add", tailText: "(e: String)", typeText: "Boolean" }
+// EXIST: { itemText: "iterator", tailText: "()", typeText: "Iterator<String>" }
diff --git a/idea/testData/completion/basic/common/SubstitutedSignature2.kt b/idea/testData/completion/basic/common/SubstitutedSignature2.kt
new file mode 100644
index 00000000000..127a569b876
--- /dev/null
+++ b/idea/testData/completion/basic/common/SubstitutedSignature2.kt
@@ -0,0 +1,11 @@
+open class C<T> {
+    fun foo(t: T): T = t
+}
+
+class B : C<String>() {
+    fun f() {
+        <caret>
+    }
+}
+
+// EXIST: { itemText: "foo", tailText: "(t: String)", typeText: "String" }
diff --git a/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java
index 9e5fe380523..d5b72b7419a 100644
--- a/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java
@@ -802,6 +802,18 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
             doTest(fileName);
         }
 
+        @TestMetadata("SubstitutedSignature1.kt")
+        public void testSubstitutedSignature1() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/SubstitutedSignature1.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("SubstitutedSignature2.kt")
+        public void testSubstitutedSignature2() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/SubstitutedSignature2.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("TopLevelClassCompletionInQualifiedCall.kt")
         public void testTopLevelClassCompletionInQualifiedCall() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/TopLevelClassCompletionInQualifiedCall.kt");
diff --git a/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java
index 4977fff1b76..ad7db85552f 100644
--- a/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java
@@ -802,6 +802,18 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
             doTest(fileName);
         }
 
+        @TestMetadata("SubstitutedSignature1.kt")
+        public void testSubstitutedSignature1() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/SubstitutedSignature1.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("SubstitutedSignature2.kt")
+        public void testSubstitutedSignature2() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/SubstitutedSignature2.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("TopLevelClassCompletionInQualifiedCall.kt")
         public void testTopLevelClassCompletionInQualifiedCall() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/TopLevelClassCompletionInQualifiedCall.kt");