diff --git a/compiler/testData/diagnostics/tests/ClassObjectCannotAccessClassFields.kt b/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/ClassObjectCannotAccessClassFields.kt
rename to compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.kt
diff --git a/compiler/testData/diagnostics/tests/ClassObjectVisibility.kt b/compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/ClassObjectVisibility.kt
rename to compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.kt
diff --git a/compiler/testData/diagnostics/tests/ClassObjects.kt b/compiler/testData/diagnostics/tests/classObjects/ClassObjects.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/ClassObjects.kt
rename to compiler/testData/diagnostics/tests/classObjects/ClassObjects.kt
diff --git a/compiler/testData/diagnostics/tests/InnerClassClassObject.kt b/compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/InnerClassClassObject.kt
rename to compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.kt
diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
index d8339459aa4..d39b74a6fb1 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
@@ -33,7 +33,7 @@ import org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve;
 @InnerTestClasses({JetDiagnosticsTestGenerated.Tests.class, JetDiagnosticsTestGenerated.Script.class})
 public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEagerResolve {
     @TestMetadata("compiler/testData/diagnostics/tests")
-    @InnerTestClasses({Tests.Annotations.class, Tests.BackingField.class, Tests.CallableReference.class, Tests.Cast.class, Tests.CheckArguments.class, Tests.ControlFlowAnalysis.class, Tests.ControlStructures.class, Tests.DataClasses.class, Tests.DataFlow.class, Tests.DataFlowInfoTraversal.class, Tests.DeclarationChecks.class, Tests.DelegatedProperty.class, Tests.Deparenthesize.class, Tests.Enum.class, Tests.Extensions.class, Tests.FunctionLiterals.class, Tests.Generics.class, Tests.IncompleteCode.class, Tests.Inference.class, Tests.Infos.class, Tests.Inner.class, Tests.J_k.class, Tests.Jdk_annotations.class, Tests.Library.class, Tests.NullabilityAndAutoCasts.class, Tests.NullableTypes.class, Tests.Numbers.class, Tests.Objects.class, Tests.OperatorsOverloading.class, Tests.Overload.class, Tests.Override.class, Tests.Recovery.class, Tests.Redeclarations.class, Tests.Regressions.class, Tests.Resolve.class, Tests.Scopes.class, Tests.SenselessComparison.class, Tests.Shadowing.class, Tests.SmartCasts.class, Tests.Substitutions.class, Tests.Subtyping.class, Tests.Suppress.class, Tests.ThisAndSuper.class, Tests.Varargs.class, Tests.When.class})
+    @InnerTestClasses({Tests.Annotations.class, Tests.BackingField.class, Tests.CallableReference.class, Tests.Cast.class, Tests.CheckArguments.class, Tests.ClassObjects.class, Tests.ControlFlowAnalysis.class, Tests.ControlStructures.class, Tests.DataClasses.class, Tests.DataFlow.class, Tests.DataFlowInfoTraversal.class, Tests.DeclarationChecks.class, Tests.DelegatedProperty.class, Tests.Deparenthesize.class, Tests.Enum.class, Tests.Extensions.class, Tests.FunctionLiterals.class, Tests.Generics.class, Tests.IncompleteCode.class, Tests.Inference.class, Tests.Infos.class, Tests.Inner.class, Tests.J_k.class, Tests.Jdk_annotations.class, Tests.Library.class, Tests.NullabilityAndAutoCasts.class, Tests.NullableTypes.class, Tests.Numbers.class, Tests.Objects.class, Tests.OperatorsOverloading.class, Tests.Overload.class, Tests.Override.class, Tests.Recovery.class, Tests.Redeclarations.class, Tests.Regressions.class, Tests.Resolve.class, Tests.Scopes.class, Tests.SenselessComparison.class, Tests.Shadowing.class, Tests.SmartCasts.class, Tests.Substitutions.class, Tests.Subtyping.class, Tests.Suppress.class, Tests.ThisAndSuper.class, Tests.Varargs.class, Tests.When.class})
     public static class Tests extends AbstractDiagnosticsTestWithEagerResolve {
         @TestMetadata("Abstract.kt")
         public void testAbstract() throws Exception {
@@ -129,21 +129,6 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
             doTest("compiler/testData/diagnostics/tests/CharacterLiterals.kt");
         }
         
-        @TestMetadata("ClassObjectCannotAccessClassFields.kt")
-        public void testClassObjectCannotAccessClassFields() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/ClassObjectCannotAccessClassFields.kt");
-        }
-        
-        @TestMetadata("ClassObjectVisibility.kt")
-        public void testClassObjectVisibility() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/ClassObjectVisibility.kt");
-        }
-        
-        @TestMetadata("ClassObjects.kt")
-        public void testClassObjects() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/ClassObjects.kt");
-        }
-        
         @TestMetadata("CompareToWithErrorType.kt")
         public void testCompareToWithErrorType() throws Exception {
             doTest("compiler/testData/diagnostics/tests/CompareToWithErrorType.kt");
@@ -284,11 +269,6 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
             doTest("compiler/testData/diagnostics/tests/InferNullabilityInThenBlock.kt");
         }
         
-        @TestMetadata("InnerClassClassObject.kt")
-        public void testInnerClassClassObject() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/InnerClassClassObject.kt");
-        }
-        
         @TestMetadata("IsExpressions.kt")
         public void testIsExpressions() throws Exception {
             doTest("compiler/testData/diagnostics/tests/IsExpressions.kt");
@@ -1368,6 +1348,34 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
             
         }
         
+        @TestMetadata("compiler/testData/diagnostics/tests/classObjects")
+        public static class ClassObjects extends AbstractDiagnosticsTestWithEagerResolve {
+            public void testAllFilesPresentInClassObjects() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/classObjects"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+            
+            @TestMetadata("ClassObjectCannotAccessClassFields.kt")
+            public void testClassObjectCannotAccessClassFields() throws Exception {
+                doTest("compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.kt");
+            }
+            
+            @TestMetadata("ClassObjectVisibility.kt")
+            public void testClassObjectVisibility() throws Exception {
+                doTest("compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.kt");
+            }
+            
+            @TestMetadata("ClassObjects.kt")
+            public void testClassObjects() throws Exception {
+                doTest("compiler/testData/diagnostics/tests/classObjects/ClassObjects.kt");
+            }
+            
+            @TestMetadata("InnerClassClassObject.kt")
+            public void testInnerClassClassObject() throws Exception {
+                doTest("compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.kt");
+            }
+            
+        }
+        
         @TestMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis")
         public static class ControlFlowAnalysis extends AbstractDiagnosticsTestWithEagerResolve {
             public void testAllFilesPresentInControlFlowAnalysis() throws Exception {
@@ -6097,6 +6105,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
             suite.addTestSuite(CallableReference.class);
             suite.addTest(Cast.innerSuite());
             suite.addTestSuite(CheckArguments.class);
+            suite.addTestSuite(ClassObjects.class);
             suite.addTestSuite(ControlFlowAnalysis.class);
             suite.addTestSuite(ControlStructures.class);
             suite.addTestSuite(DataClasses.class);