diff --git a/compiler/testData/loadJava/compiledJava/MyEnum.java b/compiler/testData/loadJava/compiledJava/JavaEnum.java
similarity index 80%
rename from compiler/testData/loadJava/compiledJava/MyEnum.java
rename to compiler/testData/loadJava/compiledJava/JavaEnum.java
index 44b3a288b02..d2ebd2b676e 100644
--- a/compiler/testData/loadJava/compiledJava/MyEnum.java
+++ b/compiler/testData/loadJava/compiledJava/JavaEnum.java
@@ -1,7 +1,7 @@
 package test;
 
 //TODO: move to LoadJavaTestGenerated when possible
-public enum MyEnum {
+public enum JavaEnum {
     ENTRY,
     ANOTHER;
 }
diff --git a/compiler/testData/loadJava/compiledJava/JavaEnum.txt b/compiler/testData/loadJava/compiledJava/JavaEnum.txt
new file mode 100644
index 00000000000..0ac1fdb269a
--- /dev/null
+++ b/compiler/testData/loadJava/compiledJava/JavaEnum.txt
@@ -0,0 +1,15 @@
+package test
+
+public final enum class JavaEnum : jet.Enum<test.JavaEnum> {
+    private constructor JavaEnum()
+    public final override /*1*/ /*fake_override*/ fun name() : jet.String
+    public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
+    
+    public class object <class-object-for-JavaEnum> {
+        private constructor <class-object-for-JavaEnum>()
+        public final val ANOTHER : test.JavaEnum
+        public final val ENTRY : test.JavaEnum
+        public final fun valueOf(/*0*/ value : jet.String) : test.JavaEnum
+        public final fun values() : jet.Array<test.JavaEnum>
+    }
+}
diff --git a/compiler/testData/loadJava/compiledJava/MyEnum.txt b/compiler/testData/loadJava/compiledJava/MyEnum.txt
deleted file mode 100644
index 148312fb7fe..00000000000
--- a/compiler/testData/loadJava/compiledJava/MyEnum.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-package test
-
-public final enum class MyEnum : jet.Enum<test.MyEnum> {
-    private constructor MyEnum()
-    public final override /*1*/ /*fake_override*/ fun name() : jet.String
-    public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
-    
-    public class object <class-object-for-MyEnum> {
-        private constructor <class-object-for-MyEnum>()
-        public final val ANOTHER : test.MyEnum
-        public final val ENTRY : test.MyEnum
-        public final fun valueOf(/*0*/ value : jet.String) : test.MyEnum
-        public final fun values() : jet.Array<test.MyEnum>
-    }
-}
diff --git a/compiler/testData/loadJava/compiledJava/inner.java b/compiler/testData/loadJava/compiledJava/SubclassFromNested.java
similarity index 58%
rename from compiler/testData/loadJava/compiledJava/inner.java
rename to compiler/testData/loadJava/compiledJava/SubclassFromNested.java
index ae9bcb7f218..1716951b831 100644
--- a/compiler/testData/loadJava/compiledJava/inner.java
+++ b/compiler/testData/loadJava/compiledJava/SubclassFromNested.java
@@ -1,6 +1,6 @@
 package test;
 
-public class inner implements B.C {
+public class SubclassFromNested implements B.C {
 }
 
 class B {
diff --git a/compiler/testData/loadJava/compiledJava/SubclassFromNested.txt b/compiler/testData/loadJava/compiledJava/SubclassFromNested.txt
new file mode 100644
index 00000000000..b7816460ae7
--- /dev/null
+++ b/compiler/testData/loadJava/compiledJava/SubclassFromNested.txt
@@ -0,0 +1,5 @@
+package test
+
+public open class SubclassFromNested : test.B.C {
+    public constructor SubclassFromNested()
+}
diff --git a/compiler/testData/loadJava/compiledJava/inner.txt b/compiler/testData/loadJava/compiledJava/inner.txt
deleted file mode 100644
index 3e03bc273fe..00000000000
--- a/compiler/testData/loadJava/compiledJava/inner.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-public open class inner : test.B.C {
-    public constructor inner()
-}
diff --git a/compiler/testData/loadJava/compiledJava/staticFinal/test.java b/compiler/testData/loadJava/compiledJava/static/StaticFinal.java
similarity index 52%
rename from compiler/testData/loadJava/compiledJava/staticFinal/test.java
rename to compiler/testData/loadJava/compiledJava/static/StaticFinal.java
index 84d7c1d07c2..77321894522 100644
--- a/compiler/testData/loadJava/compiledJava/staticFinal/test.java
+++ b/compiler/testData/loadJava/compiledJava/static/StaticFinal.java
@@ -1,3 +1,5 @@
-public class test {
+package test;
+
+public class StaticFinal {
     public static final String foo = "aaa";
 }
diff --git a/compiler/testData/loadJava/compiledJava/static/StaticFinal.txt b/compiler/testData/loadJava/compiledJava/static/StaticFinal.txt
new file mode 100644
index 00000000000..5f3c6331db1
--- /dev/null
+++ b/compiler/testData/loadJava/compiledJava/static/StaticFinal.txt
@@ -0,0 +1,9 @@
+package test
+
+public open class StaticFinal : java.lang.Object {
+    public constructor StaticFinal()
+}
+
+package StaticFinal {
+    public val foo : jet.String
+}
diff --git a/compiler/testData/loadJava/compiledJava/staticFinal/test.txt b/compiler/testData/loadJava/compiledJava/staticFinal/test.txt
deleted file mode 100644
index 6f394214403..00000000000
--- a/compiler/testData/loadJava/compiledJava/staticFinal/test.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-public val foo : jet.String
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
index 45ae3182046..424a65885d1 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
@@ -971,20 +971,20 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
     }
     
     @TestMetadata("compiler/testData/loadJava/compiledJava")
-    @InnerTestClasses({CompiledJava.ProtectedPackage.class, CompiledJava.ProtectedStatic.class, CompiledJava.SignaturePropagation.class, CompiledJava.StaticFinal.class})
+    @InnerTestClasses({CompiledJava.ProtectedPackage.class, CompiledJava.ProtectedStatic.class, CompiledJava.SignaturePropagation.class, CompiledJava.Static.class})
     public static class CompiledJava extends AbstractLoadJavaTest {
         public void testAllFilesPresentInCompiledJava() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJava"), Pattern.compile("^(.+)\\.java$"), true);
         }
         
-        @TestMetadata("inner.java")
-        public void testInner() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/inner.java");
+        @TestMetadata("JavaEnum.java")
+        public void testJavaEnum() throws Exception {
+            doTestCompiledJava("compiler/testData/loadJava/compiledJava/JavaEnum.java");
         }
         
-        @TestMetadata("MyEnum.java")
-        public void testMyEnum() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/MyEnum.java");
+        @TestMetadata("SubclassFromNested.java")
+        public void testSubclassFromNested() throws Exception {
+            doTestCompiledJava("compiler/testData/loadJava/compiledJava/SubclassFromNested.java");
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledJava/protectedPackage")
@@ -1066,15 +1066,15 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
         }
         
-        @TestMetadata("compiler/testData/loadJava/compiledJava/staticFinal")
-        public static class StaticFinal extends AbstractLoadJavaTest {
-            public void testAllFilesPresentInStaticFinal() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJava/staticFinal"), Pattern.compile("^(.+)\\.java$"), true);
+        @TestMetadata("compiler/testData/loadJava/compiledJava/static")
+        public static class Static extends AbstractLoadJavaTest {
+            public void testAllFilesPresentInStatic() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJava/static"), Pattern.compile("^(.+)\\.java$"), true);
             }
             
-            @TestMetadata("test.java")
-            public void testTest() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/staticFinal/test.java");
+            @TestMetadata("StaticFinal.java")
+            public void testStaticFinal() throws Exception {
+                doTestCompiledJava("compiler/testData/loadJava/compiledJava/static/StaticFinal.java");
             }
             
         }
@@ -1085,7 +1085,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             suite.addTestSuite(ProtectedPackage.class);
             suite.addTestSuite(ProtectedStatic.class);
             suite.addTestSuite(SignaturePropagation.class);
-            suite.addTestSuite(StaticFinal.class);
+            suite.addTestSuite(Static.class);
             return suite;
         }
     }