diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java
index 1cb6b2e26415..fe89a6c6d2d5 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java
@@ -544,6 +544,21 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
 
     }
 
+    @TestMetadata("idea/testData/quickfix/convertJavaInterfaceToClass")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class ConvertJavaInterfaceToClass extends AbstractQuickFixMultiFileTest {
+        public void testAllFilesPresentInConvertJavaInterfaceToClass() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/convertJavaInterfaceToClass"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true);
+        }
+
+        @TestMetadata("kotlinInheritor.before.Main.java")
+        public void testKotlinInheritor() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/convertJavaInterfaceToClass/kotlinInheritor.before.Main.java");
+            doTestWithExtraFile(fileName);
+        }
+    }
+
     @TestMetadata("idea/testData/quickfix/createFromUsage")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/convertJavaInterfaceToClass/kotlinInheritor.after.Dependency.kt b/plugins/kotlin/idea/tests/testData/quickfix/convertJavaInterfaceToClass/kotlinInheritor.after.Dependency.kt
new file mode 100644
index 000000000000..2b91ddccfcf1
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/convertJavaInterfaceToClass/kotlinInheritor.after.Dependency.kt
@@ -0,0 +1,9 @@
+interface IK
+
+class C2 : I() {
+
+}
+
+class C3: I(), IK {
+
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/convertJavaInterfaceToClass/kotlinInheritor.after.java b/plugins/kotlin/idea/tests/testData/quickfix/convertJavaInterfaceToClass/kotlinInheritor.after.java
new file mode 100644
index 000000000000..1d2fdaf270a3
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/convertJavaInterfaceToClass/kotlinInheritor.after.java
@@ -0,0 +1,4 @@
+// "Convert to 'class'" "true"
+public abstract class <caret>I {
+
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/convertJavaInterfaceToClass/kotlinInheritor.before.Dependency.kt b/plugins/kotlin/idea/tests/testData/quickfix/convertJavaInterfaceToClass/kotlinInheritor.before.Dependency.kt
new file mode 100644
index 000000000000..61b8b89b4d3a
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/convertJavaInterfaceToClass/kotlinInheritor.before.Dependency.kt
@@ -0,0 +1,9 @@
+interface IK
+
+class C2 : I {
+
+}
+
+class C3: I, IK {
+
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/convertJavaInterfaceToClass/kotlinInheritor.before.Main.java b/plugins/kotlin/idea/tests/testData/quickfix/convertJavaInterfaceToClass/kotlinInheritor.before.Main.java
new file mode 100644
index 000000000000..1da4d4b70192
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/convertJavaInterfaceToClass/kotlinInheritor.before.Main.java
@@ -0,0 +1,4 @@
+// "Convert to 'class'" "true"
+public interface <caret>I {
+
+}
\ No newline at end of file