diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt
index 8097ad37a89..68b1abcd906 100644
--- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt
+++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt
@@ -164,6 +164,26 @@ public class IncrementalJpsTest : JpsBuildTestCase() {
         doTest()
     }
 
+    fun testPackageFileAdded() {
+        doTest()
+    }
+
+    fun testPackageFileRemoved() {
+        doTest()
+    }
+
+    fun testPackageFilesChangedInTurn() {
+        doTest()
+    }
+
+    fun testPackageFileChangedThenOtherRemoved() {
+        doTest()
+    }
+
+    fun testPackageFileChangedPackage() {
+        doTest()
+    }
+
     private class MyLogger(val rootPath: String) : ProjectBuilderLoggerBase() {
         private val logBuf = StringBuilder()
         public val log: String
diff --git a/jps/jps-plugin/testData/incremental/packageFileAdded/a.kt b/jps/jps-plugin/testData/incremental/packageFileAdded/a.kt
new file mode 100644
index 00000000000..30ca24b5576
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/packageFileAdded/a.kt
@@ -0,0 +1,3 @@
+package test
+
+fun a() = "a"
diff --git a/jps/jps-plugin/testData/incremental/packageFileAdded/b.kt.new b/jps/jps-plugin/testData/incremental/packageFileAdded/b.kt.new
new file mode 100644
index 00000000000..5c782f47a25
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/packageFileAdded/b.kt.new
@@ -0,0 +1,3 @@
+package test
+
+fun b() = "b"
diff --git a/jps/jps-plugin/testData/incremental/packageFileAdded/build.log b/jps/jps-plugin/testData/incremental/packageFileAdded/build.log
new file mode 100644
index 00000000000..f729fb6d124
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/packageFileAdded/build.log
@@ -0,0 +1,10 @@
+Compiling files:
+src/b.kt
+End of files
+Cleaning output files:
+out/production/module/test/TestPackage-a-*.class
+out/production/module/test/TestPackage.class
+End of files
+Compiling files:
+src/a.kt
+End of files
diff --git a/jps/jps-plugin/testData/incremental/packageFileChangedPackage/a.kt b/jps/jps-plugin/testData/incremental/packageFileChangedPackage/a.kt
new file mode 100644
index 00000000000..30ca24b5576
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/packageFileChangedPackage/a.kt
@@ -0,0 +1,3 @@
+package test
+
+fun a() = "a"
diff --git a/jps/jps-plugin/testData/incremental/packageFileChangedPackage/b.kt b/jps/jps-plugin/testData/incremental/packageFileChangedPackage/b.kt
new file mode 100644
index 00000000000..5c782f47a25
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/packageFileChangedPackage/b.kt
@@ -0,0 +1,3 @@
+package test
+
+fun b() = "b"
diff --git a/jps/jps-plugin/testData/incremental/packageFileChangedPackage/b.kt.new b/jps/jps-plugin/testData/incremental/packageFileChangedPackage/b.kt.new
new file mode 100644
index 00000000000..7a4e3e2d245
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/packageFileChangedPackage/b.kt.new
@@ -0,0 +1,3 @@
+package newName
+
+fun b() = "b"
diff --git a/jps/jps-plugin/testData/incremental/packageFileChangedPackage/build.log b/jps/jps-plugin/testData/incremental/packageFileChangedPackage/build.log
new file mode 100644
index 00000000000..076add162ad
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/packageFileChangedPackage/build.log
@@ -0,0 +1,14 @@
+Cleaning output files:
+out/production/module/test/TestPackage-b-*.class
+out/production/module/test/TestPackage.class
+End of files
+Compiling files:
+src/b.kt
+End of files
+Cleaning output files:
+out/production/module/test/TestPackage-a-*.class
+out/production/module/test/TestPackage.class
+End of files
+Compiling files:
+src/a.kt
+End of files
diff --git a/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/a.kt b/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/a.kt
new file mode 100644
index 00000000000..30ca24b5576
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/a.kt
@@ -0,0 +1,3 @@
+package test
+
+fun a() = "a"
diff --git a/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/a.kt.new.1 b/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/a.kt.new.1
new file mode 100644
index 00000000000..a36b6841040
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/a.kt.new.1
@@ -0,0 +1,3 @@
+package test
+
+fun a() = "aa"
diff --git a/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/b.kt b/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/b.kt
new file mode 100644
index 00000000000..5c782f47a25
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/b.kt
@@ -0,0 +1,3 @@
+package test
+
+fun b() = "b"
diff --git a/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/b.kt.delete.2 b/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/b.kt.delete.2
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/build.log b/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/build.log
new file mode 100644
index 00000000000..cd5cce6af7e
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/build.log
@@ -0,0 +1,22 @@
+Cleaning output files:
+out/production/module/test/TestPackage-a-*.class
+out/production/module/test/TestPackage.class
+End of files
+Compiling files:
+src/a.kt
+End of files
+
+
+Cleaning output files:
+out/production/module/test/TestPackage-b-*.class
+out/production/module/test/TestPackage.class
+End of files
+Compiling files:
+End of files
+Cleaning output files:
+out/production/module/test/TestPackage-a-*.class
+out/production/module/test/TestPackage.class
+End of files
+Compiling files:
+src/a.kt
+End of files
diff --git a/jps/jps-plugin/testData/incremental/packageFileRemoved/a.kt b/jps/jps-plugin/testData/incremental/packageFileRemoved/a.kt
new file mode 100644
index 00000000000..30ca24b5576
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/packageFileRemoved/a.kt
@@ -0,0 +1,3 @@
+package test
+
+fun a() = "a"
diff --git a/jps/jps-plugin/testData/incremental/packageFileRemoved/b.kt b/jps/jps-plugin/testData/incremental/packageFileRemoved/b.kt
new file mode 100644
index 00000000000..5c782f47a25
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/packageFileRemoved/b.kt
@@ -0,0 +1,3 @@
+package test
+
+fun b() = "b"
diff --git a/jps/jps-plugin/testData/incremental/packageFileRemoved/b.kt.delete.1 b/jps/jps-plugin/testData/incremental/packageFileRemoved/b.kt.delete.1
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps/jps-plugin/testData/incremental/packageFileRemoved/build.log b/jps/jps-plugin/testData/incremental/packageFileRemoved/build.log
new file mode 100644
index 00000000000..7be687a676c
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/packageFileRemoved/build.log
@@ -0,0 +1,25 @@
+Cleaning output files:
+out/production/module/test/TestPackage-b-*.class
+out/production/module/test/TestPackage.class
+End of files
+Compiling files:
+End of files
+Cleaning output files:
+out/production/module/other/OtherPackage-other-*.class
+out/production/module/other/OtherPackage.class
+out/production/module/test/TestPackage-a-*.class
+out/production/module/test/TestPackage.class
+End of files
+Compiling files:
+src/a.kt
+src/other.kt
+End of files
+
+
+Cleaning output files:
+out/production/module/other/OtherPackage-other-*.class
+out/production/module/other/OtherPackage.class
+End of files
+Compiling files:
+src/other.kt
+End of files
diff --git a/jps/jps-plugin/testData/incremental/packageFileRemoved/other.kt b/jps/jps-plugin/testData/incremental/packageFileRemoved/other.kt
new file mode 100644
index 00000000000..0444e2a6b41
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/packageFileRemoved/other.kt
@@ -0,0 +1,3 @@
+package other
+
+fun imInOtherPackage() = ":)"
diff --git a/jps/jps-plugin/testData/incremental/packageFileRemoved/other.kt.new.2 b/jps/jps-plugin/testData/incremental/packageFileRemoved/other.kt.new.2
new file mode 100644
index 00000000000..7d0038f7762
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/packageFileRemoved/other.kt.new.2
@@ -0,0 +1,3 @@
+package other
+
+fun imInOtherPackage() = ":))"
diff --git a/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/a.kt b/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/a.kt
new file mode 100644
index 00000000000..30ca24b5576
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/a.kt
@@ -0,0 +1,3 @@
+package test
+
+fun a() = "a"
diff --git a/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/a.kt.new.1 b/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/a.kt.new.1
new file mode 100644
index 00000000000..a36b6841040
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/a.kt.new.1
@@ -0,0 +1,3 @@
+package test
+
+fun a() = "aa"
diff --git a/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/b.kt b/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/b.kt
new file mode 100644
index 00000000000..5c782f47a25
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/b.kt
@@ -0,0 +1,3 @@
+package test
+
+fun b() = "b"
diff --git a/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/b.kt.new.2 b/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/b.kt.new.2
new file mode 100644
index 00000000000..0099182b31f
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/b.kt.new.2
@@ -0,0 +1,3 @@
+package test
+
+fun b() = "bb"
diff --git a/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/build.log b/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/build.log
new file mode 100644
index 00000000000..87d1614e2f1
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/build.log
@@ -0,0 +1,16 @@
+Cleaning output files:
+out/production/module/test/TestPackage-a-*.class
+out/production/module/test/TestPackage.class
+End of files
+Compiling files:
+src/a.kt
+End of files
+
+
+Cleaning output files:
+out/production/module/test/TestPackage-b-*.class
+out/production/module/test/TestPackage.class
+End of files
+Compiling files:
+src/b.kt
+End of files