diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstJavaTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstJavaTest.kt
index 5d98fb73d4a..a6e3182172a 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstJavaTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstJavaTest.kt
@@ -38,13 +38,19 @@ import org.jetbrains.kotlin.test.TestJdkKind
 import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator.validateAndCompareDescriptorWithFile
 import org.junit.Assert
 import java.io.File
-import java.io.IOException
 import java.lang.annotation.Retention
 
 abstract class AbstractCompileKotlinAgainstJavaTest : TestCaseWithTmpdir() {
 
-    @Throws(IOException::class)
-    protected fun doTest(ktFilePath: String) {
+    protected fun doTestWithoutAPT(ktFilePath: String) {
+        doTest(ktFilePath, aptMode = false)
+    }
+
+    protected fun doTestWithAPT(ktFilePath: String) {
+        doTest(ktFilePath, aptMode = true)
+    }
+
+    private fun doTest(ktFilePath: String, aptMode: Boolean) {
         Assert.assertTrue(ktFilePath.endsWith(".kt"))
         val ktFile = File(ktFilePath)
         val javaFile = File(ktFilePath.replaceFirst("\\.kt$".toRegex(), ".java"))
@@ -53,7 +59,8 @@ abstract class AbstractCompileKotlinAgainstJavaTest : TestCaseWithTmpdir() {
         val compiledSuccessfully = compileKotlinWithJava(
             listOf(javaFile),
             listOf(ktFile),
-            out, testRootDisposable
+            out, testRootDisposable,
+            aptMode
         )
         if (!compiledSuccessfully) return
 
@@ -75,12 +82,12 @@ abstract class AbstractCompileKotlinAgainstJavaTest : TestCaseWithTmpdir() {
         validateAndCompareDescriptorWithFile(packageView, CONFIGURATION, expectedFile)
     }
 
-    @Throws(IOException::class)
     fun compileKotlinWithJava(
         javaFiles: List<File>,
         kotlinFiles: List<File>,
         outDir: File,
-        disposable: Disposable
+        disposable: Disposable,
+        aptMode: Boolean
     ): Boolean {
         val environment = createEnvironmentWithMockJdkAndIdeaAnnotations(disposable)
         environment.configuration.put(JVMConfigurationKeys.USE_JAVAC, true)
@@ -91,7 +98,7 @@ abstract class AbstractCompileKotlinAgainstJavaTest : TestCaseWithTmpdir() {
         environment.registerJavac(
             javaFiles = javaFiles,
             kotlinFiles = ktFiles,
-            arguments = arrayOf("-proc:none"),
+            arguments = if (aptMode) arrayOf() else arrayOf("-proc:none"),
             bootClasspath = listOf(findMockJdkRtJar())
         )
         ModuleVisibilityManager.SERVICE.getInstance(environment.project).addModule(
diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt
index 5c1d844056e..6a7b8cb3659 100644
--- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt
+++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt
@@ -298,7 +298,8 @@ fun main(args: Array<String>) {
         }
 
         testClass<AbstractCompileKotlinAgainstJavaTest> {
-            model("compileKotlinAgainstJava")
+            model("compileKotlinAgainstJava", testClassName = "WithAPT", testMethod = "doTestWithAPT")
+            model("compileKotlinAgainstJava", testClassName = "WithoutAPT", testMethod = "doTestWithoutAPT")
         }
 
         testClass<AbstractCompileKotlinAgainstKotlinTest> {
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstJavaTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstJavaTestGenerated.java
index 522817d0a3e..555813248c8 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstJavaTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstJavaTestGenerated.java
@@ -16,285 +16,571 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("compiler/testData/compileKotlinAgainstJava")
-@TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class CompileKotlinAgainstJavaTestGenerated extends AbstractCompileKotlinAgainstJavaTest {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+    @TestMetadata("compiler/testData/compileKotlinAgainstJava")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class WithAPT extends AbstractCompileKotlinAgainstJavaTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestWithAPT, this, testDataFilePath);
+        }
+
+        @TestMetadata("AbstractClass.kt")
+        public void testAbstractClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/AbstractClass.kt");
+        }
+
+        @TestMetadata("AbstractEnum.kt")
+        public void testAbstractEnum() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/AbstractEnum.kt");
+        }
+
+        public void testAllFilesPresentInWithAPT() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileKotlinAgainstJava"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+
+        @TestMetadata("AnnotationWithArguments.kt")
+        public void testAnnotationWithArguments() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/AnnotationWithArguments.kt");
+        }
+
+        @TestMetadata("AnnotationWithField.kt")
+        public void testAnnotationWithField() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/AnnotationWithField.kt");
+        }
+
+        @TestMetadata("AsteriskInImport.kt")
+        public void testAsteriskInImport() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/AsteriskInImport.kt");
+        }
+
+        @TestMetadata("CheckKotlinStub.kt")
+        public void testCheckKotlinStub() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/CheckKotlinStub.kt");
+        }
+
+        @TestMetadata("CheckNotNull.kt")
+        public void testCheckNotNull() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/CheckNotNull.kt");
+        }
+
+        @TestMetadata("Class.kt")
+        public void testClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Class.kt");
+        }
+
+        @TestMetadata("ClassWithNestedEnum.kt")
+        public void testClassWithNestedEnum() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ClassWithNestedEnum.kt");
+        }
+
+        @TestMetadata("ClassWithTypeParameter.kt")
+        public void testClassWithTypeParameter() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ClassWithTypeParameter.kt");
+        }
+
+        @TestMetadata("CyclicDependencies.kt")
+        public void testCyclicDependencies() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/CyclicDependencies.kt");
+        }
+
+        @TestMetadata("DefaultModifier.kt")
+        public void testDefaultModifier() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/DefaultModifier.kt");
+        }
+
+        @TestMetadata("EnclosingClassInner.kt")
+        public void testEnclosingClassInner() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/EnclosingClassInner.kt");
+        }
+
+        @TestMetadata("Enum.kt")
+        public void testEnum() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Enum.kt");
+        }
+
+        @TestMetadata("EnumName.kt")
+        public void testEnumName() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/EnumName.kt");
+        }
+
+        @TestMetadata("EnumValues.kt")
+        public void testEnumValues() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/EnumValues.kt");
+        }
+
+        @TestMetadata("Inheritance.kt")
+        public void testInheritance() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Inheritance.kt");
+        }
+
+        @TestMetadata("InheritedInner.kt")
+        public void testInheritedInner() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InheritedInner.kt");
+        }
+
+        @TestMetadata("InnerCanonicalName.kt")
+        public void testInnerCanonicalName() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InnerCanonicalName.kt");
+        }
+
+        @TestMetadata("InnerClass.kt")
+        public void testInnerClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InnerClass.kt");
+        }
+
+        @TestMetadata("InnerClassFromAsteriskImport.kt")
+        public void testInnerClassFromAsteriskImport() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InnerClassFromAsteriskImport.kt");
+        }
+
+        @TestMetadata("InnerClassFromImport.kt")
+        public void testInnerClassFromImport() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InnerClassFromImport.kt");
+        }
+
+        @TestMetadata("InnerWithGenericOuter.kt")
+        public void testInnerWithGenericOuter() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InnerWithGenericOuter.kt");
+        }
+
+        @TestMetadata("Interface.kt")
+        public void testInterface() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Interface.kt");
+        }
+
+        @TestMetadata("InterfaceField.kt")
+        public void testInterfaceField() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InterfaceField.kt");
+        }
+
+        @TestMetadata("InterfaceMemberClass.kt")
+        public void testInterfaceMemberClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InterfaceMemberClass.kt");
+        }
+
+        @TestMetadata("InterfaceWithDefault.kt")
+        public void testInterfaceWithDefault() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InterfaceWithDefault.kt");
+        }
+
+        @TestMetadata("JavaLangClass.kt")
+        public void testJavaLangClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/JavaLangClass.kt");
+        }
+
+        @TestMetadata("ListImpl.kt")
+        public void testListImpl() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ListImpl.kt");
+        }
+
+        @TestMetadata("MapExample.kt")
+        public void testMapExample() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/MapExample.kt");
+        }
+
+        @TestMetadata("Method.kt")
+        public void testMethod() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Method.kt");
+        }
+
+        @TestMetadata("MethodWithArgument.kt")
+        public void testMethodWithArgument() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/MethodWithArgument.kt");
+        }
+
+        @TestMetadata("MethodWithSeveralTypeParameters.kt")
+        public void testMethodWithSeveralTypeParameters() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/MethodWithSeveralTypeParameters.kt");
+        }
+
+        @TestMetadata("MethodWithTypeParameter.kt")
+        public void testMethodWithTypeParameter() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/MethodWithTypeParameter.kt");
+        }
+
+        @TestMetadata("MethodWithWildcard.kt")
+        public void testMethodWithWildcard() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/MethodWithWildcard.kt");
+        }
+
+        @TestMetadata("Nesting.kt")
+        public void testNesting() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Nesting.kt");
+        }
+
+        @TestMetadata("RawReturnType.kt")
+        public void testRawReturnType() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/RawReturnType.kt");
+        }
+
+        @TestMetadata("ReturnEnum.kt")
+        public void testReturnEnum() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnEnum.kt");
+        }
+
+        @TestMetadata("ReturnInnerClass.kt")
+        public void testReturnInnerClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnInnerClass.kt");
+        }
+
+        @TestMetadata("ReturnInnerInInner.kt")
+        public void testReturnInnerInInner() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnInnerInInner.kt");
+        }
+
+        @TestMetadata("ReturnInnerInner.kt")
+        public void testReturnInnerInner() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnInnerInner.kt");
+        }
+
+        @TestMetadata("ReturnNested.kt")
+        public void testReturnNested() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnNested.kt");
+        }
+
+        @TestMetadata("ReturnNestedFQ.kt")
+        public void testReturnNestedFQ() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnNestedFQ.kt");
+        }
+
+        @TestMetadata("ReturnType.kt")
+        public void testReturnType() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnType.kt");
+        }
+
+        @TestMetadata("ReturnTypeResolution.kt")
+        public void testReturnTypeResolution() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnTypeResolution.kt");
+        }
+
+        @TestMetadata("SeveralInnerClasses.kt")
+        public void testSeveralInnerClasses() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/SeveralInnerClasses.kt");
+        }
+
+        @TestMetadata("SimpleAnnotation.kt")
+        public void testSimpleAnnotation() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/SimpleAnnotation.kt");
+        }
+
+        @TestMetadata("SimpleWildcard.kt")
+        public void testSimpleWildcard() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/SimpleWildcard.kt");
+        }
+
+        @TestMetadata("Singleton.kt")
+        public void testSingleton() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Singleton.kt");
+        }
+
+        @TestMetadata("StaticNestedClass.kt")
+        public void testStaticNestedClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/StaticNestedClass.kt");
+        }
+
+        @TestMetadata("TypeArgumentInSuperType.kt")
+        public void testTypeArgumentInSuperType() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/TypeArgumentInSuperType.kt");
+        }
+
+        @TestMetadata("TypeParameter.kt")
+        public void testTypeParameter() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/TypeParameter.kt");
+        }
+
+        @TestMetadata("UseKtClass.kt")
+        public void testUseKtClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/UseKtClass.kt");
+        }
+
+        @TestMetadata("Vararg.kt")
+        public void testVararg() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Vararg.kt");
+        }
     }
 
