diff --git a/compiler/testData/codegen/multi/internalVisibility/box.kt b/compiler/testData/codegen/boxMultiFile/internalVisibility/1.kt
similarity index 100%
rename from compiler/testData/codegen/multi/internalVisibility/box.kt
rename to compiler/testData/codegen/boxMultiFile/internalVisibility/1.kt
diff --git a/compiler/testData/codegen/multi/internalVisibility/a.kt b/compiler/testData/codegen/boxMultiFile/internalVisibility/2.kt
similarity index 100%
rename from compiler/testData/codegen/multi/internalVisibility/a.kt
rename to compiler/testData/codegen/boxMultiFile/internalVisibility/2.kt
diff --git a/compiler/testData/codegen/multi/kt1515/thisPackage.kt b/compiler/testData/codegen/boxMultiFile/kt1515/1.kt
similarity index 100%
rename from compiler/testData/codegen/multi/kt1515/thisPackage.kt
rename to compiler/testData/codegen/boxMultiFile/kt1515/1.kt
diff --git a/compiler/testData/codegen/multi/kt1515/otherPackage.kt b/compiler/testData/codegen/boxMultiFile/kt1515/2.kt
similarity index 100%
rename from compiler/testData/codegen/multi/kt1515/otherPackage.kt
rename to compiler/testData/codegen/boxMultiFile/kt1515/2.kt
diff --git a/compiler/testData/codegen/regressions/kt1528_1.kt b/compiler/testData/codegen/boxMultiFile/kt1528/1.kt
similarity index 100%
rename from compiler/testData/codegen/regressions/kt1528_1.kt
rename to compiler/testData/codegen/boxMultiFile/kt1528/1.kt
diff --git a/compiler/testData/codegen/regressions/kt1528_3.kt b/compiler/testData/codegen/boxMultiFile/kt1528/2.kt
similarity index 100%
rename from compiler/testData/codegen/regressions/kt1528_3.kt
rename to compiler/testData/codegen/boxMultiFile/kt1528/2.kt
diff --git a/compiler/testData/codegen/regressions/kt1845_1.kt b/compiler/testData/codegen/boxMultiFile/kt1845/1.kt
similarity index 100%
rename from compiler/testData/codegen/regressions/kt1845_1.kt
rename to compiler/testData/codegen/boxMultiFile/kt1845/1.kt
diff --git a/compiler/testData/codegen/regressions/kt1845_2.kt b/compiler/testData/codegen/boxMultiFile/kt1845/2.kt
similarity index 100%
rename from compiler/testData/codegen/regressions/kt1845_2.kt
rename to compiler/testData/codegen/boxMultiFile/kt1845/2.kt
diff --git a/compiler/testData/codegen/regressions/kt2060_1.kt b/compiler/testData/codegen/boxMultiFile/kt2060/1.kt
similarity index 100%
rename from compiler/testData/codegen/regressions/kt2060_1.kt
rename to compiler/testData/codegen/boxMultiFile/kt2060/1.kt
diff --git a/compiler/testData/codegen/regressions/kt2060.kt b/compiler/testData/codegen/boxMultiFile/kt2060/2.kt
similarity index 100%
rename from compiler/testData/codegen/regressions/kt2060.kt
rename to compiler/testData/codegen/boxMultiFile/kt2060/2.kt
diff --git a/compiler/testData/codegen/regressions/kt2257_1.kt b/compiler/testData/codegen/boxMultiFile/kt2257/1.kt
similarity index 100%
rename from compiler/testData/codegen/regressions/kt2257_1.kt
rename to compiler/testData/codegen/boxMultiFile/kt2257/1.kt
diff --git a/compiler/testData/codegen/regressions/kt2257_2.kt b/compiler/testData/codegen/boxMultiFile/kt2257/2.kt
similarity index 100%
rename from compiler/testData/codegen/regressions/kt2257_2.kt
rename to compiler/testData/codegen/boxMultiFile/kt2257/2.kt
diff --git a/compiler/testData/codegen/multi/nestedPackages/box.kt b/compiler/testData/codegen/boxMultiFile/nestedPackages/1.kt
similarity index 100%
rename from compiler/testData/codegen/multi/nestedPackages/box.kt
rename to compiler/testData/codegen/boxMultiFile/nestedPackages/1.kt
diff --git a/compiler/testData/codegen/multi/nestedPackages/a.kt b/compiler/testData/codegen/boxMultiFile/nestedPackages/2.kt
similarity index 100%
rename from compiler/testData/codegen/multi/nestedPackages/a.kt
rename to compiler/testData/codegen/boxMultiFile/nestedPackages/2.kt
diff --git a/compiler/testData/codegen/multi/same/1/box.kt b/compiler/testData/codegen/boxMultiFile/sameFileName/1/box.kt
similarity index 100%
rename from compiler/testData/codegen/multi/same/1/box.kt
rename to compiler/testData/codegen/boxMultiFile/sameFileName/1/box.kt
diff --git a/compiler/testData/codegen/multi/same/2/box.kt b/compiler/testData/codegen/boxMultiFile/sameFileName/2/box.kt
similarity index 100%
rename from compiler/testData/codegen/multi/same/2/box.kt
rename to compiler/testData/codegen/boxMultiFile/sameFileName/2/box.kt
diff --git a/compiler/testData/codegen/multi/simple/box.kt b/compiler/testData/codegen/boxMultiFile/simple/1.kt
similarity index 100%
rename from compiler/testData/codegen/multi/simple/box.kt
rename to compiler/testData/codegen/boxMultiFile/simple/1.kt
diff --git a/compiler/testData/codegen/multi/simple/ok.kt b/compiler/testData/codegen/boxMultiFile/simple/2.kt
similarity index 100%
rename from compiler/testData/codegen/multi/simple/ok.kt
rename to compiler/testData/codegen/boxMultiFile/simple/2.kt
diff --git a/compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java
index 70334573160..e7cbe0c5655 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java
@@ -135,16 +135,4 @@ public class ClassGenTest extends CodegenTestCase {
         //        blackBoxFile("regressions/kt1213.kt");
     }
     */
