diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/replaceAnnotationClassWithInterface/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/replaceAnnotationClassWithInterface/output.txt
new file mode 100644
index 00000000000..d86bac9de59
--- /dev/null
+++ b/compiler/testData/compileKotlinAgainstCustomBinaries/replaceAnnotationClassWithInterface/output.txt
@@ -0,0 +1 @@
+OK
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/replaceAnnotationClassWithInterface/replaceAnnotationClassWithInterface.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/replaceAnnotationClassWithInterface/replaceAnnotationClassWithInterface.txt
deleted file mode 100644
index 3c0fb004d1b..00000000000
--- a/compiler/testData/compileKotlinAgainstCustomBinaries/replaceAnnotationClassWithInterface/replaceAnnotationClassWithInterface.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-package test
-
-public fun bar(): @test.Ann kotlin.String
-
-public interface Ann {
-}
-
-@test.Ann(s = "class") public final class Test {
-    public constructor Test()
-    @test.Ann(s = "function") public final fun foo(/*0*/ @test.Ann(s = "parameter") s: @test.Ann kotlin.String): @test.Ann kotlin.String
-}
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/replaceAnnotationClassWithInterface/replaceAnnotationClassWithInterface.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/replaceAnnotationClassWithInterface/source.kt
similarity index 100%
rename from compiler/testData/compileKotlinAgainstCustomBinaries/replaceAnnotationClassWithInterface/replaceAnnotationClassWithInterface.kt
rename to compiler/testData/compileKotlinAgainstCustomBinaries/replaceAnnotationClassWithInterface/source.kt
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/sameLibraryTwiceInClasspath/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/sameLibraryTwiceInClasspath/output.txt
new file mode 100644
index 00000000000..d86bac9de59
--- /dev/null
+++ b/compiler/testData/compileKotlinAgainstCustomBinaries/sameLibraryTwiceInClasspath/output.txt
@@ -0,0 +1 @@
+OK
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/sameLibraryTwiceInClasspath/sameLibraryTwiceInClasspath.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/sameLibraryTwiceInClasspath/sameLibraryTwiceInClasspath.txt
deleted file mode 100644
index 77d4f9e279d..00000000000
--- a/compiler/testData/compileKotlinAgainstCustomBinaries/sameLibraryTwiceInClasspath/sameLibraryTwiceInClasspath.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-public val inn3r: testing.Outer.Inner
-public val nested: testing.Outer.Nested
-public val outer: testing.Outer
-public val testObjectProperty: testing.TopLevelObject
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/sameLibraryTwiceInClasspath/sameLibraryTwiceInClasspath.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/sameLibraryTwiceInClasspath/source.kt
similarity index 100%
rename from compiler/testData/compileKotlinAgainstCustomBinaries/sameLibraryTwiceInClasspath/sameLibraryTwiceInClasspath.kt
rename to compiler/testData/compileKotlinAgainstCustomBinaries/sameLibraryTwiceInClasspath/source.kt
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt
index e80c0220463..f427f322441 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt
@@ -33,7 +33,6 @@ import org.jetbrains.kotlin.test.ConfigurationKind
 import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.jetbrains.kotlin.test.MockLibraryUtil
 import org.jetbrains.kotlin.test.TestJdkKind
-import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparatorAdaptor.validateAndCompareDescriptorWithFile
 import org.jetbrains.kotlin.utils.toMetadataVersion
 import org.jetbrains.org.objectweb.asm.*
 import org.jetbrains.org.objectweb.asm.tree.ClassNode
@@ -50,14 +49,6 @@ class CompileKotlinAgainstCustomBinariesTest : AbstractKotlinCompilerIntegration
     override val testDataPath: String
         get() = "compiler/testData/compileKotlinAgainstCustomBinaries/"
 
-    private fun doTestWithTxt(vararg extraClassPath: File) {
-        validateAndCompareDescriptorWithFile(
-            analyzeFileToPackageView(*extraClassPath),
-            AbstractLoadJavaTest.COMPARATOR_CONFIGURATION,
-            getTestDataFileWithExtension("txt")
-        )
-    }
-
     private fun analyzeFileToPackageView(vararg extraClassPath: File): PackageViewDescriptor {
         val environment = createEnvironment(extraClassPath.toList())
 
@@ -163,7 +154,7 @@ class CompileKotlinAgainstCustomBinariesTest : AbstractKotlinCompilerIntegration
     }
 
     fun testSameLibraryTwiceInClasspath() {
-        doTestWithTxt(compileLibrary("library-1"), compileLibrary("library-2"))
+        compileKotlin("source.kt", tmpdir, listOf(compileLibrary("library-1"), compileLibrary("library-2")))
     }
 
     fun testMissingEnumReferencedInAnnotationArgument() {
@@ -461,7 +452,7 @@ class CompileKotlinAgainstCustomBinariesTest : AbstractKotlinCompilerIntegration
         val library1 = compileLibrary("library-1")
         val usage = compileLibrary("usage", extraClassPath = listOf(library1))
         val library2 = compileLibrary("library-2")
-        doTestWithTxt(usage, library2)
+        compileKotlin("source.kt", tmpdir, listOf(usage, library2))
     }
 
     fun testProhibitNestedClassesByDollarName() {