diff --git a/compiler/testData/cli/jvm/wrongAbiVersion.args b/compiler/testData/cli/jvm/wrongAbiVersion.args
index 0cc655dfe8c..ffcc7fd32de 100644
--- a/compiler/testData/cli/jvm/wrongAbiVersion.args
+++ b/compiler/testData/cli/jvm/wrongAbiVersion.args
@@ -1,5 +1,5 @@
 $TESTDATA_DIR$/wrongAbiVersion.kt
 -classpath
-$TESTDATA_DIR$/wrongAbiVersionLib
+$TESTDATA_DIR$/wrongAbiVersionLib/bin
 -d
 $TEMP_DIR$
diff --git a/compiler/testData/cli/jvm/wrongAbiVersion.out b/compiler/testData/cli/jvm/wrongAbiVersion.out
index a3fa7102b1c..eb70f2c153a 100644
--- a/compiler/testData/cli/jvm/wrongAbiVersion.out
+++ b/compiler/testData/cli/jvm/wrongAbiVersion.out
@@ -1,5 +1,5 @@
-ERROR: compiler/testData/cli/jvm/wrongAbiVersionLib/ClassWithWrongAbiVersion.class: (0, 0) Class 'ClassWithWrongAbiVersion' was compiled with an incompatible version of Kotlin. Its ABI version is -1, expected ABI version is $ABI_VERSION$
-ERROR: compiler/testData/cli/jvm/wrongAbiVersionLib/wrong/WrongPackage.class: (0, 0) Class 'wrong/WrongPackage' was compiled with an incompatible version of Kotlin. Its ABI version is -1, expected ABI version is $ABI_VERSION$
+ERROR: compiler/testData/cli/jvm/wrongAbiVersionLib/bin/ClassWithWrongAbiVersion.class: (0, 0) Class 'ClassWithWrongAbiVersion' was compiled with an incompatible version of Kotlin. Its ABI version is -1, expected ABI version is $ABI_VERSION$
+ERROR: compiler/testData/cli/jvm/wrongAbiVersionLib/bin/wrong/WrongPackage.class: (0, 0) Class 'wrong/WrongPackage' was compiled with an incompatible version of Kotlin. Its ABI version is -1, expected ABI version is $ABI_VERSION$
 WARNING: compiler/testData/cli/jvm/wrongAbiVersion.kt: (3, 9) Parameter 'x' is never used
 ERROR: compiler/testData/cli/jvm/wrongAbiVersion.kt: (4, 3) Unresolved reference: bar
 COMPILATION_ERROR
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/wrongAbiVersionLib/ClassWithWrongAbiVersion.class b/compiler/testData/cli/jvm/wrongAbiVersionLib/ClassWithWrongAbiVersion.class
deleted file mode 100644
index d5448096e0b..00000000000
Binary files a/compiler/testData/cli/jvm/wrongAbiVersionLib/ClassWithWrongAbiVersion.class and /dev/null differ
diff --git a/compiler/testData/cli/jvm/wrongAbiVersionLib/ClassWithWrongAbiVersion.kt.txt b/compiler/testData/cli/jvm/wrongAbiVersionLib/ClassWithWrongAbiVersion.kt.txt
deleted file mode 100644
index 7ccbda78b77..00000000000
--- a/compiler/testData/cli/jvm/wrongAbiVersionLib/ClassWithWrongAbiVersion.kt.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-To regenerate this test:
-  1. Change JvmAbi.VERSION to -1
-  2. Run 'ant dist'
-  3. Rename this file and wrong-package: delete 'txt' extension
-  4. Compile two files with the newly built compiler from dist/
-  5. Rename files back: add 'txt' extension
-  6. Change JvmAbi.VERSION back to its old value
-  7. Run 'ant dist'
-After these steps, the test should succeed
-*/
-
-class ClassWithWrongAbiVersion
diff --git a/compiler/testData/cli/jvm/wrongAbiVersionLib/bin/ClassWithWrongAbiVersion.class b/compiler/testData/cli/jvm/wrongAbiVersionLib/bin/ClassWithWrongAbiVersion.class
new file mode 100644
index 00000000000..8e0d4bc08c8
Binary files /dev/null and b/compiler/testData/cli/jvm/wrongAbiVersionLib/bin/ClassWithWrongAbiVersion.class differ
diff --git a/compiler/testData/cli/jvm/wrongAbiVersionLib/bin/wrong/WrongPackage$wrong-package$0984b5e5.class b/compiler/testData/cli/jvm/wrongAbiVersionLib/bin/wrong/WrongPackage$wrong-package$0984b5e5.class
new file mode 100644
index 00000000000..fe19324995c
Binary files /dev/null and b/compiler/testData/cli/jvm/wrongAbiVersionLib/bin/wrong/WrongPackage$wrong-package$0984b5e5.class differ
diff --git a/compiler/testData/cli/jvm/wrongAbiVersionLib/bin/wrong/WrongPackage.class b/compiler/testData/cli/jvm/wrongAbiVersionLib/bin/wrong/WrongPackage.class
new file mode 100644
index 00000000000..816be83a03e
Binary files /dev/null and b/compiler/testData/cli/jvm/wrongAbiVersionLib/bin/wrong/WrongPackage.class differ
diff --git a/compiler/testData/cli/jvm/wrongAbiVersionLib/readme.txt b/compiler/testData/cli/jvm/wrongAbiVersionLib/readme.txt
new file mode 100644
index 00000000000..79bd0660c11
--- /dev/null
+++ b/compiler/testData/cli/jvm/wrongAbiVersionLib/readme.txt
@@ -0,0 +1,13 @@
+/*
+To regenerate this test:
+  1. Change JvmAbi.VERSION to -1
+  2. Run 'ant dist'
+  3. Compile files with the newly built compiler from dist/
+
+    cd compiler/testData/cli/jvm/wrongAbiVersionLib
+    ../../../../../dist/kotlinc/bin/kotlinc -d bin src/*
+
+  4. Change JvmAbi.VERSION back to its old value
+  5. Run 'ant dist'
+After these steps, the test should succeed
+*/
diff --git a/compiler/testData/cli/jvm/wrongAbiVersionLib/src/ClassWithWrongAbiVersion.kt b/compiler/testData/cli/jvm/wrongAbiVersionLib/src/ClassWithWrongAbiVersion.kt
new file mode 100644
index 00000000000..907bb17a366
--- /dev/null
+++ b/compiler/testData/cli/jvm/wrongAbiVersionLib/src/ClassWithWrongAbiVersion.kt
@@ -0,0 +1 @@
+class ClassWithWrongAbiVersion
diff --git a/compiler/testData/cli/jvm/wrongAbiVersionLib/wrong-package.kt.txt b/compiler/testData/cli/jvm/wrongAbiVersionLib/src/wrong-package.kt
similarity index 100%
rename from compiler/testData/cli/jvm/wrongAbiVersionLib/wrong-package.kt.txt
rename to compiler/testData/cli/jvm/wrongAbiVersionLib/src/wrong-package.kt
diff --git a/compiler/testData/cli/jvm/wrongAbiVersionLib/wrong/WrongPackage$src$wrong-package$f7694eb0.class b/compiler/testData/cli/jvm/wrongAbiVersionLib/wrong/WrongPackage$src$wrong-package$f7694eb0.class
deleted file mode 100644
index 975d3fb8de8..00000000000
Binary files a/compiler/testData/cli/jvm/wrongAbiVersionLib/wrong/WrongPackage$src$wrong-package$f7694eb0.class and /dev/null differ
diff --git a/compiler/testData/cli/jvm/wrongAbiVersionLib/wrong/WrongPackage.class b/compiler/testData/cli/jvm/wrongAbiVersionLib/wrong/WrongPackage.class
deleted file mode 100644
index a3d8100a7be..00000000000
Binary files a/compiler/testData/cli/jvm/wrongAbiVersionLib/wrong/WrongPackage.class and /dev/null differ
diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt
index 0b8022582f7..c7fff149d4d 100644
--- a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt
+++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt
@@ -33,7 +33,7 @@ import org.jetbrains.jet.plugin.decompiler.INCOMPATIBLE_ABI_VERSION_COMMENT
 public class DecompiledTextForWrongAbiVersionTest : JetLightCodeInsightFixtureTestCase() {
 
     override fun getProjectDescriptor(): LightProjectDescriptor {
-        return JetJdkAndLibraryProjectDescriptor(File(JetTestCaseBuilder.getTestDataPathBase() + "/cli/jvm/wrongAbiVersionLib"))
+        return JetJdkAndLibraryProjectDescriptor(File(JetTestCaseBuilder.getTestDataPathBase() + "/cli/jvm/wrongAbiVersionLib/bin"))
     }
 
     fun testClassWithWrongAbiVersion() {