-
-    public void testKt2060() {
-        blackBoxMultiFile("regressions/kt2060_1.kt", "regressions/kt2060.kt");
-    }
-
-    public void testKt2257() {
-        blackBoxMultiFile("regressions/kt2257_1.kt", "regressions/kt2257_2.kt");
-    }
-
-    public void testKt1845() {
-        blackBoxMultiFile("regressions/kt1845_1.kt", "regressions/kt1845_2.kt");
-    }
 }
diff --git a/compiler/tests/org/jetbrains/jet/codegen/MultiFileGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/MultiFileGenTest.java
deleted file mode 100644
index 98217c675b1..00000000000
--- a/compiler/tests/org/jetbrains/jet/codegen/MultiFileGenTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2010-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.codegen;
-
-import org.jetbrains.jet.ConfigurationKind;
-
-public class MultiFileGenTest extends CodegenTestCase {
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.ALL);
-    }
-
-    public void testSimple() {
-        blackBoxMultiFile("/multi/simple/box.kt", "/multi/simple/ok.kt");
-    }
-
-    public void testInternalVisibility() {
-        blackBoxMultiFile("/multi/internalVisibility/box.kt", "/multi/internalVisibility/a.kt");
-    }
-
-    public void testNestedPackagesVisibility() {
-        blackBoxMultiFile("/multi/nestedPackages/box.kt", "/multi/nestedPackages/a.kt");
-    }
-
-    public void testSameNames() {
-        blackBoxMultiFile("/multi/same/1/box.kt", "/multi/same/2/box.kt");
-    }
-
-    public void testKt1515() {
-        blackBoxMultiFile("/multi/kt1515/thisPackage.kt", "/multi/kt1515/otherPackage.kt");
-    }
-}
diff --git a/compiler/tests/org/jetbrains/jet/codegen/PropertyGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/PropertyGenTest.java
index 0b6e4031e79..95d6506d48f 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/PropertyGenTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/PropertyGenTest.java
@@ -193,10 +193,6 @@ public class PropertyGenTest extends CodegenTestCase {
         }
     }
 
-    public void testKt1528() {
-        blackBoxMultiFile("regressions/kt1528_1.kt", "regressions/kt1528_3.kt");
-    }
-
     public void testKt2589() {
         loadFile("regressions/kt2589.kt");
         final Class aClass = generateClass("Foo");