diff --git a/compiler/incremental-compilation-impl/incremental-compilation-impl.iml b/compiler/incremental-compilation-impl/incremental-compilation-impl.iml
index 84461901b20..c317050d542 100644
--- a/compiler/incremental-compilation-impl/incremental-compilation-impl.iml
+++ b/compiler/incremental-compilation-impl/incremental-compilation-impl.iml
@@ -18,5 +18,8 @@
     <orderEntry type="module" module-name="util" />
     <orderEntry type="library" name="junit-4.12" level="project" />
     <orderEntry type="module" module-name="js.frontend" />
+    <orderEntry type="module" module-name="js.translator" />
+    <orderEntry type="module" module-name="js.serializer" />
+    <orderEntry type="module" module-name="tests-common" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalCompilerRunnerTestBase.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalCompilerRunnerTestBase.kt
similarity index 77%
rename from compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalCompilerRunnerTestBase.kt
rename to compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalCompilerRunnerTestBase.kt
index 7654898bb24..97c5cb93837 100644
--- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalCompilerRunnerTestBase.kt
+++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalCompilerRunnerTestBase.kt
@@ -28,19 +28,12 @@ import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
 import java.io.File
 
-@RunWith(Parameterized::class)
-abstract class IncrementalCompilerRunnerTestBase<Args : CommonCompilerArguments> : TestWithWorkingDir() {
-    @Parameterized.Parameter
-    lateinit var testDir: File
-
-    @Suppress("unused")
-    @Parameterized.Parameter(value = 1)
-    lateinit var readableName: String
-
+abstract class AbstractIncrementalCompilerRunnerTestBase<Args : CommonCompilerArguments> : TestWithWorkingDir() {
     protected abstract fun createCompilerArguments(destinationDir: File, testDir: File): Args
 
-    @Test
-    fun testFromJps() {
+    fun doTest(path: String) {
+        val testDir = File(path)
+
         fun Iterable<File>.relativePaths() =
                 map { it.relativeTo(workingDir).path.replace('\\', '/') }
 
@@ -142,38 +135,6 @@ abstract class IncrementalCompilerRunnerTestBase<Args : CommonCompilerArguments>
         @JvmStatic
         protected val bootstrapKotlincLib: File = File("dependencies/bootstrap-compiler/Kotlin/kotlinc/lib")
 
-        private val jpsResourcesPath = File("jps-plugin/testData/incremental")
-        private val ignoredDirs = setOf(File(jpsResourcesPath, "cacheVersionChanged"),
-                                        File(jpsResourcesPath, "changeIncrementalOption"),
-                                        File(jpsResourcesPath, "custom"),
-                                        File(jpsResourcesPath, "lookupTracker"))
         private val buildLogFinder = BuildLogFinder(isGradleEnabled = true)
-
-        @Suppress("unused")
-        @Parameterized.Parameters(name = "{1}")
-        @JvmStatic
-        fun data(): List<Array<*>> {
-            fun File.isValidTestDir(): Boolean {
-                if (!isDirectory) return false
-
-                // multi-module tests
-                val files = list()
-                if ("dependencies.txt" in files) return false
-
-                val logFile = buildLogFinder.findBuildLog(this) ?: return false
-                val parsedLog = parseTestBuildLog(logFile)
-                // tests with java may be expected to fail in javac
-                return files.none { it.endsWith(".java") } && parsedLog.all { it.compiledJavaFiles.isEmpty() }
-            }
-
-            fun File.relativeToGrandfather() =
-                    relativeTo(parentFile.parentFile).path
-
-            return jpsResourcesPath.walk()
-                    .onEnter { it !in ignoredDirs }
-                    .filter(File::isValidTestDir)
-                    .map { arrayOf(it, it.relativeToGrandfather()) }
-                    .toList()
-        }
     }
 }
\ No newline at end of file
diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTest.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJsCompilerRunnerTest.kt
similarity index 92%
rename from compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTest.kt
rename to compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJsCompilerRunnerTest.kt
index 96f20ac0a39..9baa3f05be7 100644
--- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTest.kt
+++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJsCompilerRunnerTest.kt
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.incremental.utils.TestICReporter
 import org.jetbrains.kotlin.incremental.utils.TestMessageCollector
 import java.io.File
 
-class IncrementalJsCompilerRunnerTest : IncrementalCompilerRunnerTestBase<K2JSCompilerArguments>() {
+abstract class AbstractIncrementalJsCompilerRunnerTest : AbstractIncrementalCompilerRunnerTestBase<K2JSCompilerArguments>() {
     override fun make(cacheDir: File, sourceRoots: Iterable<File>, args: K2JSCompilerArguments): TestCompilationResult {
         val reporter = TestICReporter()
         val messageCollector = TestMessageCollector()
diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTest.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJvmCompilerRunnerTest.kt
similarity index 92%
rename from compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTest.kt
rename to compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJvmCompilerRunnerTest.kt
index 2a5562e0d76..24cf6f980f1 100644
--- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTest.kt
+++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJvmCompilerRunnerTest.kt
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.incremental.utils.TestICReporter
 import org.jetbrains.kotlin.incremental.utils.TestMessageCollector
 import java.io.File
 
-class IncrementalJvmCompilerRunnerTest : IncrementalCompilerRunnerTestBase<K2JVMCompilerArguments>() {
+abstract class AbstractIncrementalJvmCompilerRunnerTest : AbstractIncrementalCompilerRunnerTestBase<K2JVMCompilerArguments>() {
     override fun make(cacheDir: File, sourceRoots: Iterable<File>, args: K2JVMCompilerArguments): TestCompilationResult {
         val reporter = TestICReporter()
         val messageCollector = TestMessageCollector()
diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTestGenerated.java
new file mode 100644
index 00000000000..221539b4cbc
--- /dev/null
+++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTestGenerated.java
@@ -0,0 +1,848 @@
+/*
+ * Copyright 2010-2017 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.incremental;
+
+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")
+@TestMetadata("jps-plugin/testData/incremental/pureKotlin")
+@TestDataPath("$PROJECT_ROOT")
+@RunWith(JUnit3RunnerWithInners.class)
+public class IncrementalJsCompilerRunnerTestGenerated extends AbstractIncrementalJsCompilerRunnerTest {
+    @TestMetadata("accessingFunctionsViaPackagePart")
+    public void testAccessingFunctionsViaPackagePart() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("accessingFunctionsViaRenamedFileClass")
+    public void testAccessingFunctionsViaRenamedFileClass() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("accessingPropertiesViaField")
+    public void testAccessingPropertiesViaField() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("addClass")
+    public void testAddClass() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/addClass/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("addFileWithFunctionOverload")
+    public void testAddFileWithFunctionOverload() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("addMemberTypeAlias")
+    public void testAddMemberTypeAlias() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("addTopLevelTypeAlias")
+    public void testAddTopLevelTypeAlias() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("allConstants")
+    public void testAllConstants() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/allConstants/");
+        doTest(fileName);
+    }
+
+    public void testAllFilesPresentInPureKotlin() throws Exception {
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
+    }
+
+    @TestMetadata("annotations")
+    public void testAnnotations() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/annotations/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("anonymousObjectChanged")
+    public void testAnonymousObjectChanged() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("changeTypeImplicitlyWithCircularDependency")
+    public void testChangeTypeImplicitlyWithCircularDependency() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("changeWithRemovingUsage")
+    public void testChangeWithRemovingUsage() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("classInlineFunctionChanged")
+    public void testClassInlineFunctionChanged() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("classObjectConstantChanged")
+    public void testClassObjectConstantChanged() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("classRecreated")
+    public void testClassRecreated() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classRecreated/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("classRedeclaration")
+    public void testClassRedeclaration() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classRedeclaration/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("classSignatureChanged")
+    public void testClassSignatureChanged() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("classSignatureUnchanged")
+    public void testClassSignatureUnchanged() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("compilationErrorThenFixedOtherPackage")
+    public void testCompilationErrorThenFixedOtherPackage() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("compilationErrorThenFixedSamePackage")
+    public void testCompilationErrorThenFixedSamePackage() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("compilationErrorThenFixedWithPhantomPart")
+    public void testCompilationErrorThenFixedWithPhantomPart() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("compilationErrorThenFixedWithPhantomPart2")
+    public void testCompilationErrorThenFixedWithPhantomPart2() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("compilationErrorThenFixedWithPhantomPart3")
+    public void testCompilationErrorThenFixedWithPhantomPart3() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("conflictingPlatformDeclarations")
+    public void testConflictingPlatformDeclarations() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("constantRemoved")
+    public void testConstantRemoved() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantRemoved/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("constantsUnchanged")
+    public void testConstantsUnchanged() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("defaultArgumentInConstructorAdded")
+    public void testDefaultArgumentInConstructorAdded() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("defaultArgumentInConstructorRemoved")
+    public void testDefaultArgumentInConstructorRemoved() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("defaultValueAdded")
+    public void testDefaultValueAdded() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("defaultValueChanged")
+    public void testDefaultValueChanged() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("defaultValueInConstructorAdded")
+    public void testDefaultValueInConstructorAdded() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("defaultValueInConstructorChanged")
+    public void testDefaultValueInConstructorChanged() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("defaultValueInConstructorRemoved")
+    public void testDefaultValueInConstructorRemoved() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("defaultValueRemoved1")
+    public void testDefaultValueRemoved1() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("defaultValueRemoved2")
+    public void testDefaultValueRemoved2() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("delegatedPropertyInlineExtensionAccessor")
+    public void testDelegatedPropertyInlineExtensionAccessor() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("delegatedPropertyInlineMethodAccessor")
+    public void testDelegatedPropertyInlineMethodAccessor() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("dependencyClassReferenced")
+    public void testDependencyClassReferenced() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("fileWithConstantRemoved")
+    public void testFileWithConstantRemoved() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("fileWithInlineFunctionRemoved")
+    public void testFileWithInlineFunctionRemoved() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("filesExchangePackages")
+    public void testFilesExchangePackages() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("funRedeclaration")
+    public void testFunRedeclaration() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/funRedeclaration/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("funVsConstructorOverloadConflict")
+    public void testFunVsConstructorOverloadConflict() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("functionBecameInline")
+    public void testFunctionBecameInline() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/functionBecameInline/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("independentClasses")
+    public void testIndependentClasses() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/independentClasses/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("inlinFunctionUsageAdded")
+    public void testInlinFunctionUsageAdded() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("inlineClassValProperty")
+    public void testInlineClassValProperty() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("inlineClassVarProperty")
+    public void testInlineClassVarProperty() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("inlineFunctionRemoved")
+    public void testInlineFunctionRemoved() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("inlineFunctionsCircularDependency")
+    public void testInlineFunctionsCircularDependency() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("inlineFunctionsUnchanged")
+    public void testInlineFunctionsUnchanged() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("inlineLinesChanged")
+    public void testInlineLinesChanged() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("inlineModifiedWithUsage")
+    public void testInlineModifiedWithUsage() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("inlinePrivateFunctionAdded")
+    public void testInlinePrivateFunctionAdded() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("inlineTopLevelFunctionWithJvmName")
+    public void testInlineTopLevelFunctionWithJvmName() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("inlineTopLevelValProperty")
+    public void testInlineTopLevelValProperty() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("inlineTopLevelValPropertyWithJvmName")
+    public void testInlineTopLevelValPropertyWithJvmName() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("inlineTopLevelVarProperty")
+    public void testInlineTopLevelVarProperty() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("inlineTwoFunctionsOneChanged")
+    public void testInlineTwoFunctionsOneChanged() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("inlineUsedWhereDeclared")
+    public void testInlineUsedWhereDeclared() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("internalClassChanged")
+    public void testInternalClassChanged() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/internalClassChanged/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("internalMemberInClassChanged")
+    public void testInternalMemberInClassChanged() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("internalTypealias")
+    public void testInternalTypealias() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/internalTypealias/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("internalTypealiasConstructor")
+    public void testInternalTypealiasConstructor() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/internalTypealiasConstructor/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("internalTypealiasObject")
+    public void testInternalTypealiasObject() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/internalTypealiasObject/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("localClassChanged")
+    public void testLocalClassChanged() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/localClassChanged/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("mainRedeclaration")
+    public void testMainRedeclaration() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("moveClass")
+    public void testMoveClass() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/moveClass/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("moveFileWithChangingPackage")
+    public void testMoveFileWithChangingPackage() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("moveFileWithoutChangingPackage")
+    public void testMoveFileWithoutChangingPackage() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("multifileClassAddTopLevelFunWithDefault")
+    public void testMultifileClassAddTopLevelFunWithDefault() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("multifileClassFileAdded")
+    public void testMultifileClassFileAdded() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("multifileClassFileChanged")
+    public void testMultifileClassFileChanged() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("multifileClassFileMovedToAnotherMultifileClass")
+    public void testMultifileClassFileMovedToAnotherMultifileClass() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("multifileClassInlineFunction")
+    public void testMultifileClassInlineFunction() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("multifileClassInlineFunctionAccessingField")
+    public void testMultifileClassInlineFunctionAccessingField() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("multifileClassRecreated")
+    public void testMultifileClassRecreated() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("multifileClassRecreatedAfterRenaming")
+    public void testMultifileClassRecreatedAfterRenaming() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("multifileClassRemoved")
+    public void testMultifileClassRemoved() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("multiplePackagesModified")
+    public void testMultiplePackagesModified() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("objectConstantChanged")
+    public void testObjectConstantChanged() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("optionalParameter")
+    public void testOptionalParameter() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/optionalParameter/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("ourClassReferenced")
+    public void testOurClassReferenced() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("packageConstantChanged")
+    public void testPackageConstantChanged() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("packageFileAdded")
+    public void testPackageFileAdded() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileAdded/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("packageFileChangedPackage")
+    public void testPackageFileChangedPackage() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("packageFileChangedThenOtherRemoved")
+    public void testPackageFileChangedThenOtherRemoved() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("packageFileRemoved")
+    public void testPackageFileRemoved() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("packageFilesChangedInTurn")
+    public void testPackageFilesChangedInTurn() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("packageInlineFunctionAccessingField")
+    public void testPackageInlineFunctionAccessingField() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("packageInlineFunctionFromOurPackage")
+    public void testPackageInlineFunctionFromOurPackage() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("packageMultifileClassOneFileWithPublicChanges")
+    public void testPackageMultifileClassOneFileWithPublicChanges() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("packageMultifileClassPrivateOnlyChanged")
+    public void testPackageMultifileClassPrivateOnlyChanged() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("packagePrivateOnlyChanged")
+    public void testPackagePrivateOnlyChanged() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("packageRecreated")
+    public void testPackageRecreated() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRecreated/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("packageRecreatedAfterRenaming")
+    public void testPackageRecreatedAfterRenaming() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("packageRemoved")
+    public void testPackageRemoved() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRemoved/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("privateConstantsChanged")
+    public void testPrivateConstantsChanged() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("privateMethodAdded")
+    public void testPrivateMethodAdded() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("privateMethodDeleted")
+    public void testPrivateMethodDeleted() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("privateMethodSignatureChanged")
+    public void testPrivateMethodSignatureChanged() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("privateSecondaryConstructorAdded")
+    public void testPrivateSecondaryConstructorAdded() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("privateSecondaryConstructorDeleted")
+    public void testPrivateSecondaryConstructorDeleted() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("privateValAccessorChanged")
+    public void testPrivateValAccessorChanged() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("privateValAdded")
+    public void testPrivateValAdded() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValAdded/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("privateValDeleted")
+    public void testPrivateValDeleted() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValDeleted/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("privateValSignatureChanged")
+    public void testPrivateValSignatureChanged() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("privateVarAdded")
+    public void testPrivateVarAdded() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateVarAdded/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("privateVarDeleted")
+    public void testPrivateVarDeleted() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("privateVarSignatureChanged")
+    public void testPrivateVarSignatureChanged() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("propertyRedeclaration")
+    public void testPropertyRedeclaration() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("publicPropertyWithPrivateSetter")
+    public void testPublicPropertyWithPrivateSetter() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("publicPropertyWithPrivateSetterMultiFileFacade")
+    public void testPublicPropertyWithPrivateSetterMultiFileFacade() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("removeAndRestoreCompanion")
+    public void testRemoveAndRestoreCompanion() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("removeAndRestoreCompanionWithImplicitUsages")
+    public void testRemoveAndRestoreCompanionWithImplicitUsages() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("removeClass")
+    public void testRemoveClass() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeClass/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("removeClassInDefaultPackage")
+    public void testRemoveClassInDefaultPackage() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("removeFileWithFunctionOverload")
+    public void testRemoveFileWithFunctionOverload() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("removeMemberTypeAlias")
+    public void testRemoveMemberTypeAlias() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("removeTopLevelTypeAlias")
+    public void testRemoveTopLevelTypeAlias() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("renameClass")
+    public void testRenameClass() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/renameClass/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("renameFileWithFunctionOverload")
+    public void testRenameFileWithFunctionOverload() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("returnTypeChanged")
+    public void testReturnTypeChanged() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("simpleClassDependency")
+    public void testSimpleClassDependency() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("soleFileChangesPackage")
+    public void testSoleFileChangesPackage() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("subpackage")
+    public void testSubpackage() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/subpackage/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("suspendWithStateMachine")
+    public void testSuspendWithStateMachine() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("topLevelFunctionSameSignature")
+    public void testTopLevelFunctionSameSignature() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("topLevelFunctionWithJvmName")
+    public void testTopLevelFunctionWithJvmName() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("topLevelMembersInTwoFiles")
+    public void testTopLevelMembersInTwoFiles() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("topLevelPrivateValUsageAdded")
+    public void testTopLevelPrivateValUsageAdded() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("topLevelPropertyWithJvmName")
+    public void testTopLevelPropertyWithJvmName() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("traitClassObjectConstantChanged")
+    public void testTraitClassObjectConstantChanged() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("valAddCustomAccessor")
+    public void testValAddCustomAccessor() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("valRemoveCustomAccessor")
+    public void testValRemoveCustomAccessor() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/");
+        doTest(fileName);
+    }
+}
diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java
new file mode 100644
index 00000000000..d26babc592b
--- /dev/null
+++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java
@@ -0,0 +1,944 @@
+/*
+ * Copyright 2010-2017 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.incremental;
+
+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 IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrementalJvmCompilerRunnerTest {
+    @TestMetadata("jps-plugin/testData/incremental/pureKotlin")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class PureKotlin extends AbstractIncrementalJvmCompilerRunnerTest {
+        @TestMetadata("accessingFunctionsViaPackagePart")
+        public void testAccessingFunctionsViaPackagePart() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("accessingFunctionsViaRenamedFileClass")
+        public void testAccessingFunctionsViaRenamedFileClass() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("accessingPropertiesViaField")
+        public void testAccessingPropertiesViaField() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("addClass")
+        public void testAddClass() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/addClass/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("addFileWithFunctionOverload")
+        public void testAddFileWithFunctionOverload() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("addMemberTypeAlias")
+        public void testAddMemberTypeAlias() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("addTopLevelTypeAlias")
+        public void testAddTopLevelTypeAlias() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("allConstants")
+        public void testAllConstants() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/allConstants/");
+            doTest(fileName);
+        }
+
+        public void testAllFilesPresentInPureKotlin() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
+        }
+
+        @TestMetadata("annotations")
+        public void testAnnotations() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/annotations/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("anonymousObjectChanged")
+        public void testAnonymousObjectChanged() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("changeTypeImplicitlyWithCircularDependency")
+        public void testChangeTypeImplicitlyWithCircularDependency() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("changeWithRemovingUsage")
+        public void testChangeWithRemovingUsage() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("classInlineFunctionChanged")
+        public void testClassInlineFunctionChanged() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("classObjectConstantChanged")
+        public void testClassObjectConstantChanged() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("classRecreated")
+        public void testClassRecreated() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classRecreated/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("classRedeclaration")
+        public void testClassRedeclaration() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classRedeclaration/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("classSignatureChanged")
+        public void testClassSignatureChanged() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("classSignatureUnchanged")
+        public void testClassSignatureUnchanged() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("compilationErrorThenFixedOtherPackage")
+        public void testCompilationErrorThenFixedOtherPackage() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("compilationErrorThenFixedSamePackage")
+        public void testCompilationErrorThenFixedSamePackage() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("compilationErrorThenFixedWithPhantomPart")
+        public void testCompilationErrorThenFixedWithPhantomPart() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("compilationErrorThenFixedWithPhantomPart2")
+        public void testCompilationErrorThenFixedWithPhantomPart2() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("compilationErrorThenFixedWithPhantomPart3")
+        public void testCompilationErrorThenFixedWithPhantomPart3() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("conflictingPlatformDeclarations")
+        public void testConflictingPlatformDeclarations() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("constantRemoved")
+        public void testConstantRemoved() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantRemoved/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("constantsUnchanged")
+        public void testConstantsUnchanged() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("defaultArgumentInConstructorAdded")
+        public void testDefaultArgumentInConstructorAdded() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("defaultArgumentInConstructorRemoved")
+        public void testDefaultArgumentInConstructorRemoved() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("defaultValueAdded")
+        public void testDefaultValueAdded() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("defaultValueChanged")
+        public void testDefaultValueChanged() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("defaultValueInConstructorAdded")
+        public void testDefaultValueInConstructorAdded() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("defaultValueInConstructorChanged")
+        public void testDefaultValueInConstructorChanged() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("defaultValueInConstructorRemoved")
+        public void testDefaultValueInConstructorRemoved() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("defaultValueRemoved1")
+        public void testDefaultValueRemoved1() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("defaultValueRemoved2")
+        public void testDefaultValueRemoved2() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("delegatedPropertyInlineExtensionAccessor")
+        public void testDelegatedPropertyInlineExtensionAccessor() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("delegatedPropertyInlineMethodAccessor")
+        public void testDelegatedPropertyInlineMethodAccessor() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("dependencyClassReferenced")
+        public void testDependencyClassReferenced() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("fileWithConstantRemoved")
+        public void testFileWithConstantRemoved() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("fileWithInlineFunctionRemoved")
+        public void testFileWithInlineFunctionRemoved() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("filesExchangePackages")
+        public void testFilesExchangePackages() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("funRedeclaration")
+        public void testFunRedeclaration() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/funRedeclaration/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("funVsConstructorOverloadConflict")
+        public void testFunVsConstructorOverloadConflict() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("functionBecameInline")
+        public void testFunctionBecameInline() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/functionBecameInline/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("independentClasses")
+        public void testIndependentClasses() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/independentClasses/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("inlinFunctionUsageAdded")
+        public void testInlinFunctionUsageAdded() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("inlineClassValProperty")
+        public void testInlineClassValProperty() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("inlineClassVarProperty")
+        public void testInlineClassVarProperty() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("inlineFunctionRemoved")
+        public void testInlineFunctionRemoved() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("inlineFunctionsCircularDependency")
+        public void testInlineFunctionsCircularDependency() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("inlineFunctionsUnchanged")
+        public void testInlineFunctionsUnchanged() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("inlineLinesChanged")
+        public void testInlineLinesChanged() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("inlineModifiedWithUsage")
+        public void testInlineModifiedWithUsage() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("inlinePrivateFunctionAdded")
+        public void testInlinePrivateFunctionAdded() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("inlineTopLevelFunctionWithJvmName")
+        public void testInlineTopLevelFunctionWithJvmName() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("inlineTopLevelValProperty")
+        public void testInlineTopLevelValProperty() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("inlineTopLevelValPropertyWithJvmName")
+        public void testInlineTopLevelValPropertyWithJvmName() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("inlineTopLevelVarProperty")
+        public void testInlineTopLevelVarProperty() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("inlineTwoFunctionsOneChanged")
+        public void testInlineTwoFunctionsOneChanged() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("inlineUsedWhereDeclared")
+        public void testInlineUsedWhereDeclared() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("internalClassChanged")
+        public void testInternalClassChanged() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/internalClassChanged/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("internalMemberInClassChanged")
+        public void testInternalMemberInClassChanged() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("internalTypealias")
+        public void testInternalTypealias() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/internalTypealias/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("internalTypealiasConstructor")
+        public void testInternalTypealiasConstructor() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/internalTypealiasConstructor/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("internalTypealiasObject")
+        public void testInternalTypealiasObject() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/internalTypealiasObject/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("localClassChanged")
+        public void testLocalClassChanged() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/localClassChanged/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("mainRedeclaration")
+        public void testMainRedeclaration() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("moveClass")
+        public void testMoveClass() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/moveClass/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("moveFileWithChangingPackage")
+        public void testMoveFileWithChangingPackage() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("moveFileWithoutChangingPackage")
+        public void testMoveFileWithoutChangingPackage() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("multifileClassAddTopLevelFunWithDefault")
+        public void testMultifileClassAddTopLevelFunWithDefault() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("multifileClassFileAdded")
+        public void testMultifileClassFileAdded() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("multifileClassFileChanged")
+        public void testMultifileClassFileChanged() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("multifileClassFileMovedToAnotherMultifileClass")
+        public void testMultifileClassFileMovedToAnotherMultifileClass() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("multifileClassInlineFunction")
+        public void testMultifileClassInlineFunction() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("multifileClassInlineFunctionAccessingField")
+        public void testMultifileClassInlineFunctionAccessingField() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("multifileClassRecreated")
+        public void testMultifileClassRecreated() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("multifileClassRecreatedAfterRenaming")
+        public void testMultifileClassRecreatedAfterRenaming() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("multifileClassRemoved")
+        public void testMultifileClassRemoved() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("multiplePackagesModified")
+        public void testMultiplePackagesModified() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("objectConstantChanged")
+        public void testObjectConstantChanged() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("optionalParameter")
+        public void testOptionalParameter() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/optionalParameter/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("ourClassReferenced")
+        public void testOurClassReferenced() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("packageConstantChanged")
+        public void testPackageConstantChanged() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("packageFileAdded")
+        public void testPackageFileAdded() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileAdded/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("packageFileChangedPackage")
+        public void testPackageFileChangedPackage() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("packageFileChangedThenOtherRemoved")
+        public void testPackageFileChangedThenOtherRemoved() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("packageFileRemoved")
+        public void testPackageFileRemoved() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("packageFilesChangedInTurn")
+        public void testPackageFilesChangedInTurn() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("packageInlineFunctionAccessingField")
+        public void testPackageInlineFunctionAccessingField() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("packageInlineFunctionFromOurPackage")
+        public void testPackageInlineFunctionFromOurPackage() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("packageMultifileClassOneFileWithPublicChanges")
+        public void testPackageMultifileClassOneFileWithPublicChanges() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("packageMultifileClassPrivateOnlyChanged")
+        public void testPackageMultifileClassPrivateOnlyChanged() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("packagePrivateOnlyChanged")
+        public void testPackagePrivateOnlyChanged() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("packageRecreated")
+        public void testPackageRecreated() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRecreated/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("packageRecreatedAfterRenaming")
+        public void testPackageRecreatedAfterRenaming() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("packageRemoved")
+        public void testPackageRemoved() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRemoved/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("privateConstantsChanged")
+        public void testPrivateConstantsChanged() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("privateMethodAdded")
+        public void testPrivateMethodAdded() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("privateMethodDeleted")
+        public void testPrivateMethodDeleted() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("privateMethodSignatureChanged")
+        public void testPrivateMethodSignatureChanged() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("privateSecondaryConstructorAdded")
+        public void testPrivateSecondaryConstructorAdded() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("privateSecondaryConstructorDeleted")
+        public void testPrivateSecondaryConstructorDeleted() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("privateValAccessorChanged")
+        public void testPrivateValAccessorChanged() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("privateValAdded")
+        public void testPrivateValAdded() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValAdded/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("privateValDeleted")
+        public void testPrivateValDeleted() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValDeleted/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("privateValSignatureChanged")
+        public void testPrivateValSignatureChanged() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("privateVarAdded")
+        public void testPrivateVarAdded() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateVarAdded/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("privateVarDeleted")
+        public void testPrivateVarDeleted() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("privateVarSignatureChanged")
+        public void testPrivateVarSignatureChanged() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("propertyRedeclaration")
+        public void testPropertyRedeclaration() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("publicPropertyWithPrivateSetter")
+        public void testPublicPropertyWithPrivateSetter() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("publicPropertyWithPrivateSetterMultiFileFacade")
+        public void testPublicPropertyWithPrivateSetterMultiFileFacade() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("removeAndRestoreCompanion")
+        public void testRemoveAndRestoreCompanion() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("removeAndRestoreCompanionWithImplicitUsages")
+        public void testRemoveAndRestoreCompanionWithImplicitUsages() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("removeClass")
+        public void testRemoveClass() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeClass/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("removeClassInDefaultPackage")
+        public void testRemoveClassInDefaultPackage() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("removeFileWithFunctionOverload")
+        public void testRemoveFileWithFunctionOverload() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("removeMemberTypeAlias")
+        public void testRemoveMemberTypeAlias() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("removeTopLevelTypeAlias")
+        public void testRemoveTopLevelTypeAlias() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("renameClass")
+        public void testRenameClass() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/renameClass/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("renameFileWithFunctionOverload")
+        public void testRenameFileWithFunctionOverload() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("returnTypeChanged")
+        public void testReturnTypeChanged() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("simpleClassDependency")
+        public void testSimpleClassDependency() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("soleFileChangesPackage")
+        public void testSoleFileChangesPackage() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("subpackage")
+        public void testSubpackage() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/subpackage/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("suspendWithStateMachine")
+        public void testSuspendWithStateMachine() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("topLevelFunctionSameSignature")
+        public void testTopLevelFunctionSameSignature() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("topLevelFunctionWithJvmName")
+        public void testTopLevelFunctionWithJvmName() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("topLevelMembersInTwoFiles")
+        public void testTopLevelMembersInTwoFiles() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("topLevelPrivateValUsageAdded")
+        public void testTopLevelPrivateValUsageAdded() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("topLevelPropertyWithJvmName")
+        public void testTopLevelPropertyWithJvmName() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("traitClassObjectConstantChanged")
+        public void testTraitClassObjectConstantChanged() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("valAddCustomAccessor")
+        public void testValAddCustomAccessor() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("valRemoveCustomAccessor")
+        public void testValRemoveCustomAccessor() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/");
+            doTest(fileName);
+        }
+    }
+
+    @TestMetadata("jps-plugin/testData/incremental/inlineFunCallSite")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class InlineFunCallSite extends AbstractIncrementalJvmCompilerRunnerTest {
+        public void testAllFilesPresentInInlineFunCallSite() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true);
+        }
+
+        @TestMetadata("classProperty")
+        public void testClassProperty() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/classProperty/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("companionObjectProperty")
+        public void testCompanionObjectProperty() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("coroutine")
+        public void testCoroutine() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/coroutine/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("function")
+        public void testFunction() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/function/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("getter")
+        public void testGetter() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/getter/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("lambda")
+        public void testLambda() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/lambda/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("localFun")
+        public void testLocalFun() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/localFun/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("method")
+        public void testMethod() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/method/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("parameterDefaultValue")
+        public void testParameterDefaultValue() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("primaryConstructorParameterDefaultValue")
+        public void testPrimaryConstructorParameterDefaultValue() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("superCall")
+        public void testSuperCall() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/superCall/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("thisCall")
+        public void testThisCall() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/thisCall/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("topLevelObjectProperty")
+        public void testTopLevelObjectProperty() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("topLevelProperty")
+        public void testTopLevelProperty() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/");
+            doTest(fileName);
+        }
+    }
+}
diff --git a/generators/generators.iml b/generators/generators.iml
index b3b4c6ff84b..7ed1ecd25ba 100644
--- a/generators/generators.iml
+++ b/generators/generators.iml
@@ -35,6 +35,7 @@
     <orderEntry type="module" module-name="container" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
     <orderEntry type="module" module-name="build-common" scope="TEST" />
+    <orderEntry type="module" module-name="incremental-compilation-impl" scope="TEST" />
     <orderEntry type="module" module-name="plugins-tests" scope="TEST" />
     <orderEntry type="module" module-name="idea-android" scope="TEST" />
     <orderEntry type="module" module-name="idea-android-output-parser" scope="TEST" />
diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index 0038d356b85..1925152c62a 100755
--- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -142,6 +142,8 @@ import org.jetbrains.kotlin.idea.structureView.AbstractKotlinFileStructureTest
 import org.jetbrains.kotlin.idea.stubs.AbstractMultiFileHighlightingTest
 import org.jetbrains.kotlin.idea.stubs.AbstractResolveByStubTest
 import org.jetbrains.kotlin.idea.stubs.AbstractStubBuilderTest
+import org.jetbrains.kotlin.incremental.AbstractIncrementalJsCompilerRunnerTest
+import org.jetbrains.kotlin.incremental.AbstractIncrementalJvmCompilerRunnerTest
 import org.jetbrains.kotlin.integration.AbstractAntTaskTest
 import org.jetbrains.kotlin.ir.AbstractIrCfgTestCase
 import org.jetbrains.kotlin.ir.AbstractIrSourceRangesTestCase
@@ -1224,7 +1226,6 @@ fun main(args: Array<String>) {
         }
     }
 
-
     testGroup("jps-plugin/jps-tests/test", "jps-plugin/testData") {
         fun TestGroup.TestClass.commonProtoComparisonTests() {
             model("comparison/classSignatureChange", extension = null, excludeParentDirs = true)
@@ -1245,6 +1246,17 @@ fun main(args: Array<String>) {
         }
     }
 
+    testGroup("compiler/incremental-compilation-impl/test", "jps-plugin/testData") {
+        testClass<AbstractIncrementalJvmCompilerRunnerTest> {
+            model("incremental/pureKotlin", extension = null, recursive = false)
+            model("incremental/inlineFunCallSite", extension = null, excludeParentDirs = true)
+        }
+
+        testClass<AbstractIncrementalJsCompilerRunnerTest> {
+            model("incremental/pureKotlin", extension = null, recursive = false)
+        }
+    }
+
     testGroup("plugins/plugins-tests/tests",  "plugins/android-extensions/android-extensions-compiler/testData") {
         testClass<AbstractAndroidSyntheticPropertyDescriptorTest> {
             model("descriptors", recursive = false, extension = null)