diff --git a/compiler/testData/codegen/enum/simpleJavaEnum.java b/compiler/testData/codegen/boxWithJava/enum/simpleJavaEnum.java
similarity index 100%
rename from compiler/testData/codegen/enum/simpleJavaEnum.java
rename to compiler/testData/codegen/boxWithJava/enum/simpleJavaEnum.java
diff --git a/compiler/testData/codegen/enum/simpleJavaEnum.kt b/compiler/testData/codegen/boxWithJava/enum/simpleJavaEnum.kt
similarity index 100%
rename from compiler/testData/codegen/enum/simpleJavaEnum.kt
rename to compiler/testData/codegen/boxWithJava/enum/simpleJavaEnum.kt
diff --git a/compiler/testData/codegen/enum/simpleJavaEnumWithFunction.java b/compiler/testData/codegen/boxWithJava/enum/simpleJavaEnumWithFunction.java
similarity index 100%
rename from compiler/testData/codegen/enum/simpleJavaEnumWithFunction.java
rename to compiler/testData/codegen/boxWithJava/enum/simpleJavaEnumWithFunction.java
diff --git a/compiler/testData/codegen/enum/simpleJavaEnumWithFunction.kt b/compiler/testData/codegen/boxWithJava/enum/simpleJavaEnumWithFunction.kt
similarity index 100%
rename from compiler/testData/codegen/enum/simpleJavaEnumWithFunction.kt
rename to compiler/testData/codegen/boxWithJava/enum/simpleJavaEnumWithFunction.kt
diff --git a/compiler/testData/codegen/enum/simpleJavaEnumWithStaticImport.java b/compiler/testData/codegen/boxWithJava/enum/simpleJavaEnumWithStaticImport.java
similarity index 100%
rename from compiler/testData/codegen/enum/simpleJavaEnumWithStaticImport.java
rename to compiler/testData/codegen/boxWithJava/enum/simpleJavaEnumWithStaticImport.java
diff --git a/compiler/testData/codegen/enum/simpleJavaEnumWithStaticImport.kt b/compiler/testData/codegen/boxWithJava/enum/simpleJavaEnumWithStaticImport.kt
similarity index 100%
rename from compiler/testData/codegen/enum/simpleJavaEnumWithStaticImport.kt
rename to compiler/testData/codegen/boxWithJava/enum/simpleJavaEnumWithStaticImport.kt
diff --git a/compiler/testData/codegen/enum/simpleJavaInnerEnum.java b/compiler/testData/codegen/boxWithJava/enum/simpleJavaInnerEnum.java
similarity index 97%
rename from compiler/testData/codegen/enum/simpleJavaInnerEnum.java
rename to compiler/testData/codegen/boxWithJava/enum/simpleJavaInnerEnum.java
index 6d3110e0e55..a5faa7d742a 100644
--- a/compiler/testData/codegen/enum/simpleJavaInnerEnum.java
+++ b/compiler/testData/codegen/boxWithJava/enum/simpleJavaInnerEnum.java
@@ -4,4 +4,4 @@ public class simpleJavaInnerEnum {
     public enum MyEnum {
         A;
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/codegen/enum/simpleJavaInnerEnum.kt b/compiler/testData/codegen/boxWithJava/enum/simpleJavaInnerEnum.kt
similarity index 100%
rename from compiler/testData/codegen/enum/simpleJavaInnerEnum.kt
rename to compiler/testData/codegen/boxWithJava/enum/simpleJavaInnerEnum.kt
diff --git a/compiler/testData/codegen/functions/referencesStaticInnerClassMethod.java b/compiler/testData/codegen/boxWithJava/functions/referencesStaticInnerClassMethod.java
similarity index 100%
rename from compiler/testData/codegen/functions/referencesStaticInnerClassMethod.java
rename to compiler/testData/codegen/boxWithJava/functions/referencesStaticInnerClassMethod.java
diff --git a/compiler/testData/codegen/functions/referencesStaticInnerClassMethod.kt b/compiler/testData/codegen/boxWithJava/functions/referencesStaticInnerClassMethod.kt
similarity index 100%
rename from compiler/testData/codegen/functions/referencesStaticInnerClassMethod.kt
rename to compiler/testData/codegen/boxWithJava/functions/referencesStaticInnerClassMethod.kt
diff --git a/compiler/testData/codegen/functions/referencesStaticInnerClassMethodL2.java b/compiler/testData/codegen/boxWithJava/functions/referencesStaticInnerClassMethodL2.java
similarity index 100%
rename from compiler/testData/codegen/functions/referencesStaticInnerClassMethodL2.java
rename to compiler/testData/codegen/boxWithJava/functions/referencesStaticInnerClassMethodL2.java
diff --git a/compiler/testData/codegen/functions/referencesStaticInnerClassMethodL2.kt b/compiler/testData/codegen/boxWithJava/functions/referencesStaticInnerClassMethodL2.kt
similarity index 100%
rename from compiler/testData/codegen/functions/referencesStaticInnerClassMethodL2.kt
rename to compiler/testData/codegen/boxWithJava/functions/referencesStaticInnerClassMethodL2.kt
diff --git a/compiler/testData/codegen/functions/removeInIterator.java b/compiler/testData/codegen/boxWithJava/functions/removeInIterator.java
similarity index 98%
rename from compiler/testData/codegen/functions/removeInIterator.java
rename to compiler/testData/codegen/boxWithJava/functions/removeInIterator.java
index cc0bcd85ae9..d933139655e 100644
--- a/compiler/testData/codegen/functions/removeInIterator.java
+++ b/compiler/testData/codegen/boxWithJava/functions/removeInIterator.java
@@ -2,4 +2,4 @@ public class removeInIterator {
     public static void bar(java.util.Iterator<Integer> it) {
         it.remove();
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/codegen/functions/removeInIterator.kt b/compiler/testData/codegen/boxWithJava/functions/removeInIterator.kt
similarity index 99%
rename from compiler/testData/codegen/functions/removeInIterator.kt
rename to compiler/testData/codegen/boxWithJava/functions/removeInIterator.kt
index 7cebea1f694..c18671d33e2 100644
--- a/compiler/testData/codegen/functions/removeInIterator.kt
+++ b/compiler/testData/codegen/boxWithJava/functions/removeInIterator.kt
@@ -10,4 +10,4 @@ fun box() : String {
             return "OK"
     }
     return "fail"
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/codegen/stdlib/noClassObjectForJavaClass.java b/compiler/testData/codegen/boxWithJava/staticFun/classWithNestedEnum.java
similarity index 70%
rename from compiler/testData/codegen/stdlib/noClassObjectForJavaClass.java
rename to compiler/testData/codegen/boxWithJava/staticFun/classWithNestedEnum.java
index 6f48ad7b77d..f3b30b86949 100644
--- a/compiler/testData/codegen/stdlib/noClassObjectForJavaClass.java
+++ b/compiler/testData/codegen/boxWithJava/staticFun/classWithNestedEnum.java
@@ -1,6 +1,6 @@
 package test;
 
-public class noClassObjectForJavaClass {
+public class classWithNestedEnum {
     public enum E { ENTRY }
     
     public static String foo() { return "OK"; }
diff --git a/compiler/testData/codegen/boxWithJava/staticFun/classWithNestedEnum.kt b/compiler/testData/codegen/boxWithJava/staticFun/classWithNestedEnum.kt
new file mode 100644
index 00000000000..2d93739599c
--- /dev/null
+++ b/compiler/testData/codegen/boxWithJava/staticFun/classWithNestedEnum.kt
@@ -0,0 +1,5 @@
+package test
+
+fun box(): String {
+    return classWithNestedEnum.foo()!!
+}
diff --git a/compiler/testData/codegen/stdlib/noClassObjectForJavaClass.kt b/compiler/testData/codegen/stdlib/noClassObjectForJavaClass.kt
deleted file mode 100644
index 0bbeb9576b1..00000000000
--- a/compiler/testData/codegen/stdlib/noClassObjectForJavaClass.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun box(): String {
-    return noClassObjectForJavaClass.foo()!!
-}
diff --git a/compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java
index 19b4adcae5a..b4bb858f99a 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java
@@ -147,8 +147,4 @@ public class ClassGenTest extends CodegenTestCase {
     public void testKt1845() {
         blackBoxMultiFile("regressions/kt1845_1.kt", "regressions/kt1845_2.kt");
     }
-
-    public void testNoClassObjectForJavaClass() {
-        blackBoxFileWithJava("stdlib/noClassObjectForJavaClass.kt");
-    }
 }
diff --git a/compiler/tests/org/jetbrains/jet/codegen/EnumGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/EnumGenTest.java
index b4874e0f4c0..1a0c670e6fb 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/EnumGenTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/EnumGenTest.java
@@ -64,22 +64,6 @@ public class EnumGenTest extends CodegenTestCase {
         final Method rgbMethod = colorClass.getMethod("getRgb");
         assertEquals(0xFF0000, rgbMethod.invoke(redValue));
     }
-    
-    public void testSimpleJavaEnum() throws Exception {
-        blackBoxFileWithJava("enum/simpleJavaEnum.kt");
-    }
-
-    public void testSimpleJavaInnerEnum() throws Exception {
-        blackBoxFileWithJava("enum/simpleJavaInnerEnum.kt");
-    }
-    
-    public void testSimpleJavaEnumWithStaticImport() throws Exception {
-        blackBoxFileWithJava("enum/simpleJavaEnumWithStaticImport.kt");
-    } 
-    
-    public void testSimpleJavaEnumWithFunction() throws Exception {
-        blackBoxFileWithJava("enum/simpleJavaEnumWithFunction.kt");
-    }
 
     public void testNoClassForSimpleEnum()
             throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, NoSuchFieldException {
diff --git a/compiler/tests/org/jetbrains/jet/codegen/FunctionGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/FunctionGenTest.java
index aec2453d932..5fbb78d7870 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/FunctionGenTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/FunctionGenTest.java
@@ -55,18 +55,6 @@ public class FunctionGenTest extends CodegenTestCase {
         assertFalse((Boolean) foo.invoke(null, "mama"));
     }
 
-    public void testReferencesStaticInnerClassMethod() throws Exception {
-        blackBoxFileWithJava("functions/referencesStaticInnerClassMethod.kt");
-    }
-
-    public void testReferencesStaticInnerClassMethodTwoLevels() throws Exception {
-        blackBoxFileWithJava("functions/referencesStaticInnerClassMethodL2.kt");
-    }
-
-    public void testRemoveInIterator() throws Exception {
-        blackBoxFileWithJava("functions/removeInIterator.kt");
-    }
-
     public void testPrivateDefaultArgs() throws Exception {
         loadFile("functions/privateDefaultArgs.kt");
         String text = generateToText();