diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
index 7d95fafcdb5..ad8ca19e874 100644
--- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
@@ -551,7 +551,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
     fun testCircularDependencyWithReferenceToOldVersionLib() {
         initProject()
 
-        val libraryJar = MockLibraryUtil.compileLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib", false)
+        val libraryJar = MockLibraryUtil.compileLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib", false, false)
 
         AbstractKotlinJpsBuildTestCase.addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module1"), findModule("module2")), false, "module-lib", libraryJar)
 
@@ -562,7 +562,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
     fun testDependencyToOldKotlinLib() {
         initProject()
 
-        val libraryJar = MockLibraryUtil.compileLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib", false)
+        val libraryJar = MockLibraryUtil.compileLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib", false, false)
 
         AbstractKotlinJpsBuildTestCase.addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module")), false, "module-lib", libraryJar)
 
diff --git a/jps/jps-plugin/testData/general/JKJProject/src/java/JFirst.java b/jps/jps-plugin/testData/general/JKJProject/src/java/JFirst.java
index efaf2188e4d..bcdc7cbd4f7 100644
--- a/jps/jps-plugin/testData/general/JKJProject/src/java/JFirst.java
+++ b/jps/jps-plugin/testData/general/JKJProject/src/java/JFirst.java
@@ -2,6 +2,6 @@ package java;
 
 public class JFirst {
     public void foo() {
-       new kotlin.KFirst().foo();
+       new myproject.kotlin.KFirst().foo();
     }
 }
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/general/JKJProject/src/kotlin/KFirst.kt b/jps/jps-plugin/testData/general/JKJProject/src/kotlin/KFirst.kt
index 110919f715d..d3f96de0f7f 100644
--- a/jps/jps-plugin/testData/general/JKJProject/src/kotlin/KFirst.kt
+++ b/jps/jps-plugin/testData/general/JKJProject/src/kotlin/KFirst.kt
@@ -1,4 +1,4 @@
-package kotlin
+package myproject.kotlin
 
 class KFirst() {
     fun foo() {
diff --git a/jps/jps-plugin/testData/general/KJCircularProject/src/java/JFirst.java b/jps/jps-plugin/testData/general/KJCircularProject/src/java/JFirst.java
index 686f3641b6c..5f400f48562 100644
--- a/jps/jps-plugin/testData/general/KJCircularProject/src/java/JFirst.java
+++ b/jps/jps-plugin/testData/general/KJCircularProject/src/java/JFirst.java
@@ -2,10 +2,10 @@ package java;
 
 public class JFirst {
     public void foo() {
-        new kotlin.KFirst().foo();
+        new myproject.kotlin.KFirst().foo();
     }
 
     public void bar() {
-        new kotlin.KFirst().bar();
+        new myproject.kotlin.KFirst().bar();
     }
 }
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/general/KJCircularProject/src/kotlin/KFirst.kt b/jps/jps-plugin/testData/general/KJCircularProject/src/kotlin/KFirst.kt
index 38a327f0713..0641836f93f 100644
--- a/jps/jps-plugin/testData/general/KJCircularProject/src/kotlin/KFirst.kt
+++ b/jps/jps-plugin/testData/general/KJCircularProject/src/kotlin/KFirst.kt
@@ -1,4 +1,4 @@
-package kotlin
+package myproject.kotlin
 
 class KFirst() {
     fun foo() {
diff --git a/jps/jps-plugin/testData/general/KJKProject/src/java/JFirst.java b/jps/jps-plugin/testData/general/KJKProject/src/java/JFirst.java
index 5423b46e09b..1f4b4e26910 100644
--- a/jps/jps-plugin/testData/general/KJKProject/src/java/JFirst.java
+++ b/jps/jps-plugin/testData/general/KJKProject/src/java/JFirst.java
@@ -2,6 +2,6 @@ package java;
 
 public class JFirst {
     public void foo() {
-        new kotlin.KSecond().foo();
+        new myproject.kotlin.KSecond().foo();
     }
 }
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/general/KJKProject/src/kotlin/KFirst.kt b/jps/jps-plugin/testData/general/KJKProject/src/kotlin/KFirst.kt
index 29600c79f20..536328b73dc 100644
--- a/jps/jps-plugin/testData/general/KJKProject/src/kotlin/KFirst.kt
+++ b/jps/jps-plugin/testData/general/KJKProject/src/kotlin/KFirst.kt
@@ -1,4 +1,4 @@
-package kotlin
+package myproject.kotlin
 
 class KFirst() {
     fun foo() {
diff --git a/jps/jps-plugin/testData/general/KJKProject/src/kotlin/KSecond.kt b/jps/jps-plugin/testData/general/KJKProject/src/kotlin/KSecond.kt
index 56d654aed84..af0f67ec98f 100644
--- a/jps/jps-plugin/testData/general/KJKProject/src/kotlin/KSecond.kt
+++ b/jps/jps-plugin/testData/general/KJKProject/src/kotlin/KSecond.kt
@@ -1,4 +1,4 @@
-package kotlin
+package myproject.kotlin
 
 class KSecond() {
     fun foo() {