diff --git a/idea/testData/completion/handlers/smart/GenericFunction.kt b/idea/testData/completion/handlers/smart/GenericFunction.kt
new file mode 100644
index 00000000000..a856da0d90c
--- /dev/null
+++ b/idea/testData/completion/handlers/smart/GenericFunction.kt
@@ -0,0 +1,9 @@
+class C<T>
+
+fun <T> foo(p1: C<T>, p2: T){}
+
+fun bar(s: String) {
+    foo(C<String>(), <caret>)
+}
+
+//ELEMENT: s
\ No newline at end of file
diff --git a/idea/testData/completion/handlers/smart/GenericFunction.kt.after b/idea/testData/completion/handlers/smart/GenericFunction.kt.after
new file mode 100644
index 00000000000..9e9ba689649
--- /dev/null
+++ b/idea/testData/completion/handlers/smart/GenericFunction.kt.after
@@ -0,0 +1,9 @@
+class C<T>
+
+fun <T> foo(p1: C<T>, p2: T){}
+
+fun bar(s: String) {
+    foo(C<String>(), s)
+}
+
+//ELEMENT: s
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/SmartCompletionHandlerTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/handlers/SmartCompletionHandlerTestGenerated.java
index 8ca7114b222..33c46a63964 100644
--- a/idea/tests/org/jetbrains/jet/completion/handlers/SmartCompletionHandlerTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/handlers/SmartCompletionHandlerTestGenerated.java
@@ -191,6 +191,11 @@ public class SmartCompletionHandlerTestGenerated extends AbstractSmartCompletion
         doTest("idea/testData/completion/handlers/smart/FunctionReference2.kt");
     }
     
+    @TestMetadata("GenericFunction.kt")
+    public void testGenericFunction() throws Exception {
+        doTest("idea/testData/completion/handlers/smart/GenericFunction.kt");
+    }
+    
     @TestMetadata("JavaEnumMemberInsertsImport.kt")
     public void testJavaEnumMemberInsertsImport() throws Exception {
         doTest("idea/testData/completion/handlers/smart/JavaEnumMemberInsertsImport.kt");