diff --git a/compiler/tests/org/jetbrains/kotlin/test/MockLibraryUtil.java b/compiler/tests/org/jetbrains/kotlin/test/MockLibraryUtil.java
index 55dfec9b232..18a12fb72e8 100644
--- a/compiler/tests/org/jetbrains/kotlin/test/MockLibraryUtil.java
+++ b/compiler/tests/org/jetbrains/kotlin/test/MockLibraryUtil.java
@@ -75,12 +75,13 @@ public class MockLibraryUtil {
 
             File classesDir = new File(contentDir, "classes");
 
-            List<File> kotlinFiles = FileUtil.findFilesByMask(Pattern.compile(".*\\.kt"), new File(sourcesPath));
-            if (!kotlinFiles.isEmpty()) {
+            File srcFile = new File(sourcesPath);
+            List<File> kotlinFiles = FileUtil.findFilesByMask(Pattern.compile(".*\\.kt"), srcFile);
+            if (srcFile.isFile() || !kotlinFiles.isEmpty()) {
                 compileKotlin(sourcesPath, classesDir, extraClasspath);
             }
 
-            List<File> javaFiles = FileUtil.findFilesByMask(Pattern.compile(".*\\.java"), new File(sourcesPath));
+            List<File> javaFiles = FileUtil.findFilesByMask(Pattern.compile(".*\\.java"), srcFile);
             if (!javaFiles.isEmpty()) {
                 List<String> classpath = new ArrayList<String>();
                 classpath.add(ForTestCompileRuntime.runtimeJarForTests().getPath());
@@ -170,7 +171,9 @@ public class MockLibraryUtil {
 
     public static void compileKotlin(@NotNull String sourcesPath, @NotNull File outDir, @NotNull String... extraClasspath) {
         List<String> classpath = new ArrayList<String>();
-        classpath.add(sourcesPath);
+        if (new File(sourcesPath).isDirectory()) {
+            classpath.add(sourcesPath);
+        }
         Collections.addAll(classpath, extraClasspath);
 
         List<String> args = new ArrayList<String>();
diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index a902e7cfa27..b9f33a95c9c 100644
--- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -382,7 +382,12 @@ fun main(args: Array<String>) {
         }
 
         testClass<AbstractJavaAgainstKotlinSourceCheckerTest>() {
-            model("kotlinAndJavaChecker")
+            model("kotlinAndJavaChecker/javaAgainstKotlin")
+            model("kotlinAndJavaChecker/javaWithKotlin")
+        }
+
+        testClass<AbstractJavaAgainstKotlinBinariesCheckerTest>() {
+            model("kotlinAndJavaChecker/javaAgainstKotlin")
         }
 
         testClass<AbstractJetPsiUnifierTest>() {
diff --git a/idea/testData/kotlinAndJavaChecker/AssignKotlinClassToObjectInJava.java b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignKotlinClassToObjectInJava.java
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/AssignKotlinClassToObjectInJava.java
rename to idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignKotlinClassToObjectInJava.java
diff --git a/idea/testData/kotlinAndJavaChecker/AssignKotlinClassToObjectInJava.kt b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignKotlinClassToObjectInJava.kt
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/AssignKotlinClassToObjectInJava.kt
rename to idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignKotlinClassToObjectInJava.kt
diff --git a/idea/testData/kotlinAndJavaChecker/AssignMappedKotlinType.java b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignMappedKotlinType.java
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/AssignMappedKotlinType.java
rename to idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignMappedKotlinType.java
diff --git a/idea/testData/kotlinAndJavaChecker/AssignMappedKotlinType.kt b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignMappedKotlinType.kt
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/AssignMappedKotlinType.kt
rename to idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignMappedKotlinType.kt
diff --git a/idea/testData/kotlinAndJavaChecker/ClassObjects.java b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ClassObjects.java
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/ClassObjects.java
rename to idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ClassObjects.java
diff --git a/idea/testData/kotlinAndJavaChecker/ClassObjects.kt b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ClassObjects.kt
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/ClassObjects.kt
rename to idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ClassObjects.kt
diff --git a/idea/testData/kotlinAndJavaChecker/EnumAutoGeneratedMethods.java b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumAutoGeneratedMethods.java
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/EnumAutoGeneratedMethods.java
rename to idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumAutoGeneratedMethods.java
diff --git a/idea/testData/kotlinAndJavaChecker/EnumAutoGeneratedMethods.kt b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumAutoGeneratedMethods.kt
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/EnumAutoGeneratedMethods.kt
rename to idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumAutoGeneratedMethods.kt
diff --git a/idea/testData/kotlinAndJavaChecker/EnumEntriesInSwitch.java b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumEntriesInSwitch.java
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/EnumEntriesInSwitch.java
rename to idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumEntriesInSwitch.java
diff --git a/idea/testData/kotlinAndJavaChecker/EnumEntriesInSwitch.kt b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumEntriesInSwitch.kt
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/EnumEntriesInSwitch.kt
rename to idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumEntriesInSwitch.kt
diff --git a/idea/testData/kotlinAndJavaChecker/EnumStaticImportInJava.java b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumStaticImportInJava.java
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/EnumStaticImportInJava.java
rename to idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumStaticImportInJava.java
diff --git a/idea/testData/kotlinAndJavaChecker/EnumStaticImportInJava.kt b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumStaticImportInJava.kt
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/EnumStaticImportInJava.kt
rename to idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumStaticImportInJava.kt
diff --git a/idea/testData/kotlinAndJavaChecker/EnumStaticImportInJava.txt b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumStaticImportInJava.txt
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/EnumStaticImportInJava.txt
rename to idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumStaticImportInJava.txt
diff --git a/idea/testData/kotlinAndJavaChecker/ImplementedMethodsFromTraits.java b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromTraits.java
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/ImplementedMethodsFromTraits.java
rename to idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromTraits.java
diff --git a/idea/testData/kotlinAndJavaChecker/ImplementedMethodsFromTraits.kt b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromTraits.kt
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/ImplementedMethodsFromTraits.kt
rename to idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromTraits.kt
diff --git a/idea/testData/kotlinAndJavaChecker/JvmOverloadsFunctions.java b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.java
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/JvmOverloadsFunctions.java
rename to idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.java
diff --git a/idea/testData/kotlinAndJavaChecker/JvmOverloadsFunctions.kt b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.kt
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/JvmOverloadsFunctions.kt
rename to idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.kt
diff --git a/idea/testData/kotlinAndJavaChecker/JvmOverloadsFunctions.txt b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.txt
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/JvmOverloadsFunctions.txt
rename to idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.txt
diff --git a/idea/testData/kotlinAndJavaChecker/KotlinAnnotations.java b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/KotlinAnnotations.java
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/KotlinAnnotations.java
rename to idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/KotlinAnnotations.java
diff --git a/idea/testData/kotlinAndJavaChecker/KotlinAnnotations.kt b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/KotlinAnnotations.kt
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/KotlinAnnotations.kt
rename to idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/KotlinAnnotations.kt
diff --git a/idea/testData/kotlinAndJavaChecker/TopLevelFunctionInDataFlowInspection.java b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionInDataFlowInspection.java
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/TopLevelFunctionInDataFlowInspection.java
rename to idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionInDataFlowInspection.java
diff --git a/idea/testData/kotlinAndJavaChecker/TopLevelFunctionInDataFlowInspection.kt b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionInDataFlowInspection.kt
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/TopLevelFunctionInDataFlowInspection.kt
rename to idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionInDataFlowInspection.kt
diff --git a/idea/testData/kotlinAndJavaChecker/TopLevelFunctionInDataFlowInspection.txt b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionInDataFlowInspection.txt
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/TopLevelFunctionInDataFlowInspection.txt
rename to idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionInDataFlowInspection.txt
diff --git a/idea/testData/kotlinAndJavaChecker/UseKotlinSubclassesOfMappedTypes.java b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinSubclassesOfMappedTypes.java
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/UseKotlinSubclassesOfMappedTypes.java
rename to idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinSubclassesOfMappedTypes.java
diff --git a/idea/testData/kotlinAndJavaChecker/UseKotlinSubclassesOfMappedTypes.kt b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinSubclassesOfMappedTypes.kt
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/UseKotlinSubclassesOfMappedTypes.kt
rename to idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinSubclassesOfMappedTypes.kt
diff --git a/idea/testData/kotlinAndJavaChecker/UsingKotlinPackageDeclarations.java b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingKotlinPackageDeclarations.java
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/UsingKotlinPackageDeclarations.java
rename to idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingKotlinPackageDeclarations.java
diff --git a/idea/testData/kotlinAndJavaChecker/UsingKotlinPackageDeclarations.kt b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingKotlinPackageDeclarations.kt
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/UsingKotlinPackageDeclarations.kt
rename to idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingKotlinPackageDeclarations.kt
diff --git a/idea/testData/kotlinAndJavaChecker/NoNotNullOnParameterInOverride.java b/idea/testData/kotlinAndJavaChecker/javaWithKotlin/NoNotNullOnParameterInOverride.java
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/NoNotNullOnParameterInOverride.java
rename to idea/testData/kotlinAndJavaChecker/javaWithKotlin/NoNotNullOnParameterInOverride.java
diff --git a/idea/testData/kotlinAndJavaChecker/NoNotNullOnParameterInOverride.kt b/idea/testData/kotlinAndJavaChecker/javaWithKotlin/NoNotNullOnParameterInOverride.kt
similarity index 100%
rename from idea/testData/kotlinAndJavaChecker/NoNotNullOnParameterInOverride.kt
rename to idea/testData/kotlinAndJavaChecker/javaWithKotlin/NoNotNullOnParameterInOverride.kt
diff --git a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinBinariesCheckerTest.kt b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinBinariesCheckerTest.kt
new file mode 100644
index 00000000000..4e6a7628adb
--- /dev/null
+++ b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinBinariesCheckerTest.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2010-2015 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.checkers
+
+import com.intellij.openapi.roots.ModuleRootModificationUtil
+import com.intellij.openapi.util.io.FileUtilRt
+import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
+import org.jetbrains.kotlin.test.MockLibraryUtil
+
+abstract class AbstractJavaAgainstKotlinBinariesCheckerTest : AbstractJavaAgainstKotlinCheckerTest() {
+    override fun setUp() {
+        super.setUp()
+        val testName = getTestName(false)
+        if (testName.startsWith("AllFilesPresentIn")) {
+            return
+        }
+        val libraryName = "libFor" + testName
+        val libraryJar = MockLibraryUtil.compileLibraryToJar(
+                PluginTestCaseBase.getTestDataPathBase() + "/kotlinAndJavaChecker/javaAgainstKotlin/" + getTestName(false) + ".kt",
+                libraryName, false, false
+        )
+        val jarUrl = "jar://" + FileUtilRt.toSystemIndependentName(libraryJar.absolutePath) + "!/"
+        ModuleRootModificationUtil.addModuleLibrary(module, jarUrl)
+    }
+
+    fun doTest(path: String) {
+        doTest(true, true, path.replace(".kt", ".java"))
+    }
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinSourceCheckerTest.java b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinCheckerTest.java
similarity index 93%
rename from idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinSourceCheckerTest.java
rename to idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinCheckerTest.java
index 6630291811b..bc1b089c764 100644
--- a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinSourceCheckerTest.java
+++ b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinCheckerTest.java
@@ -39,7 +39,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
-public abstract class AbstractJavaAgainstKotlinSourceCheckerTest extends KotlinDaemonAnalyzerTestCase {
+public abstract class AbstractJavaAgainstKotlinCheckerTest extends KotlinDaemonAnalyzerTestCase {
 
     private static final LocalInspectionTool[] DEFAULT_TOOLS = new LocalInspectionTool[] {
             new StaticCallOnSubclassInspection(),
@@ -62,7 +62,7 @@ public abstract class AbstractJavaAgainstKotlinSourceCheckerTest extends KotlinD
 
     @Nullable
     protected String getConfigFileText() {
-        File configureFile = new File(PluginTestCaseBase.getTestDataPathBase() + "/kotlinAndJavaChecker/" + getTestName(false) + ".txt");
+        File configureFile = new File(PluginTestCaseBase.getTestDataPathBase() + "/kotlinAndJavaChecker/javaAgainstKotlin/" + getTestName(false) + ".txt");
         if (!configureFile.exists()) return null;
 
         try {
@@ -109,8 +109,4 @@ public abstract class AbstractJavaAgainstKotlinSourceCheckerTest extends KotlinD
     protected String getTestDataPath() {
         return JetTestUtils.getHomeDirectory() + "/";
     }
-
-    public void doTest(String path) throws Exception {
-        doTest(true, true, path.replace(".kt", ".java"), path);
-    }
 }
diff --git a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinCheckerTest.kt b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinCheckerTest.kt
new file mode 100644
index 00000000000..73476d7f462
--- /dev/null
+++ b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinCheckerTest.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2010-2015 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.checkers
+
+abstract class AbstractJavaAgainstKotlinSourceCheckerTest : AbstractJavaAgainstKotlinCheckerTest()  {
+    fun doTest(path: String) {
+        doTest(true, true, path.replace(".kt", ".java"), path)
+    }
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinBinariesCheckerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinBinariesCheckerTestGenerated.java
new file mode 100644
index 00000000000..403c1342aee
--- /dev/null
+++ b/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinBinariesCheckerTestGenerated.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2010-2015 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.checkers;
+
+import com.intellij.testFramework.TestDataPath;
+import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
+import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.TestMetadata;
+import org.junit.runner.RunWith;
+
+import java.io.File;
+import java.util.regex.Pattern;
+
+/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
+@SuppressWarnings("all")
+@TestMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin")
+@TestDataPath("$PROJECT_ROOT")
+@RunWith(JUnit3RunnerWithInners.class)
+public class JavaAgainstKotlinBinariesCheckerTestGenerated extends AbstractJavaAgainstKotlinBinariesCheckerTest {
+    public void testAllFilesPresentInJavaAgainstKotlin() throws Exception {
+        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), true);
+    }
+
+    @TestMetadata("AssignKotlinClassToObjectInJava.kt")
+    public void testAssignKotlinClassToObjectInJava() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignKotlinClassToObjectInJava.kt");
+        doTest(fileName);
+    }
+
+    @TestMetadata("AssignMappedKotlinType.kt")
+    public void testAssignMappedKotlinType() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignMappedKotlinType.kt");
+        doTest(fileName);
+    }
+
+    @TestMetadata("ClassObjects.kt")
+    public void testClassObjects() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ClassObjects.kt");
+        doTest(fileName);
+    }
+
+    @TestMetadata("EnumAutoGeneratedMethods.kt")
+    public void testEnumAutoGeneratedMethods() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumAutoGeneratedMethods.kt");
+        doTest(fileName);
+    }
+
+    @TestMetadata("EnumEntriesInSwitch.kt")
+    public void testEnumEntriesInSwitch() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumEntriesInSwitch.kt");
+        doTest(fileName);
+    }
+
+    @TestMetadata("EnumStaticImportInJava.kt")
+    public void testEnumStaticImportInJava() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumStaticImportInJava.kt");
+        doTest(fileName);
+    }
+
+    @TestMetadata("ImplementedMethodsFromTraits.kt")
+    public void testImplementedMethodsFromTraits() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromTraits.kt");
+        doTest(fileName);
+    }
+
+    @TestMetadata("JvmOverloadsFunctions.kt")
+    public void testJvmOverloadsFunctions() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.kt");
+        doTest(fileName);
+    }
+
+    @TestMetadata("KotlinAnnotations.kt")
+    public void testKotlinAnnotations() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/KotlinAnnotations.kt");
+        doTest(fileName);
+    }
+
+    @TestMetadata("TopLevelFunctionInDataFlowInspection.kt")
+    public void testTopLevelFunctionInDataFlowInspection() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionInDataFlowInspection.kt");
+        doTest(fileName);
+    }
+
+    @TestMetadata("UseKotlinSubclassesOfMappedTypes.kt")
+    public void testUseKotlinSubclassesOfMappedTypes() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinSubclassesOfMappedTypes.kt");
+        doTest(fileName);
+    }
+
+    @TestMetadata("UsingKotlinPackageDeclarations.kt")
+    public void testUsingKotlinPackageDeclarations() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingKotlinPackageDeclarations.kt");
+        doTest(fileName);
+    }
+}
diff --git a/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerTestGenerated.java
index 07f2f307ad9..10b464d1b6c 100644
--- a/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerTestGenerated.java
@@ -27,89 +27,101 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("idea/testData/kotlinAndJavaChecker")
-@TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class JavaAgainstKotlinSourceCheckerTestGenerated extends AbstractJavaAgainstKotlinSourceCheckerTest {
-    public void testAllFilesPresentInKotlinAndJavaChecker() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kotlinAndJavaChecker"), Pattern.compile("^(.+)\\.kt$"), true);
+    @TestMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class JavaAgainstKotlin extends AbstractJavaAgainstKotlinSourceCheckerTest {
+        public void testAllFilesPresentInJavaAgainstKotlin() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+
+        @TestMetadata("AssignKotlinClassToObjectInJava.kt")
+        public void testAssignKotlinClassToObjectInJava() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignKotlinClassToObjectInJava.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("AssignMappedKotlinType.kt")
+        public void testAssignMappedKotlinType() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignMappedKotlinType.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("ClassObjects.kt")
+        public void testClassObjects() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ClassObjects.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("EnumAutoGeneratedMethods.kt")
+        public void testEnumAutoGeneratedMethods() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumAutoGeneratedMethods.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("EnumEntriesInSwitch.kt")
+        public void testEnumEntriesInSwitch() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumEntriesInSwitch.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("EnumStaticImportInJava.kt")
+        public void testEnumStaticImportInJava() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumStaticImportInJava.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("ImplementedMethodsFromTraits.kt")
+        public void testImplementedMethodsFromTraits() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromTraits.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("JvmOverloadsFunctions.kt")
+        public void testJvmOverloadsFunctions() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("KotlinAnnotations.kt")
+        public void testKotlinAnnotations() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/KotlinAnnotations.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("TopLevelFunctionInDataFlowInspection.kt")
+        public void testTopLevelFunctionInDataFlowInspection() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionInDataFlowInspection.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("UseKotlinSubclassesOfMappedTypes.kt")
+        public void testUseKotlinSubclassesOfMappedTypes() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinSubclassesOfMappedTypes.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("UsingKotlinPackageDeclarations.kt")
+        public void testUsingKotlinPackageDeclarations() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingKotlinPackageDeclarations.kt");
+            doTest(fileName);
+        }
     }
 
