diff --git a/idea/testData/codeInsight/overrideImplement/overrideFromClassName.kt b/idea/testData/codeInsight/overrideImplement/overrideFromClassName.kt
new file mode 100644
index 00000000000..1365cdce0bd
--- /dev/null
+++ b/idea/testData/codeInsight/overrideImplement/overrideFromClassName.kt
@@ -0,0 +1,13 @@
+trait Some {
+    fun foo()
+}
+
+class <caret>Other {
+    fun test() {
+        val a = 1
+    }
+    fun otherTest() {
+
+    }
+}
+
diff --git a/idea/testData/codeInsight/overrideImplement/overrideFromClassName.kt.after b/idea/testData/codeInsight/overrideImplement/overrideFromClassName.kt.after
new file mode 100644
index 00000000000..8389bb2e908
--- /dev/null
+++ b/idea/testData/codeInsight/overrideImplement/overrideFromClassName.kt.after
@@ -0,0 +1,21 @@
+trait Some {
+    fun foo()
+}
+
+class Other {
+    override fun equals(other: Any?): Boolean {
+        <selection><caret>return super<Any>.equals(other)</selection>
+    }
+    override fun hashCode(): Int {
+        return super<Any>.hashCode()
+    }
+    override fun toString(): String {
+        return super<Any>.toString()
+    }
+    fun test() {
+        val a = 1
+    }
+    fun otherTest() {
+
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/overrideFromFunctionPosition.kt b/idea/testData/codeInsight/overrideImplement/overrideFromFunctionPosition.kt
new file mode 100644
index 00000000000..fb34348c279
--- /dev/null
+++ b/idea/testData/codeInsight/overrideImplement/overrideFromFunctionPosition.kt
@@ -0,0 +1,13 @@
+trait Some {
+    fun foo()
+}
+
+class Other {
+    fun test() {
+        val a = 1<caret>
+    }
+    fun otherTest() {
+
+    }
+}
+
diff --git a/idea/testData/codeInsight/overrideImplement/overrideFromFunctionPosition.kt.after b/idea/testData/codeInsight/overrideImplement/overrideFromFunctionPosition.kt.after
new file mode 100644
index 00000000000..61a5231a05a
--- /dev/null
+++ b/idea/testData/codeInsight/overrideImplement/overrideFromFunctionPosition.kt.after
@@ -0,0 +1,21 @@
+trait Some {
+    fun foo()
+}
+
+class Other {
+    fun test() {
+        val a = 1
+    }
+    override fun equals(other: Any?): Boolean {
+        <selection><caret>return super<Any>.equals(other)</selection>
+    }
+    override fun hashCode(): Int {
+        return super<Any>.hashCode()
+    }
+    override fun toString(): String {
+        return super<Any>.toString()
+    }
+    fun otherTest() {
+
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/overrideFromLBrace.kt b/idea/testData/codeInsight/overrideImplement/overrideFromLBrace.kt
new file mode 100644
index 00000000000..6cd00a4b6bf
--- /dev/null
+++ b/idea/testData/codeInsight/overrideImplement/overrideFromLBrace.kt
@@ -0,0 +1,13 @@
+trait Some {
+    fun foo()
+}
+
+class Other <caret>{
+    fun test() {
+        val a = 1
+    }
+    fun otherTest() {
+
+    }
+}
+
diff --git a/idea/testData/codeInsight/overrideImplement/overrideFromLBrace.kt.after b/idea/testData/codeInsight/overrideImplement/overrideFromLBrace.kt.after
new file mode 100644
index 00000000000..8389bb2e908
--- /dev/null
+++ b/idea/testData/codeInsight/overrideImplement/overrideFromLBrace.kt.after
@@ -0,0 +1,21 @@
+trait Some {
+    fun foo()
+}
+
+class Other {
+    override fun equals(other: Any?): Boolean {
+        <selection><caret>return super<Any>.equals(other)</selection>
+    }
+    override fun hashCode(): Int {
+        return super<Any>.hashCode()
+    }
+    override fun toString(): String {
+        return super<Any>.toString()
+    }
+    fun test() {
+        val a = 1
+    }
+    fun otherTest() {
+
+    }
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementTest.java
index e04c6f2f4c9..c8ad3a6ff18 100644
--- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementTest.java
@@ -151,6 +151,18 @@ public final class OverrideImplementTest extends AbstractOverrideImplementTest {
         doImplementDirectoryTest();
     }
 
+    public void testOverrideFromFunctionPosition() {
+        doMultiOverrideFileTest();
+    }
+
+    public void testOverrideFromClassName() {
+        doMultiOverrideFileTest();
+    }
+
+    public void testOverrideFromLBrace() {
+        doMultiOverrideFileTest();
+    }
+
     public void testCheckNotImportedTypesFromJava() {
         boolean oldValue = CodeInsightSettings.getInstance().OPTIMIZE_IMPORTS_ON_THE_FLY;
         try {