-    @TestMetadata("AbstractClass.kt")
-    public void testAbstractClass() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/AbstractClass.kt");
-    }
+    @TestMetadata("compiler/testData/compileKotlinAgainstJava")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class WithoutAPT extends AbstractCompileKotlinAgainstJavaTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestWithoutAPT, this, testDataFilePath);
+        }
 
-    @TestMetadata("AbstractEnum.kt")
-    public void testAbstractEnum() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/AbstractEnum.kt");
-    }
+        @TestMetadata("AbstractClass.kt")
+        public void testAbstractClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/AbstractClass.kt");
+        }
 
-    public void testAllFilesPresentInCompileKotlinAgainstJava() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileKotlinAgainstJava"), Pattern.compile("^(.+)\\.kt$"), true);
-    }
+        @TestMetadata("AbstractEnum.kt")
+        public void testAbstractEnum() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/AbstractEnum.kt");
+        }
 
-    @TestMetadata("AnnotationWithArguments.kt")
-    public void testAnnotationWithArguments() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/AnnotationWithArguments.kt");
-    }
+        public void testAllFilesPresentInWithoutAPT() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileKotlinAgainstJava"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
 
-    @TestMetadata("AnnotationWithField.kt")
-    public void testAnnotationWithField() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/AnnotationWithField.kt");
-    }
+        @TestMetadata("AnnotationWithArguments.kt")
+        public void testAnnotationWithArguments() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/AnnotationWithArguments.kt");
+        }
 