-    @TestMetadata("AssignKotlinClassToObjectInJava.kt")
-    public void testAssignKotlinClassToObjectInJava() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/AssignKotlinClassToObjectInJava.kt");
-        doTest(fileName);
-    }
+    @TestMetadata("idea/testData/kotlinAndJavaChecker/javaWithKotlin")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class JavaWithKotlin extends AbstractJavaAgainstKotlinSourceCheckerTest {
+        public void testAllFilesPresentInJavaWithKotlin() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kotlinAndJavaChecker/javaWithKotlin"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
 
-    @TestMetadata("AssignMappedKotlinType.kt")
-    public void testAssignMappedKotlinType() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/AssignMappedKotlinType.kt");
-        doTest(fileName);
-    }
-
-    @TestMetadata("ClassObjects.kt")
-    public void testClassObjects() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/ClassObjects.kt");
-        doTest(fileName);
-    }
-
-    @TestMetadata("EnumAutoGeneratedMethods.kt")
-    public void testEnumAutoGeneratedMethods() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/EnumAutoGeneratedMethods.kt");
-        doTest(fileName);
-    }
-
-    @TestMetadata("EnumEntriesInSwitch.kt")
-    public void testEnumEntriesInSwitch() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/EnumEntriesInSwitch.kt");
-        doTest(fileName);
-    }
-
-    @TestMetadata("EnumStaticImportInJava.kt")
-    public void testEnumStaticImportInJava() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/EnumStaticImportInJava.kt");
-        doTest(fileName);
-    }
-
-    @TestMetadata("ImplementedMethodsFromTraits.kt")
-    public void testImplementedMethodsFromTraits() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/ImplementedMethodsFromTraits.kt");
-        doTest(fileName);
-    }
-
-    @TestMetadata("JvmOverloadsFunctions.kt")
-    public void testJvmOverloadsFunctions() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/JvmOverloadsFunctions.kt");
-        doTest(fileName);
-    }
-
-    @TestMetadata("KotlinAnnotations.kt")
-    public void testKotlinAnnotations() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/KotlinAnnotations.kt");
-        doTest(fileName);
-    }
-
-    @TestMetadata("NoNotNullOnParameterInOverride.kt")
-    public void testNoNotNullOnParameterInOverride() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/NoNotNullOnParameterInOverride.kt");
-        doTest(fileName);
-    }
-
-    @TestMetadata("TopLevelFunctionInDataFlowInspection.kt")
-    public void testTopLevelFunctionInDataFlowInspection() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/TopLevelFunctionInDataFlowInspection.kt");
-        doTest(fileName);
-    }
-
-    @TestMetadata("UseKotlinSubclassesOfMappedTypes.kt")
-    public void testUseKotlinSubclassesOfMappedTypes() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/UseKotlinSubclassesOfMappedTypes.kt");
-        doTest(fileName);
-    }
-
-    @TestMetadata("UsingKotlinPackageDeclarations.kt")
-    public void testUsingKotlinPackageDeclarations() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/UsingKotlinPackageDeclarations.kt");
-        doTest(fileName);
+        @TestMetadata("NoNotNullOnParameterInOverride.kt")
+        public void testNoNotNullOnParameterInOverride() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaWithKotlin/NoNotNullOnParameterInOverride.kt");
+            doTest(fileName);
+        }
     }
 }