diff --git a/idea/testData/completion/handlers/TypeArgOfSuper.kt b/idea/testData/completion/handlers/TypeArgOfSuper.kt
new file mode 100644
index 00000000000..3d7f3361d7d
--- /dev/null
+++ b/idea/testData/completion/handlers/TypeArgOfSuper.kt
@@ -0,0 +1,13 @@
+trait X {
+    open fun fn() {}
+}
+
+open class Y {
+    public open fun fn() {}
+}
+
+class Z : Y(), X {
+    override fun fn() {
+        super<<caret>>.fn()
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/completion/handlers/TypeArgOfSuper.kt.after b/idea/testData/completion/handlers/TypeArgOfSuper.kt.after
new file mode 100644
index 00000000000..7831dd882de
--- /dev/null
+++ b/idea/testData/completion/handlers/TypeArgOfSuper.kt.after
@@ -0,0 +1,13 @@
+trait X {
+    open fun fn() {}
+}
+
+open class Y {
+    public open fun fn() {}
+}
+
+class Z : Y(), X {
+    override fun fn() {
+        super<X<caret>>.fn()
+    }
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/BasicCompletionHandlerTest.kt b/idea/tests/org/jetbrains/jet/completion/handlers/BasicCompletionHandlerTest.kt
index 7fb2ba86b01..a1524754c6f 100644
--- a/idea/tests/org/jetbrains/jet/completion/handlers/BasicCompletionHandlerTest.kt
+++ b/idea/tests/org/jetbrains/jet/completion/handlers/BasicCompletionHandlerTest.kt
@@ -142,4 +142,6 @@ public class BasicCompletionHandlerTest : CompletionHandlerTestBase(){
 
     fun testLocalClassCompletion() = doTest(1, "LocalClass", null, '\n')
     fun testNestedLocalClassCompletion() = doTest(1, "Nested", null, '\n')
+
+    fun testTypeArgOfSuper() = doTest(1, "X", null, '\n')
 }
\ No newline at end of file