diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.kt
index 4556ebac3374..4178cd2ee581 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.kt
@@ -247,4 +247,8 @@ class OverrideImplementTest : AbstractOverrideImplementTest() {
     fun testPlatformTypes() {
         doOverrideDirectoryTest("foo")
     }
+
+    fun testAbstractAndNonAbstractInheritedFromInterface() {
+        doImplementFileTest("getFoo")
+    }
 }
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/abstractAndNonAbstractInheritedFromInterface.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/abstractAndNonAbstractInheritedFromInterface.kt
new file mode 100644
index 000000000000..084a486e8556
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/abstractAndNonAbstractInheritedFromInterface.kt
@@ -0,0 +1,11 @@
+interface T {
+    fun getFoo(): String = ""
+}
+
+interface U {
+    fun getFoo(): String
+}
+
+class C1 : T, U {
+    <caret>
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/abstractAndNonAbstractInheritedFromInterface.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/abstractAndNonAbstractInheritedFromInterface.kt.after
new file mode 100644
index 000000000000..8296de3a8759
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/abstractAndNonAbstractInheritedFromInterface.kt.after
@@ -0,0 +1,13 @@
+interface T {
+    fun getFoo(): String = ""
+}
+
+interface U {
+    fun getFoo(): String
+}
+
+class C1 : T, U {
+    override fun getFoo(): String {
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+    }
+}
\ No newline at end of file