diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
index 97fe6f72843..3c9dc6cc24a 100644
--- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
+++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
@@ -117,9 +117,15 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
             doTest(fileName);
         }
 
-        @TestMetadata("compilationErrorThenFixed")
-        public void testCompilationErrorThenFixed() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/");
+        @TestMetadata("compilationErrorThenFixedOtherPackage")
+        public void testCompilationErrorThenFixedOtherPackage() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("compilationErrorThenFixedSamePackage")
+        public void testCompilationErrorThenFixedSamePackage() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/");
             doTest(fileName);
         }
 
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log
similarity index 100%
rename from jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/fun.kt
similarity index 100%
rename from jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/fun.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/fun.kt
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt
similarity index 100%
rename from jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/usage.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.1
similarity index 100%
rename from jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/usage.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.1
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/usage.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.2
similarity index 100%
rename from jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/usage.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.2
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log
new file mode 100644
index 00000000000..872cccb99f3
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log
@@ -0,0 +1,14 @@
+Cleaning output files:
+out/production/module/usage/UsagePackage$usage$*.class
+out/production/module/usage/UsagePackage.class
+End of files
+Compiling files:
+src/usage.kt
+End of files
+COMPILATION FAILED
+Kotlin:ERROR:Expecting an expression
+
+
+Compiling files:
+src/usage.kt
+End of files
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/fun.kt
new file mode 100644
index 00000000000..2171b8f5fcf
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/fun.kt
@@ -0,0 +1,4 @@
+package f
+
+fun f() {
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt
new file mode 100644
index 00000000000..406f84ac5b6
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt
@@ -0,0 +1,5 @@
+package usage
+
+fun main(args: Array<String>) {
+    f.f()
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.1
new file mode 100644
index 00000000000..568fde17ee6
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.1
@@ -0,0 +1,5 @@
+package usage
+
+fun main(args: Array<String>) {
+    f.f(
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.2
new file mode 100644
index 00000000000..406f84ac5b6
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.2
@@ -0,0 +1,5 @@
+package usage
+
+fun main(args: Array<String>) {
+    f.f()
+}
\ No newline at end of file