diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
index 81773acfea9..ba64f65e805 100644
--- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
+++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
@@ -295,13 +295,36 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
 
     @TestMetadata("jps-plugin/testData/incremental/withJava")
     @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({WithJava.JavaUsedInKotlin.class, WithJava.KotlinUsedInJava.class})
+    @InnerTestClasses({WithJava.ConvertBetweenJavaAndKotlin.class, WithJava.JavaUsedInKotlin.class, WithJava.KotlinUsedInJava.class})
     @RunWith(JUnit3RunnerWithInners.class)
     public static class WithJava extends AbstractIncrementalJpsTest {
         public void testAllFilesPresentInWithJava() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava"), Pattern.compile("^([^\\.]+)$"), true);
         }
 
+        @TestMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin")
+        @TestDataPath("$PROJECT_ROOT")
+        @InnerTestClasses({})
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class ConvertBetweenJavaAndKotlin extends AbstractIncrementalJpsTest {
+            public void testAllFilesPresentInConvertBetweenJavaAndKotlin() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin"), Pattern.compile("^([^\\.]+)$"), true);
+            }
+
+            @TestMetadata("javaToKotlin")
+            public void testJavaToKotlin() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/");
+                doTest(fileName);
+            }
+
+            @TestMetadata("kotlinToJava")
+            public void testKotlinToJava() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/");
+                doTest(fileName);
+            }
+
+        }
+
         @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin")
         @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({})
diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.java b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.java
new file mode 100644
index 00000000000..a802b656773
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.java
@@ -0,0 +1,5 @@
+public class TheClass {
+    public void doStuff() {
+
+    }
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.java.delete b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.java.delete
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.kt.new b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.kt.new
new file mode 100644
index 00000000000..0e11cbbd284
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.kt.new
@@ -0,0 +1,5 @@
+public class TheClass {
+    public fun doStuff() {
+
+    }
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/Usage.java b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/Usage.java
new file mode 100644
index 00000000000..c4f889667f3
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/Usage.java
@@ -0,0 +1,5 @@
+class Usage {
+    void usage() {
+        new TheClass().doStuff();
+    }
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log
new file mode 100644
index 00000000000..314bb5ebad4
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log
@@ -0,0 +1,17 @@
+Cleaning output files:
+out/production/module/TheClass.class
+End of files
+Compiling files:
+src/TheClass.kt
+End of files
+Cleaning output files:
+out/production/module/Usage.class
+out/production/module/_DefaultPackage$usage$*.class
+out/production/module/_DefaultPackage.class
+End of files
+Compiling files:
+src/usage.kt
+End of files
+Compiling files:
+src/Usage.java
+End of files
diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/usage.kt b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/usage.kt
new file mode 100644
index 00000000000..64cd1bf23ad
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/usage.kt
@@ -0,0 +1,3 @@
+fun usage() {
+    TheClass().doStuff()
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.java.new b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.java.new
new file mode 100644
index 00000000000..a802b656773
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.java.new
@@ -0,0 +1,5 @@
+public class TheClass {
+    public void doStuff() {
+
+    }
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.kt b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.kt
new file mode 100644
index 00000000000..0e11cbbd284
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.kt
@@ -0,0 +1,5 @@
+public class TheClass {
+    public fun doStuff() {
+
+    }
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.kt.delete b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.kt.delete
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/Usage.java b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/Usage.java
new file mode 100644
index 00000000000..c4f889667f3
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/Usage.java
@@ -0,0 +1,5 @@
+class Usage {
+    void usage() {
+        new TheClass().doStuff();
+    }
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log
new file mode 100644
index 00000000000..7d8a70153b1
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log
@@ -0,0 +1,19 @@
+Cleaning output files:
+out/production/module/TheClass.class
+End of files
+Compiling files:
+End of files
+Compiling files:
+src/TheClass.java
+End of files
+Cleaning output files:
+out/production/module/Usage.class
+out/production/module/_DefaultPackage$usage$*.class
+out/production/module/_DefaultPackage.class
+End of files
+Compiling files:
+src/usage.kt
+End of files
+Compiling files:
+src/Usage.java
+End of files
diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/usage.kt b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/usage.kt
new file mode 100644
index 00000000000..64cd1bf23ad
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/usage.kt
@@ -0,0 +1,3 @@
+fun usage() {
+    TheClass().doStuff()
+}
\ No newline at end of file