diff --git a/compiler/testData/lazyResolve/genericFunction.kt b/compiler/testData/lazyResolve/namespaceComparator/genericFunction.kt
similarity index 100%
rename from compiler/testData/lazyResolve/genericFunction.kt
rename to compiler/testData/lazyResolve/namespaceComparator/genericFunction.kt
diff --git a/compiler/testData/lazyResolve/genericFunction.txt b/compiler/testData/lazyResolve/namespaceComparator/genericFunction.txt
similarity index 100%
rename from compiler/testData/lazyResolve/genericFunction.txt
rename to compiler/testData/lazyResolve/namespaceComparator/genericFunction.txt
diff --git a/compiler/testData/lazyResolve/simpleClass.kt b/compiler/testData/lazyResolve/namespaceComparator/simpleClass.kt
similarity index 100%
rename from compiler/testData/lazyResolve/simpleClass.kt
rename to compiler/testData/lazyResolve/namespaceComparator/simpleClass.kt
diff --git a/compiler/testData/lazyResolve/simpleClass.txt b/compiler/testData/lazyResolve/namespaceComparator/simpleClass.txt
similarity index 100%
rename from compiler/testData/lazyResolve/simpleClass.txt
rename to compiler/testData/lazyResolve/namespaceComparator/simpleClass.txt
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerator.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerator.java
deleted file mode 100644
index c0c4a1d7840..00000000000
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerator.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2010-2012 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.lang.resolve.lazy;
-
-import org.jetbrains.jet.test.generator.TestDataSource;
-import org.jetbrains.jet.test.generator.TestGenerator;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-
-/**
- * @author abreslav
- */
-public class LazyResolveNamespaceComparingTestGenerator {
-    public static void main(String[] args) throws IOException {
-        String testDataFileExtension = "kt";
-        new TestGenerator(
-            "compiler/tests/",
-            testDataFileExtension,
-            "org.jetbrains.jet.lang.resolve.lazy",
-            "LazyResolveNamespaceComparingTestGenerated",
-            "org.jetbrains.jet.lang.resolve.lazy",
-            "AbstractLazyResolveNamespaceComparingTest",
-            Arrays.asList(
-                new TestDataSource(new File("compiler/testData/readKotlinBinaryClass"),
-                                   true,
-                                   TestGenerator.filterFilesByExtension(testDataFileExtension),
-                                   "doTestSinglePackage"),
-                new TestDataSource(new File("compiler/testData/readJavaBinaryClass"),
-                                   true,
-                                   TestGenerator.filterFilesByExtension(testDataFileExtension),
-                                   "doTestSinglePackage"),
-                new TestDataSource(new File("compiler/testData/lazyResolve"),
-                                   true,
-                                   TestGenerator.filterFilesByExtension(testDataFileExtension),
-                                   "doTest")
-            ),
-            "LazyResolveNamespaceComparingTestGenerator"
-        ).generateAndSave();
-    }
-
-    private LazyResolveNamespaceComparingTestGenerator() {}
-}
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestGenerator.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestGenerator.java
new file mode 100644
index 00000000000..d63a75e6eda
--- /dev/null
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestGenerator.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2010-2012 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.lang.resolve.lazy;
+
+import org.jetbrains.jet.test.generator.TestDataSource;
+import org.jetbrains.jet.test.generator.TestGenerator;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+
+/**
+ * @author abreslav
+ */
+public class LazyResolveTestGenerator {
+
+    private static final String TARGET_PACKAGE = LazyResolveTestGenerator.class.getPackage().getName();
+    private static final String TEST_DATA_FILE_EXTENSION = "kt";
+
+    public static void main(String[] args) throws IOException {
+        generateNamespaceComparingTests();
+        generateRendererTests();
+    }
+
+    private static void generateRendererTests() throws IOException {
+        new TestGenerator(
+            "compiler/tests/",
+            TEST_DATA_FILE_EXTENSION,
+            TARGET_PACKAGE,
+            "LazyResolveDescriptorRendererTestGenerated",
+            TARGET_PACKAGE,
+            "AbstractLazyResolveDescriptorRendererTest",
+            Arrays.asList(
+                    new TestDataSource(new File("compiler/testData/renderer"),
+                                       true,
+                                       TestGenerator.filterFilesByExtension(TEST_DATA_FILE_EXTENSION),
+                                       "doTest"),
+                    new TestDataSource(new File("compiler/testData/lazyResolve/descriptorRenderer"),
+                                       true,
+                                       TestGenerator.filterFilesByExtension(TEST_DATA_FILE_EXTENSION),
+                                       "doTest")
+            ),
+            LazyResolveTestGenerator.class.getSimpleName()
+        ).generateAndSave();
+    }
+
+    private static void generateNamespaceComparingTests() throws IOException {
+        new TestGenerator(
+            "compiler/tests/",
+            TEST_DATA_FILE_EXTENSION,
+            TARGET_PACKAGE,
+            "LazyResolveNamespaceComparingTestGenerated",
+            TARGET_PACKAGE,
+            "AbstractLazyResolveNamespaceComparingTest",
+            Arrays.asList(
+                    new TestDataSource(new File("compiler/testData/readKotlinBinaryClass"),
+                                       true,
+                                       TestGenerator.filterFilesByExtension(TEST_DATA_FILE_EXTENSION),
+                                       "doTestSinglePackage"),
+                    new TestDataSource(new File("compiler/testData/readJavaBinaryClass"),
+                                       true,
+                                       TestGenerator.filterFilesByExtension(TEST_DATA_FILE_EXTENSION),
+                                       "doTestSinglePackage"),
+                    new TestDataSource(new File("compiler/testData/lazyResolve"),
+                                       true,
+                                       TestGenerator.filterFilesByExtension(TEST_DATA_FILE_EXTENSION),
+                                       "doTest")
+            ),
+            LazyResolveTestGenerator.class.getSimpleName()
+        ).generateAndSave();
+    }
+
+    private LazyResolveTestGenerator() {}
+}