diff --git a/compiler/testData/builtin-classes-kotlin-collections.txt b/compiler/testData/builtin-classes/default/kotlin-collections.txt
similarity index 100%
rename from compiler/testData/builtin-classes-kotlin-collections.txt
rename to compiler/testData/builtin-classes/default/kotlin-collections.txt
diff --git a/compiler/testData/builtin-classes-kotlin-ranges.txt b/compiler/testData/builtin-classes/default/kotlin-ranges.txt
similarity index 100%
rename from compiler/testData/builtin-classes-kotlin-ranges.txt
rename to compiler/testData/builtin-classes/default/kotlin-ranges.txt
diff --git a/compiler/testData/builtin-classes-kotlin.txt b/compiler/testData/builtin-classes/default/kotlin.txt
similarity index 100%
rename from compiler/testData/builtin-classes-kotlin.txt
rename to compiler/testData/builtin-classes/default/kotlin.txt
diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java
index 7f62d47caa9..521145ceb3f 100644
--- a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java
@@ -96,7 +96,7 @@ public class LoadBuiltinsTest extends KotlinTestWithEnvironment {
                         CollectionsKt.single(packageFragmentProvider.getPackageFragments(packageFqName));
                 RecursiveDescriptorComparator.validateAndCompareDescriptors(
                         fromLazyResolve, deserialized, configuration,
-                        new File("compiler/testData/builtin-classes-" + packageFqName.asString().replace('.', '-') + ".txt")
+                        new File("compiler/testData/builtin-classes/default/" + packageFqName.asString().replace('.', '-') + ".txt")
                 );
             }
         }