-    @TestMetadata("AsteriskInImport.kt")
-    public void testAsteriskInImport() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/AsteriskInImport.kt");
-    }
+        @TestMetadata("AnnotationWithField.kt")
+        public void testAnnotationWithField() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/AnnotationWithField.kt");
+        }
 
-    @TestMetadata("CheckKotlinStub.kt")
-    public void testCheckKotlinStub() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/CheckKotlinStub.kt");
-    }
+        @TestMetadata("AsteriskInImport.kt")
+        public void testAsteriskInImport() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/AsteriskInImport.kt");
+        }
 
-    @TestMetadata("CheckNotNull.kt")
-    public void testCheckNotNull() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/CheckNotNull.kt");
-    }
+        @TestMetadata("CheckKotlinStub.kt")
+        public void testCheckKotlinStub() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/CheckKotlinStub.kt");
+        }
 
-    @TestMetadata("Class.kt")
-    public void testClass() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/Class.kt");
-    }
+        @TestMetadata("CheckNotNull.kt")
+        public void testCheckNotNull() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/CheckNotNull.kt");
+        }
 
-    @TestMetadata("ClassWithNestedEnum.kt")
-    public void testClassWithNestedEnum() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/ClassWithNestedEnum.kt");
-    }
+        @TestMetadata("Class.kt")
+        public void testClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Class.kt");
+        }
 
