diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index 692a96bea63..7073de21eb2 100755
--- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -34,10 +34,7 @@ import org.jetbrains.kotlin.android.synthetic.test.AbstractAndroidBytecodeShapeT
 import org.jetbrains.kotlin.android.synthetic.test.AbstractAndroidSyntheticPropertyDescriptorTest
 import org.jetbrains.kotlin.asJava.classes.AbstractUltraLightClassLoadingTest
 import org.jetbrains.kotlin.asJava.classes.AbstractUltraLightClassSanityTest
-import org.jetbrains.kotlin.checkers.AbstractJavaAgainstKotlinBinariesCheckerTest
-import org.jetbrains.kotlin.checkers.AbstractJavaAgainstKotlinSourceCheckerTest
-import org.jetbrains.kotlin.checkers.AbstractJsCheckerTest
-import org.jetbrains.kotlin.checkers.AbstractPsiCheckerTest
+import org.jetbrains.kotlin.checkers.*
 import org.jetbrains.kotlin.findUsages.AbstractFindUsagesTest
 import org.jetbrains.kotlin.findUsages.AbstractKotlinFindUsagesWithLibraryTest
 import org.jetbrains.kotlin.formatter.AbstractFormatterTest
@@ -192,6 +189,11 @@ fun main(args: Array<String>) {
             model("kotlinAndJavaChecker/javaWithKotlin")
         }
 
+        testClass<AbstractJavaAgainstKotlinSourceCheckerWithUltraLightTest> {
+            model("kotlinAndJavaChecker/javaAgainstKotlin")
+            model("kotlinAndJavaChecker/javaWithKotlin")
+        }
+
         testClass<AbstractJavaAgainstKotlinBinariesCheckerTest> {
             model("kotlinAndJavaChecker/javaAgainstKotlin")
         }
diff --git a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinCheckerTest.kt b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinCheckerTest.kt
index 73476d7f462..4981c339460 100644
--- a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinCheckerTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinCheckerTest.kt
@@ -16,8 +16,17 @@
 
 package org.jetbrains.kotlin.checkers
 
