diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt.new b/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt.new
deleted file mode 100644
index 21df9b5ad05..00000000000
--- a/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package a
-
-open class A
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt.touch b/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt.new b/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt.new
deleted file mode 100644
index ae1b119fb6d..00000000000
--- a/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt.new
+++ /dev/null
@@ -1,6 +0,0 @@
-package module1
-
-class A
-
-fun a() {
-}
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt.touch b/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt.new b/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt.new
deleted file mode 100644
index b7e97d330f4..00000000000
--- a/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt.new
+++ /dev/null
@@ -1,7 +0,0 @@
-package module2
-
-import module1.*
-
-fun b(param: A) {
-    a()
-}
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt.touch b/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt.new b/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt.new
deleted file mode 100644
index 557b1805d4c..00000000000
--- a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt.new
+++ /dev/null
@@ -1,7 +0,0 @@
-package a
-
-open class A
-
-inline fun f(): A {
-    return A()
-}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt.touch b/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt.new b/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt.new
deleted file mode 100644
index f4131c37ad1..00000000000
--- a/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun g() {
-    other.other()
-}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt.touch b/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java.new b/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java.new
deleted file mode 100644
index 888f27db4e3..00000000000
--- a/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java.new
+++ /dev/null
@@ -1,3 +0,0 @@
-public class JavaClass {
-    public static final String CONST = "A";
-}
diff --git a/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java.touch b/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.new b/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.new
deleted file mode 100644
index 7dd5eac1a73..00000000000
--- a/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.new
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-class Klass {
-    companion object {
-        val CONST = "bar"
-    }
-}
diff --git a/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.touch b/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt.new b/jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt.new
deleted file mode 100644
index 99cec0dbea1..00000000000
--- a/jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt.new
+++ /dev/null
@@ -1,2 +0,0 @@
-fun f() {
-}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt.touch b/jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt.new b/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt.new
deleted file mode 100644
index f23d7f69d2f..00000000000
--- a/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt.new
+++ /dev/null
@@ -1,2 +0,0 @@
-fun foo() {
-}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt.touch b/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt.new b/jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt.new
deleted file mode 100644
index 3dbcdef91ed..00000000000
--- a/jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt.new
+++ /dev/null
@@ -1 +0,0 @@
-public class A
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt.touch b/jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt.new b/jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt.new
deleted file mode 100644
index 7417787603f..00000000000
--- a/jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt.new
+++ /dev/null
@@ -1 +0,0 @@
-fun f() {}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt.touch b/jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt.new b/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt.new
deleted file mode 100644
index 406f6ee4388..00000000000
--- a/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package inline
-
-inline fun f() {}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt.touch b/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java.new b/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java.new
deleted file mode 100644
index 61ff2abcc95..00000000000
--- a/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java.new
+++ /dev/null
@@ -1,2 +0,0 @@
-public class A {
-}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java.touch b/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt.new b/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt.new
deleted file mode 100644
index 8311da66012..00000000000
--- a/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt.new
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-fun a() {
-
-}
-
-val a = ""
diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt.touch b/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt.new b/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt.new
deleted file mode 100644
index f3809d03866..00000000000
--- a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun b() = "b"
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt.touch b/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt.new b/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt.new
deleted file mode 100644
index db702d74fea..00000000000
--- a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun main(args: Array<String>) {
-    println(a() + b() + other.other())
-}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt.touch b/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt.new b/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt.new
deleted file mode 100644
index 43cf69057ff..00000000000
--- a/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-var b = "b"
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt.touch b/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt.new b/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt.new
deleted file mode 100644
index 024de4a9c42..00000000000
--- a/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt.new
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-fun main(args: Array<String>) {
-    val x = a + b + other.other
-    a = "aa"
-    b = "bb"
-    other.other = "other.other"
-}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt.touch b/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/pureKotlin/annotations/other.kt.new b/jps-plugin/testData/incremental/pureKotlin/annotations/other.kt.new
deleted file mode 100644
index 092462c70e0..00000000000
--- a/jps-plugin/testData/incremental/pureKotlin/annotations/other.kt.new
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-fun dummyFunction() {
-}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/annotations/other.kt.touch b/jps-plugin/testData/incremental/pureKotlin/annotations/other.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new b/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new
deleted file mode 100644
index 8bdd5ae5b5d..00000000000
--- a/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new
+++ /dev/null
@@ -1,9 +0,0 @@
-package test
-
-const val CONST = "foo"
-
-class Klass {
-    companion object {
-        const val CONST = "bar"
-    }
-}
diff --git a/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.touch b/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt.new b/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt.new
deleted file mode 100644
index 1609642a906..00000000000
--- a/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-fun a(p1: String, p2: String? = null) {
-
-}
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt.touch b/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt.new b/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt.new
deleted file mode 100644
index 89692d95832..00000000000
--- a/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt.new
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-fun a(ref: kotlin.test.Asserter) {
-    b(ref)
-    println(":)")
-}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt.touch b/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/pureKotlin/independentClasses/Foo.kt.new b/jps-plugin/testData/incremental/pureKotlin/independentClasses/Foo.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/independentClasses/Foo.kt.new
rename to jps-plugin/testData/incremental/pureKotlin/independentClasses/Foo.kt.touch
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt.new b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt.new
deleted file mode 100644
index 9edab4e5554..00000000000
--- a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt.new
+++ /dev/null
@@ -1,13 +0,0 @@
-package inline
-
-inline fun f(body: () -> Unit) {
-    println("i'm inline function")
-    body()
-}
-
-class Klass {
-    inline fun f(body: () -> Unit) {
-        println("i'm inline function")
-        body()
-    }
-}
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt.touch b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/usage.kt.new b/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/usage.kt.new
deleted file mode 100644
index e5bb1ff5213..00000000000
--- a/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/usage.kt.new
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-fun main(args: Array<String>) {
-    f { println("to be inlined") }
-    other.f { println("to be inlined") }
-}
diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/usage.kt.touch b/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/usage.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/usage.kt.new b/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/usage.kt.new
deleted file mode 100644
index e5bb1ff5213..00000000000
--- a/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/usage.kt.new
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-fun main(args: Array<String>) {
-    f { println("to be inlined") }
-    other.f { println("to be inlined") }
-}
diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/usage.kt.touch b/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/usage.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt.new b/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt.new
deleted file mode 100644
index d2639425252..00000000000
--- a/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun other() {
-
-}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt.touch b/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt.new.2 b/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt.new.2
deleted file mode 100644
index a8ac38430eb..00000000000
--- a/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-package klass
-
-class Klass
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt.touch.2 b/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt.touch.2
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.new.1 b/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.new.1
deleted file mode 100644
index 3682a9d2913..00000000000
--- a/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.new.1
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-import klass.*
-
-fun a(klass: Klass) {
-    b(klass)
-    println(":)")
-}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.new.2 b/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.new.2
deleted file mode 100644
index 3682a9d2913..00000000000
--- a/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.new.2
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-import klass.*
-
-fun a(klass: Klass) {
-    b(klass)
-    println(":)")
-}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.touch.1 b/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.touch.1
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.touch.2 b/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.touch.2
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.new.3 b/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.touch.3
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.new.3
rename to jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.touch.3
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt.new b/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt.new
deleted file mode 100644
index e5bb1ff5213..00000000000
--- a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt.new
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-fun main(args: Array<String>) {
-    f { println("to be inlined") }
-    other.f { println("to be inlined") }
-}
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt.touch b/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt.new b/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt.new
deleted file mode 100644
index ee2e6216365..00000000000
--- a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun main(args: Array<String>) {
-    f { println("to be inlined") }
-}
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt.touch b/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt.new b/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt.new
deleted file mode 100644
index a9fb2ea18ed..00000000000
--- a/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt.new
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-class Foo {
-    fun f() {
-        Bar()
-    }
-
-    class Boo
-}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt.touch b/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt b/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt
index 35287cfaf30..83ce65bc9df 100644
--- a/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt
+++ b/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt
@@ -9,4 +9,3 @@ fun main(args: Array<String>) {
     f { }
     g()
 }
-
diff --git a/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt.new b/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt.new
deleted file mode 100644
index 35287cfaf30..00000000000
--- a/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt.new
+++ /dev/null
@@ -1,12 +0,0 @@
-package outer.nested
-
-import outer.f
-
-fun g() {
-}
-
-fun main(args: Array<String>) {
-    f { }
-    g()
-}
-
diff --git a/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt.touch b/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java.new b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java.new
deleted file mode 100644
index 888f27db4e3..00000000000
--- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java.new
+++ /dev/null
@@ -1,3 +0,0 @@
-public class JavaClass {
-    public static final String CONST = "A";
-}
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java.touch b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java.new b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java.new
deleted file mode 100644
index 15f4844a8da..00000000000
--- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java.new
+++ /dev/null
@@ -1,4 +0,0 @@
-public class JavaClass {
-    public static void foo() {
-    }
-}
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java.touch b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new
deleted file mode 100644
index 7dd5eac1a73..00000000000
--- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-class Klass {
-    companion object {
-        val CONST = "bar"
-    }
-}
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.touch b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt.new b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt.new
deleted file mode 100644
index c9398192af4..00000000000
--- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun foo() {
-
-}
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt.touch b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d