-    @TestMetadata("ClassWithTypeParameter.kt")
-    public void testClassWithTypeParameter() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/ClassWithTypeParameter.kt");
-    }
+        @TestMetadata("ClassWithNestedEnum.kt")
+        public void testClassWithNestedEnum() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ClassWithNestedEnum.kt");
+        }
 
-    @TestMetadata("CyclicDependencies.kt")
-    public void testCyclicDependencies() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/CyclicDependencies.kt");
-    }
+        @TestMetadata("ClassWithTypeParameter.kt")
+        public void testClassWithTypeParameter() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ClassWithTypeParameter.kt");
+        }
 
-    @TestMetadata("DefaultModifier.kt")
-    public void testDefaultModifier() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/DefaultModifier.kt");
-    }
+        @TestMetadata("CyclicDependencies.kt")
+        public void testCyclicDependencies() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/CyclicDependencies.kt");
+        }
 
-    @TestMetadata("EnclosingClassInner.kt")
-    public void testEnclosingClassInner() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/EnclosingClassInner.kt");
-    }
+        @TestMetadata("DefaultModifier.kt")
+        public void testDefaultModifier() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/DefaultModifier.kt");
+        }
 
-    @TestMetadata("Enum.kt")
-    public void testEnum() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/Enum.kt");
-    }
+        @TestMetadata("EnclosingClassInner.kt")
+        public void testEnclosingClassInner() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/EnclosingClassInner.kt");
+        }
 