-abstract class AbstractJavaAgainstKotlinSourceCheckerTest : AbstractJavaAgainstKotlinCheckerTest()  {
+import org.jetbrains.kotlin.idea.perf.forceUsingUltraLightClassesForTest
+
+abstract class AbstractJavaAgainstKotlinSourceCheckerTest : AbstractJavaAgainstKotlinCheckerTest() {
     fun doTest(path: String) {
         doTest(true, true, path.replace(".kt", ".java"), path)
     }
-}
\ No newline at end of file
+}
+
+abstract class AbstractJavaAgainstKotlinSourceCheckerWithUltraLightTest : AbstractJavaAgainstKotlinSourceCheckerTest() {
+    override fun setUp() {
+        super.setUp()
+        forceUsingUltraLightClassesForTest()
+    }
+}
diff --git a/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerWithUltraLightTestGenerated.java b/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerWithUltraLightTestGenerated.java
new file mode 100644
index 00000000000..cf4ee7f45c0
--- /dev/null
+++ b/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerWithUltraLightTestGenerated.java
@@ -0,0 +1,207 @@
+/*
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.checkers;
+
+import com.intellij.testFramework.TestDataPath;
+import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
+import org.jetbrains.kotlin.test.TargetBackend;
+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")
+@RunWith(JUnit3RunnerWithInners.class)
+public class JavaAgainstKotlinSourceCheckerWithUltraLightTestGenerated extends AbstractJavaAgainstKotlinSourceCheckerWithUltraLightTest {
+    @TestMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class JavaAgainstKotlin extends AbstractJavaAgainstKotlinSourceCheckerWithUltraLightTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInJavaAgainstKotlin() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
+        }
+
+        @TestMetadata("AssignKotlinClassToObjectInJava.kt")
+        public void testAssignKotlinClassToObjectInJava() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignKotlinClassToObjectInJava.kt");
+        }
+
+        @TestMetadata("AssignMappedKotlinType.kt")
+        public void testAssignMappedKotlinType() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignMappedKotlinType.kt");
+        }
+
+        @TestMetadata("ClassObjects.kt")
+        public void testClassObjects() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ClassObjects.kt");
+        }
+
+        @TestMetadata("EnumAutoGeneratedMethods.kt")
+        public void testEnumAutoGeneratedMethods() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumAutoGeneratedMethods.kt");
+        }
+
+        @TestMetadata("EnumEntriesInSwitch.kt")
+        public void testEnumEntriesInSwitch() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumEntriesInSwitch.kt");
+        }
+
+        @TestMetadata("EnumStaticImportInJava.kt")
+        public void testEnumStaticImportInJava() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumStaticImportInJava.kt");
+        }
+
+        @TestMetadata("ExtendClassWithDefaultImplementationComplex.kt")
+        public void testExtendClassWithDefaultImplementationComplex() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendClassWithDefaultImplementationComplex.kt");
+        }
+
+        @TestMetadata("ExtendClassWithDefaultImplementation_1_6.kt")
+        public void testExtendClassWithDefaultImplementation_1_6() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendClassWithDefaultImplementation_1_6.kt");
+        }
+
+        @TestMetadata("ExtendClassWithDefaultImplementation_1_8.kt")
+        public void testExtendClassWithDefaultImplementation_1_8() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendClassWithDefaultImplementation_1_8.kt");
+        }
+
+        @TestMetadata("ExtendClassWithJvmDefaultImplementation.kt")
+        public void testExtendClassWithJvmDefaultImplementation() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendClassWithJvmDefaultImplementation.kt");
+        }
+
+        @TestMetadata("ExtendingMutableInterfaces.kt")
+        public void testExtendingMutableInterfaces() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendingMutableInterfaces.kt");
+        }
+
+        @TestMetadata("ExtendingReadOnlyInterfaces.kt")
+        public void testExtendingReadOnlyInterfaces() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendingReadOnlyInterfaces.kt");
+        }
+
+        @TestMetadata("FunctionInNestedClassInDataFlowInspection.kt")
+        public void testFunctionInNestedClassInDataFlowInspection() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/FunctionInNestedClassInDataFlowInspection.kt");
+        }
+
+        @TestMetadata("ImplementedMethodsFromTraits.kt")
+        public void testImplementedMethodsFromTraits() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromTraits.kt");
+        }
+
+        @TestMetadata("InferenceReturnType_1_6.kt")
+        public void testInferenceReturnType_1_6() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/InferenceReturnType_1_6.kt");
+        }
+
+        @TestMetadata("InferenceReturnType_1_8.kt")
+        public void testInferenceReturnType_1_8() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/InferenceReturnType_1_8.kt");
+        }
+
+        @TestMetadata("InterfaceDefaultImpls.kt")
+        public void testInterfaceDefaultImpls() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/InterfaceDefaultImpls.kt");
+        }
+
+        @TestMetadata("JvmOverloadsFunctions.kt")
+        public void testJvmOverloadsFunctions() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.kt");
+        }
+
+        @TestMetadata("KotlinAnnotations.kt")
+        public void testKotlinAnnotations() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/KotlinAnnotations.kt");
+        }
+
+        @TestMetadata("ReturnInnerClasses.kt")
+        public void testReturnInnerClasses() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ReturnInnerClasses.kt");
+        }
+
+        @TestMetadata("TopLevelFunctionInDataFlowInspection.kt")
+        public void testTopLevelFunctionInDataFlowInspection() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionInDataFlowInspection.kt");
+        }
+
+        @TestMetadata("TopLevelFunctionWithNameSimilarToClassInDataFlowInspection.kt")
+        public void testTopLevelFunctionWithNameSimilarToClassInDataFlowInspection() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionWithNameSimilarToClassInDataFlowInspection.kt");
+        }
+
+        @TestMetadata("TopLevelFunctionWithNameSimilarToPropertyInDataFlowInspection.kt")
+        public void testTopLevelFunctionWithNameSimilarToPropertyInDataFlowInspection() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionWithNameSimilarToPropertyInDataFlowInspection.kt");
+        }
+
+        @TestMetadata("TopLevelOverloadedFunctionInDataFlowInspection.kt")
+        public void testTopLevelOverloadedFunctionInDataFlowInspection() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelOverloadedFunctionInDataFlowInspection.kt");
+        }
+
+        @TestMetadata("UseKotlinConstInSwitch.kt")
+        public void testUseKotlinConstInSwitch() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinConstInSwitch.kt");
+        }
+
+        @TestMetadata("UseKotlinSubclassesOfMappedTypes.kt")
+        public void testUseKotlinSubclassesOfMappedTypes() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinSubclassesOfMappedTypes.kt");
+        }
+
+        @TestMetadata("UsingKotlinPackageDeclarations.kt")
+        public void testUsingKotlinPackageDeclarations() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingKotlinPackageDeclarations.kt");
+        }
+
+        @TestMetadata("UsingMutableInterfaces.kt")
+        public void testUsingMutableInterfaces() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingMutableInterfaces.kt");
+        }
+
+        @TestMetadata("UsingReadOnlyInterfaces.kt")
+        public void testUsingReadOnlyInterfaces() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingReadOnlyInterfaces.kt");
+        }
+    }
+
+    @TestMetadata("idea/testData/kotlinAndJavaChecker/javaWithKotlin")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class JavaWithKotlin extends AbstractJavaAgainstKotlinSourceCheckerWithUltraLightTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInJavaWithKotlin() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kotlinAndJavaChecker/javaWithKotlin"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
+        }
+
+        @TestMetadata("InnerClassWithoutName.kt")
+        public void testInnerClassWithoutName() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaWithKotlin/InnerClassWithoutName.kt");
+        }
+
+        @TestMetadata("JvmPackageNameFileFacade.kt")
+        public void testJvmPackageNameFileFacade() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaWithKotlin/JvmPackageNameFileFacade.kt");
+        }
+
+        @TestMetadata("NoNotNullOnParameterInOverride.kt")
+        public void testNoNotNullOnParameterInOverride() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaWithKotlin/NoNotNullOnParameterInOverride.kt");
+        }
+    }
+}