diff --git a/idea/testData/codeInsight/overrideImplement/propagationKJK/foo/Bar.java b/idea/testData/codeInsight/overrideImplement/propagationKJK/foo/Bar.java
new file mode 100644
index 00000000000..008b3aa7619
--- /dev/null
+++ b/idea/testData/codeInsight/overrideImplement/propagationKJK/foo/Bar.java
@@ -0,0 +1,7 @@
+package foo;
+
+public class Bar implements Foo {
+    public Object f() {
+        throw new UnsupportedOperationException();
+    }
+}
diff --git a/idea/testData/codeInsight/overrideImplement/propagationKJK/foo/Foo.kt b/idea/testData/codeInsight/overrideImplement/propagationKJK/foo/Foo.kt
new file mode 100644
index 00000000000..e0a420c153c
--- /dev/null
+++ b/idea/testData/codeInsight/overrideImplement/propagationKJK/foo/Foo.kt
@@ -0,0 +1,5 @@
+package foo
+
+public trait Foo {
+    fun f(): Any
+}
diff --git a/idea/testData/codeInsight/overrideImplement/propagationKJK/foo/Impl.kt b/idea/testData/codeInsight/overrideImplement/propagationKJK/foo/Impl.kt
new file mode 100644
index 00000000000..f76f9a68418
--- /dev/null
+++ b/idea/testData/codeInsight/overrideImplement/propagationKJK/foo/Impl.kt
@@ -0,0 +1,5 @@
+package foo
+
+class Impl : Bar() {
+    <caret>
+}
diff --git a/idea/testData/codeInsight/overrideImplement/propagationKJK/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/propagationKJK/foo/Impl.kt.after
new file mode 100644
index 00000000000..4e582dca078
--- /dev/null
+++ b/idea/testData/codeInsight/overrideImplement/propagationKJK/foo/Impl.kt.after
@@ -0,0 +1,8 @@
+package foo
+
+class Impl : Bar() {
+
+    override fun f(): Any {
+        return super<Bar>.f()
+    }
+}
diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementTest.java
index 2db30a54ced..0a45e381b5c 100644
--- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -149,4 +149,8 @@ public final class OverrideImplementTest extends AbstractOverrideImplementTest {
     public void testSameTypeName() {
         doDirectoryTest(new OverrideMethodsHandler());
     }
+
+    public void testPropagationKJK() {
+        doDirectoryTest(new OverrideMethodsHandler());
+    }
 }