-    @TestMetadata("EnumName.kt")
-    public void testEnumName() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/EnumName.kt");
-    }
+        @TestMetadata("Enum.kt")
+        public void testEnum() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Enum.kt");
+        }
 
-    @TestMetadata("EnumValues.kt")
-    public void testEnumValues() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/EnumValues.kt");
-    }
+        @TestMetadata("EnumName.kt")
+        public void testEnumName() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/EnumName.kt");
+        }
 
-    @TestMetadata("Inheritance.kt")
-    public void testInheritance() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/Inheritance.kt");
-    }
+        @TestMetadata("EnumValues.kt")
+        public void testEnumValues() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/EnumValues.kt");
+        }
 
-    @TestMetadata("InheritedInner.kt")
-    public void testInheritedInner() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/InheritedInner.kt");
-    }
+        @TestMetadata("Inheritance.kt")
+        public void testInheritance() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Inheritance.kt");
+        }
 
-    @TestMetadata("InnerCanonicalName.kt")
-    public void testInnerCanonicalName() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/InnerCanonicalName.kt");
-    }
+        @TestMetadata("InheritedInner.kt")
+        public void testInheritedInner() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InheritedInner.kt");
+        }
 
-    @TestMetadata("InnerClass.kt")
-    public void testInnerClass() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/InnerClass.kt");
-    }
+        @TestMetadata("InnerCanonicalName.kt")
+        public void testInnerCanonicalName() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InnerCanonicalName.kt");
+        }
 
-    @TestMetadata("InnerClassFromAsteriskImport.kt")
-    public void testInnerClassFromAsteriskImport() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/InnerClassFromAsteriskImport.kt");
-    }
+        @TestMetadata("InnerClass.kt")
+        public void testInnerClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InnerClass.kt");
+        }
 
-    @TestMetadata("InnerClassFromImport.kt")
-    public void testInnerClassFromImport() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/InnerClassFromImport.kt");
-    }
+        @TestMetadata("InnerClassFromAsteriskImport.kt")
+        public void testInnerClassFromAsteriskImport() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InnerClassFromAsteriskImport.kt");
+        }
 
-    @TestMetadata("InnerWithGenericOuter.kt")
-    public void testInnerWithGenericOuter() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/InnerWithGenericOuter.kt");
-    }
+        @TestMetadata("InnerClassFromImport.kt")
+        public void testInnerClassFromImport() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InnerClassFromImport.kt");
+        }
 
-    @TestMetadata("Interface.kt")
-    public void testInterface() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/Interface.kt");
-    }
+        @TestMetadata("InnerWithGenericOuter.kt")
+        public void testInnerWithGenericOuter() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InnerWithGenericOuter.kt");
+        }
 
-    @TestMetadata("InterfaceField.kt")
-    public void testInterfaceField() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/InterfaceField.kt");
-    }
+        @TestMetadata("Interface.kt")
+        public void testInterface() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Interface.kt");
+        }
 
-    @TestMetadata("InterfaceMemberClass.kt")
-    public void testInterfaceMemberClass() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/InterfaceMemberClass.kt");
-    }
+        @TestMetadata("InterfaceField.kt")
+        public void testInterfaceField() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InterfaceField.kt");
+        }
 
-    @TestMetadata("InterfaceWithDefault.kt")
-    public void testInterfaceWithDefault() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/InterfaceWithDefault.kt");
-    }
+        @TestMetadata("InterfaceMemberClass.kt")
+        public void testInterfaceMemberClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InterfaceMemberClass.kt");
+        }
 
