diff --git a/compiler/testData/cli/jvm/wrongKotlinSignature.kt b/compiler/testData/cli/jvm/wrongKotlinSignature.kt
index a3b8a61b202..5f2ed3cd6bc 100644
--- a/compiler/testData/cli/jvm/wrongKotlinSignature.kt
+++ b/compiler/testData/cli/jvm/wrongKotlinSignature.kt
@@ -1,4 +1,6 @@
 package test;
 
+import library.ClassWithWrongKotlinSignatures
+
 val x = ClassWithWrongKotlinSignatures.foo()
-val y = ClassWithWrongKotlinSignatures.bar()
\ No newline at end of file
+val y = ClassWithWrongKotlinSignatures.bar()
diff --git a/compiler/testData/cli/jvm/wrongKotlinSignature.out b/compiler/testData/cli/jvm/wrongKotlinSignature.out
index 3c3701586f2..e07c3996f21 100644
--- a/compiler/testData/cli/jvm/wrongKotlinSignature.out
+++ b/compiler/testData/cli/jvm/wrongKotlinSignature.out
@@ -1,7 +1,7 @@
 ERROR: The following Java entities have annotations with wrong Kotlin signatures:
-ClassWithWrongKotlinSignatures java.lang.String foo():
+library.ClassWithWrongKotlinSignatures java.lang.String foo():
     Function names mismatch, original: foo, alternative: bar
-ClassWithWrongKotlinSignatures java.lang.String bar():
+library.ClassWithWrongKotlinSignatures java.lang.String bar():
     Function names mismatch, original: bar, alternative: foo
 
 COMPILATION_ERROR
diff --git a/compiler/testData/cli/jvm/wrongKotlinSignatureLib/ClassWithWrongKotlinSignatures.java b/compiler/testData/cli/jvm/wrongKotlinSignatureLib/library/ClassWithWrongKotlinSignatures.java
similarity index 95%
rename from compiler/testData/cli/jvm/wrongKotlinSignatureLib/ClassWithWrongKotlinSignatures.java
rename to compiler/testData/cli/jvm/wrongKotlinSignatureLib/library/ClassWithWrongKotlinSignatures.java
index 7bb194a1f41..5e9db9cc25a 100644
--- a/compiler/testData/cli/jvm/wrongKotlinSignatureLib/ClassWithWrongKotlinSignatures.java
+++ b/compiler/testData/cli/jvm/wrongKotlinSignatureLib/library/ClassWithWrongKotlinSignatures.java
@@ -1,3 +1,5 @@
+package library
+
 import jet.runtime.typeinfo.KotlinSignature;
 
 public class ClassWithWrongKotlinSignatures {
diff --git a/compiler/tests/org/jetbrains/jet/cli/KotlincExecutableTestGenerated.java b/compiler/tests/org/jetbrains/jet/cli/KotlincExecutableTestGenerated.java
index b36987c55e1..771ed7ba5b3 100644
--- a/compiler/tests/org/jetbrains/jet/cli/KotlincExecutableTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/cli/KotlincExecutableTestGenerated.java
@@ -35,7 +35,7 @@ import java.util.regex.Pattern;
 public class KotlincExecutableTestGenerated extends AbstractKotlincExecutableTest {
     @TestMetadata("compiler/testData/cli/jvm")
     @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({Jvm.WrongAbiVersionLib.class})
+    @InnerTestClasses({Jvm.WrongAbiVersionLib.class, Jvm.WrongKotlinSignatureLib.class})
     @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
     public static class Jvm extends AbstractKotlincExecutableTest {
         public void testAllFilesPresentInJvm() throws Exception {
@@ -155,6 +155,16 @@ public class KotlincExecutableTestGenerated extends AbstractKotlincExecutableTes
             
         }
         
+        @TestMetadata("compiler/testData/cli/jvm/wrongKotlinSignatureLib")
+        @TestDataPath("$PROJECT_ROOT")
+        @InnerTestClasses({})
+        public static class WrongKotlinSignatureLib extends AbstractKotlincExecutableTest {
+            public void testAllFilesPresentInWrongKotlinSignatureLib() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cli/jvm/wrongKotlinSignatureLib"), Pattern.compile("^(.+)\\.args$"), true);
+            }
+            
+        }
+        
     }
     
     @TestMetadata("compiler/testData/cli/js")