diff --git a/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
index c475e1dda7a..487dbaee338 100644
--- a/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
+++ b/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
@@ -66,6 +66,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
         doTest("jps-plugin/testData/incremental/constantValue/");
     }
     
+    @TestMetadata("dependencyClassReferenced")
+    public void testDependencyClassReferenced() throws Exception {
+        doTest("jps-plugin/testData/incremental/dependencyClassReferenced/");
+    }
+    
     @TestMetadata("filesExchangePackages")
     public void testFilesExchangePackages() throws Exception {
         doTest("jps-plugin/testData/incremental/filesExchangePackages/");
@@ -81,6 +86,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
         doTest("jps-plugin/testData/incremental/multiplePackagesModified/");
     }
     
+    @TestMetadata("ourClassReferenced")
+    public void testOurClassReferenced() throws Exception {
+        doTest("jps-plugin/testData/incremental/ourClassReferenced/");
+    }
+    
     @TestMetadata("packageFileAdded")
     public void testPackageFileAdded() throws Exception {
         doTest("jps-plugin/testData/incremental/packageFileAdded/");
diff --git a/jps-plugin/testData/incremental/dependencyClassReferenced/a.kt b/jps-plugin/testData/incremental/dependencyClassReferenced/a.kt
new file mode 100644
index 00000000000..89692d95832
--- /dev/null
+++ b/jps-plugin/testData/incremental/dependencyClassReferenced/a.kt
@@ -0,0 +1,6 @@
+package test
+
+fun a(ref: kotlin.test.Asserter) {
+    b(ref)
+    println(":)")
+}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/dependencyClassReferenced/a.kt.new b/jps-plugin/testData/incremental/dependencyClassReferenced/a.kt.new
new file mode 100644
index 00000000000..89692d95832
--- /dev/null
+++ b/jps-plugin/testData/incremental/dependencyClassReferenced/a.kt.new
@@ -0,0 +1,6 @@
+package test
+
+fun a(ref: kotlin.test.Asserter) {
+    b(ref)
+    println(":)")
+}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/dependencyClassReferenced/b.kt b/jps-plugin/testData/incremental/dependencyClassReferenced/b.kt
new file mode 100644
index 00000000000..9addb367f04
--- /dev/null
+++ b/jps-plugin/testData/incremental/dependencyClassReferenced/b.kt
@@ -0,0 +1,6 @@
+package test
+
+fun b(ref: kotlin.test.Asserter) {
+    a(ref)
+    println(":)")
+}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/dependencyClassReferenced/build.log b/jps-plugin/testData/incremental/dependencyClassReferenced/build.log
new file mode 100644
index 00000000000..37112dda098
--- /dev/null
+++ b/jps-plugin/testData/incremental/dependencyClassReferenced/build.log
@@ -0,0 +1,7 @@
+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-plugin/testData/incremental/ourClassReferenced/Klass.kt b/jps-plugin/testData/incremental/ourClassReferenced/Klass.kt
new file mode 100644
index 00000000000..a8ac38430eb
--- /dev/null
+++ b/jps-plugin/testData/incremental/ourClassReferenced/Klass.kt
@@ -0,0 +1,3 @@
+package klass
+
+class Klass
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/ourClassReferenced/Klass.kt.new.2 b/jps-plugin/testData/incremental/ourClassReferenced/Klass.kt.new.2
new file mode 100644
index 00000000000..a8ac38430eb
--- /dev/null
+++ b/jps-plugin/testData/incremental/ourClassReferenced/Klass.kt.new.2
@@ -0,0 +1,3 @@
+package klass
+
+class Klass
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/ourClassReferenced/a.kt b/jps-plugin/testData/incremental/ourClassReferenced/a.kt
new file mode 100644
index 00000000000..3682a9d2913
--- /dev/null
+++ b/jps-plugin/testData/incremental/ourClassReferenced/a.kt
@@ -0,0 +1,8 @@
+package test
+
+import klass.*
+
+fun a(klass: Klass) {
+    b(klass)
+    println(":)")
+}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/ourClassReferenced/a.kt.new.1 b/jps-plugin/testData/incremental/ourClassReferenced/a.kt.new.1
new file mode 100644
index 00000000000..3682a9d2913
--- /dev/null
+++ b/jps-plugin/testData/incremental/ourClassReferenced/a.kt.new.1
@@ -0,0 +1,8 @@
+package test
+
+import klass.*
+
+fun a(klass: Klass) {
+    b(klass)
+    println(":)")
+}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/ourClassReferenced/a.kt.new.2 b/jps-plugin/testData/incremental/ourClassReferenced/a.kt.new.2
new file mode 100644
index 00000000000..3682a9d2913
--- /dev/null
+++ b/jps-plugin/testData/incremental/ourClassReferenced/a.kt.new.2
@@ -0,0 +1,8 @@
+package test
+
+import klass.*
+
+fun a(klass: Klass) {
+    b(klass)
+    println(":)")
+}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/ourClassReferenced/b.kt b/jps-plugin/testData/incremental/ourClassReferenced/b.kt
new file mode 100644
index 00000000000..0d41f8e3417
--- /dev/null
+++ b/jps-plugin/testData/incremental/ourClassReferenced/b.kt
@@ -0,0 +1,8 @@
+package test
+
+import klass.*
+
+fun b(klass: Klass) {
+    a(klass)
+    println(":)")
+}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/ourClassReferenced/build.log b/jps-plugin/testData/incremental/ourClassReferenced/build.log
new file mode 100644
index 00000000000..ccf56d9e65b
--- /dev/null
+++ b/jps-plugin/testData/incremental/ourClassReferenced/build.log
@@ -0,0 +1,18 @@
+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/klass/Klass.class
+out/production/module/test/TestPackage-a-*.class
+out/production/module/test/TestPackage.class
+End of files
+Compiling files:
+src/Klass.kt
+src/a.kt
+End of files