-    @TestMetadata("JavaLangClass.kt")
-    public void testJavaLangClass() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/JavaLangClass.kt");
-    }
+        @TestMetadata("InterfaceWithDefault.kt")
+        public void testInterfaceWithDefault() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/InterfaceWithDefault.kt");
+        }
 
-    @TestMetadata("ListImpl.kt")
-    public void testListImpl() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/ListImpl.kt");
-    }
+        @TestMetadata("JavaLangClass.kt")
+        public void testJavaLangClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/JavaLangClass.kt");
+        }
 
-    @TestMetadata("MapExample.kt")
-    public void testMapExample() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/MapExample.kt");
-    }
+        @TestMetadata("ListImpl.kt")
+        public void testListImpl() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ListImpl.kt");
+        }
 
-    @TestMetadata("Method.kt")
-    public void testMethod() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/Method.kt");
-    }
+        @TestMetadata("MapExample.kt")
+        public void testMapExample() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/MapExample.kt");
+        }
 
-    @TestMetadata("MethodWithArgument.kt")
-    public void testMethodWithArgument() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/MethodWithArgument.kt");
-    }
+        @TestMetadata("Method.kt")
+        public void testMethod() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Method.kt");
+        }
 
-    @TestMetadata("MethodWithSeveralTypeParameters.kt")
-    public void testMethodWithSeveralTypeParameters() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/MethodWithSeveralTypeParameters.kt");
-    }
+        @TestMetadata("MethodWithArgument.kt")
+        public void testMethodWithArgument() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/MethodWithArgument.kt");
+        }
 
-    @TestMetadata("MethodWithTypeParameter.kt")
-    public void testMethodWithTypeParameter() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/MethodWithTypeParameter.kt");
-    }
+        @TestMetadata("MethodWithSeveralTypeParameters.kt")
+        public void testMethodWithSeveralTypeParameters() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/MethodWithSeveralTypeParameters.kt");
+        }
 
-    @TestMetadata("MethodWithWildcard.kt")
-    public void testMethodWithWildcard() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/MethodWithWildcard.kt");
-    }
+        @TestMetadata("MethodWithTypeParameter.kt")
+        public void testMethodWithTypeParameter() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/MethodWithTypeParameter.kt");
+        }
 
-    @TestMetadata("Nesting.kt")
-    public void testNesting() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/Nesting.kt");
-    }
+        @TestMetadata("MethodWithWildcard.kt")
+        public void testMethodWithWildcard() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/MethodWithWildcard.kt");
+        }
 
-    @TestMetadata("RawReturnType.kt")
-    public void testRawReturnType() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/RawReturnType.kt");
-    }
+        @TestMetadata("Nesting.kt")
+        public void testNesting() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Nesting.kt");
+        }
 
-    @TestMetadata("ReturnEnum.kt")
-    public void testReturnEnum() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/ReturnEnum.kt");
-    }
+        @TestMetadata("RawReturnType.kt")
+        public void testRawReturnType() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/RawReturnType.kt");
+        }
 
-    @TestMetadata("ReturnInnerClass.kt")
-    public void testReturnInnerClass() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/ReturnInnerClass.kt");
-    }
+        @TestMetadata("ReturnEnum.kt")
+        public void testReturnEnum() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnEnum.kt");
+        }
 
-    @TestMetadata("ReturnInnerInInner.kt")
-    public void testReturnInnerInInner() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/ReturnInnerInInner.kt");
-    }
+        @TestMetadata("ReturnInnerClass.kt")
+        public void testReturnInnerClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnInnerClass.kt");
+        }
 
-    @TestMetadata("ReturnInnerInner.kt")
-    public void testReturnInnerInner() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/ReturnInnerInner.kt");
-    }
+        @TestMetadata("ReturnInnerInInner.kt")
+        public void testReturnInnerInInner() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnInnerInInner.kt");
+        }
 
