diff --git a/compiler/testData/lazyResolve/descriptorRenderer/ClassObject.kt b/compiler/testData/lazyResolve/descriptorRenderer/ClassObject.kt
deleted file mode 100644
index ae55604ed68..00000000000
--- a/compiler/testData/lazyResolve/descriptorRenderer/ClassObject.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-trait TheTrait {
-  class object {
-  }
-}
-
-//internal trait TheTrait defined in root package
-//internal class object defined in TheTrait
-//private constructor <class-object-for-TheTrait>() defined in TheTrait.<class-object-for-TheTrait>
\ No newline at end of file
diff --git a/compiler/testData/lazyResolve/descriptorRenderer/ClassObject.txt b/compiler/testData/lazyResolve/descriptorRenderer/ClassObject.txt
deleted file mode 100644
index d196336651f..00000000000
--- a/compiler/testData/lazyResolve/descriptorRenderer/ClassObject.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace <root>
-
-internal abstract trait TheTrait : jet.Any {
-    internal final object TheTrait.<no name provided> : jet.Any {
-        internal final /*constructor*/ fun <init>(): TheTrait.<no name provided>
-    }
-}
diff --git a/compiler/testData/lazyResolve/namespaceComparator/ClassObject.kt b/compiler/testData/lazyResolve/namespaceComparator/ClassObject.kt
new file mode 100644
index 00000000000..8474cd31f33
--- /dev/null
+++ b/compiler/testData/lazyResolve/namespaceComparator/ClassObject.kt
@@ -0,0 +1,6 @@
+package test
+
+trait TheTrait {
+  class object {
+  }
+}
\ No newline at end of file
diff --git a/compiler/testData/lazyResolve/namespaceComparator/classObject.txt b/compiler/testData/lazyResolve/namespaceComparator/classObject.txt
new file mode 100644
index 00000000000..138c538ee68
--- /dev/null
+++ b/compiler/testData/lazyResolve/namespaceComparator/classObject.txt
@@ -0,0 +1,8 @@
+package test
+
+internal trait TheTrait {
+    
+    internal class object <class-object-for-TheTrait> {
+        /*primary*/ private constructor <class-object-for-TheTrait>()
+    }
+}
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java
index 0bf4581aaaa..8e38ac2ec60 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java
@@ -27,78 +27,55 @@ import org.jetbrains.jet.test.TestMetadata;
 import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveDescriptorRendererTest;
 
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */
-@InnerTestClasses({LazyResolveDescriptorRendererTestGenerated.Renderer.class, LazyResolveDescriptorRendererTestGenerated.DescriptorRenderer.class})
+@TestMetadata("compiler/testData/renderer")
 public class LazyResolveDescriptorRendererTestGenerated extends AbstractLazyResolveDescriptorRendererTest {
-    @TestMetadata("compiler/testData/renderer")
-    public static class Renderer extends AbstractLazyResolveDescriptorRendererTest {
-        public void testAllFilesPresentInRenderer() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/renderer"), "kt", true);
-        }
-        
-        @TestMetadata("Classes.kt")
-        public void testClasses() throws Exception {
-            doTest("compiler/testData/renderer/Classes.kt");
-        }
-        
-        @TestMetadata("Enum.kt")
-        public void testEnum() throws Exception {
-            doTest("compiler/testData/renderer/Enum.kt");
-        }
-        
-        @TestMetadata("ErrorType.kt")
-        public void testErrorType() throws Exception {
-            doTest("compiler/testData/renderer/ErrorType.kt");
-        }
-        
-        @TestMetadata("FunctionTypes.kt")
-        public void testFunctionTypes() throws Exception {
-            doTest("compiler/testData/renderer/FunctionTypes.kt");
-        }
-        
-        @TestMetadata("GlobalFunctions.kt")
-        public void testGlobalFunctions() throws Exception {
-            doTest("compiler/testData/renderer/GlobalFunctions.kt");
-        }
-        
-        @TestMetadata("GlobalProperties.kt")
-        public void testGlobalProperties() throws Exception {
-            doTest("compiler/testData/renderer/GlobalProperties.kt");
-        }
-        
-        @TestMetadata("InheritedMembersVisibility.kt")
-        public void testInheritedMembersVisibility() throws Exception {
-            doTest("compiler/testData/renderer/InheritedMembersVisibility.kt");
-        }
-        
-        @TestMetadata("KeywordsInNames.kt")
-        public void testKeywordsInNames() throws Exception {
-            doTest("compiler/testData/renderer/KeywordsInNames.kt");
-        }
-        
-        @TestMetadata("TupleTypes.kt")
-        public void testTupleTypes() throws Exception {
-            doTest("compiler/testData/renderer/TupleTypes.kt");
-        }
-        
+    public void testAllFilesPresentInRenderer() throws Exception {
+        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/renderer"), "kt", true);
     }
     
-    @TestMetadata("compiler/testData/lazyResolve/descriptorRenderer")
-    public static class DescriptorRenderer extends AbstractLazyResolveDescriptorRendererTest {
-        public void testAllFilesPresentInDescriptorRenderer() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/lazyResolve/descriptorRenderer"), "kt", true);
-        }
-        
-        @TestMetadata("ClassObject.kt")
-        public void testClassObject() throws Exception {
-            doTest("compiler/testData/lazyResolve/descriptorRenderer/ClassObject.kt");
-        }
-        
+    @TestMetadata("Classes.kt")
+    public void testClasses() throws Exception {
+        doTest("compiler/testData/renderer/Classes.kt");
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("LazyResolveDescriptorRendererTestGenerated");
-        suite.addTestSuite(Renderer.class);
-        suite.addTestSuite(DescriptorRenderer.class);
-        return suite;
+    @TestMetadata("Enum.kt")
+    public void testEnum() throws Exception {
+        doTest("compiler/testData/renderer/Enum.kt");
     }
+    
+    @TestMetadata("ErrorType.kt")
+    public void testErrorType() throws Exception {
+        doTest("compiler/testData/renderer/ErrorType.kt");
+    }
+    
+    @TestMetadata("FunctionTypes.kt")
+    public void testFunctionTypes() throws Exception {
+        doTest("compiler/testData/renderer/FunctionTypes.kt");
+    }
+    
+    @TestMetadata("GlobalFunctions.kt")
+    public void testGlobalFunctions() throws Exception {
+        doTest("compiler/testData/renderer/GlobalFunctions.kt");
+    }
+    
+    @TestMetadata("GlobalProperties.kt")
+    public void testGlobalProperties() throws Exception {
+        doTest("compiler/testData/renderer/GlobalProperties.kt");
+    }
+    
+    @TestMetadata("InheritedMembersVisibility.kt")
+    public void testInheritedMembersVisibility() throws Exception {
+        doTest("compiler/testData/renderer/InheritedMembersVisibility.kt");
+    }
+    
+    @TestMetadata("KeywordsInNames.kt")
+    public void testKeywordsInNames() throws Exception {
+        doTest("compiler/testData/renderer/KeywordsInNames.kt");
+    }
+    
+    @TestMetadata("TupleTypes.kt")
+    public void testTupleTypes() throws Exception {
+        doTest("compiler/testData/renderer/TupleTypes.kt");
+    }
+    
 }
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
index 031ad5767d7..d1f6fbc09e8 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
@@ -1816,6 +1816,11 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/lazyResolve/namespaceComparator"), "kt", true);
         }
         
+        @TestMetadata("classObject.kt")
+        public void testClassObject() throws Exception {
+            doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/classObject.kt");
+        }
+        
         @TestMetadata("classObjectAnnotation.kt")
         public void testClassObjectAnnotation() throws Exception {
             doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/classObjectAnnotation.kt");
diff --git a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java
index 465198f8dd5..25a06291324 100644
--- a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java
+++ b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java
@@ -170,8 +170,7 @@ public class GenerateTests {
                 "compiler/tests/",
                 "LazyResolveDescriptorRendererTestGenerated",
                 AbstractLazyResolveDescriptorRendererTest.class,
-                testModel("compiler/testData/renderer"),
-                testModel("compiler/testData/lazyResolve/descriptorRenderer")
+                testModel("compiler/testData/renderer")
         );
 
         // TODO test is temporarily disabled