-    @TestMetadata("ReturnNested.kt")
-    public void testReturnNested() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/ReturnNested.kt");
-    }
+        @TestMetadata("ReturnInnerInner.kt")
+        public void testReturnInnerInner() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnInnerInner.kt");
+        }
 
-    @TestMetadata("ReturnNestedFQ.kt")
-    public void testReturnNestedFQ() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/ReturnNestedFQ.kt");
-    }
+        @TestMetadata("ReturnNested.kt")
+        public void testReturnNested() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnNested.kt");
+        }
 
-    @TestMetadata("ReturnType.kt")
-    public void testReturnType() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/ReturnType.kt");
-    }
+        @TestMetadata("ReturnNestedFQ.kt")
+        public void testReturnNestedFQ() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnNestedFQ.kt");
+        }
 
-    @TestMetadata("ReturnTypeResolution.kt")
-    public void testReturnTypeResolution() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/ReturnTypeResolution.kt");
-    }
+        @TestMetadata("ReturnType.kt")
+        public void testReturnType() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnType.kt");
+        }
 
-    @TestMetadata("SeveralInnerClasses.kt")
-    public void testSeveralInnerClasses() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/SeveralInnerClasses.kt");
-    }
+        @TestMetadata("ReturnTypeResolution.kt")
+        public void testReturnTypeResolution() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/ReturnTypeResolution.kt");
+        }
 
-    @TestMetadata("SimpleAnnotation.kt")
-    public void testSimpleAnnotation() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/SimpleAnnotation.kt");
-    }
+        @TestMetadata("SeveralInnerClasses.kt")
+        public void testSeveralInnerClasses() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/SeveralInnerClasses.kt");
+        }
 
-    @TestMetadata("SimpleWildcard.kt")
-    public void testSimpleWildcard() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/SimpleWildcard.kt");
-    }
+        @TestMetadata("SimpleAnnotation.kt")
+        public void testSimpleAnnotation() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/SimpleAnnotation.kt");
+        }
 
-    @TestMetadata("Singleton.kt")
-    public void testSingleton() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/Singleton.kt");
-    }
+        @TestMetadata("SimpleWildcard.kt")
+        public void testSimpleWildcard() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/SimpleWildcard.kt");
+        }
 
-    @TestMetadata("StaticNestedClass.kt")
-    public void testStaticNestedClass() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/StaticNestedClass.kt");
-    }
+        @TestMetadata("Singleton.kt")
+        public void testSingleton() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Singleton.kt");
+        }
 
-    @TestMetadata("TypeArgumentInSuperType.kt")
-    public void testTypeArgumentInSuperType() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/TypeArgumentInSuperType.kt");
-    }
+        @TestMetadata("StaticNestedClass.kt")
+        public void testStaticNestedClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/StaticNestedClass.kt");
+        }
 
-    @TestMetadata("TypeParameter.kt")
-    public void testTypeParameter() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/TypeParameter.kt");
-    }
+        @TestMetadata("TypeArgumentInSuperType.kt")
+        public void testTypeArgumentInSuperType() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/TypeArgumentInSuperType.kt");
+        }
 
-    @TestMetadata("UseKtClass.kt")
-    public void testUseKtClass() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/UseKtClass.kt");
-    }
+        @TestMetadata("TypeParameter.kt")
+        public void testTypeParameter() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/TypeParameter.kt");
+        }
 
-    @TestMetadata("Vararg.kt")
-    public void testVararg() throws Exception {
-        runTest("compiler/testData/compileKotlinAgainstJava/Vararg.kt");
+        @TestMetadata("UseKtClass.kt")
+        public void testUseKtClass() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/UseKtClass.kt");
+        }
+
+        @TestMetadata("Vararg.kt")
+        public void testVararg() throws Exception {
+            runTest("compiler/testData/compileKotlinAgainstJava/Vararg.kt");
+        }
     }
 }