diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java
index fc373269d14..c2aaf7b07df 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java
@@ -188,7 +188,7 @@ public abstract class AbstractJetDiagnosticsTest extends JetLiteFixture {
                         new SimpleTestClassModel(new File("compiler/testData/diagnostics/tests"), true, "kt", "doTest"),
                         new SimpleTestClassModel(new File("compiler/testData/diagnostics/tests/script"), true, "ktscript", "doTest")
                 ),
-                AbstractJetDiagnosticsTest.class.getName(),
+                AbstractJetDiagnosticsTest.class,
                 TestGenerator.TargetTestFrameworks.JUNIT_3
         ).generateAndSave();
     }
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractReadJavaBinaryClassTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractReadJavaBinaryClassTest.java
index c3d5891ecb1..cf3f8afd2cc 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractReadJavaBinaryClassTest.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractReadJavaBinaryClassTest.java
@@ -120,7 +120,7 @@ public abstract class AbstractReadJavaBinaryClassTest extends TestCaseWithTmpdir
                 Arrays.asList(
                         new SimpleTestClassModel(new File("compiler/testData/readJavaBinaryClass"), true, extension, "doTest")
                 ),
-                AbstractReadJavaBinaryClassTest.class.getName(),
+                AbstractReadJavaBinaryClassTest.class,
                 TestGenerator.TargetTestFrameworks.JUNIT_3
         ).generateAndSave();
     }
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestGenerator.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestGenerator.java
index 2e152c00391..bcb9c29b32c 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestGenerator.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestGenerator.java
@@ -52,7 +52,7 @@ public class LazyResolveTestGenerator {
                                        TEST_DATA_FILE_EXTENSION,
                                        "doTest")
             ),
-            LazyResolveTestGenerator.class.getSimpleName()
+            LazyResolveTestGenerator.class
         ).generateAndSave();
     }
 
@@ -76,7 +76,7 @@ public class LazyResolveTestGenerator {
                                        TEST_DATA_FILE_EXTENSION,
                                        "doTest")
             ),
-            LazyResolveTestGenerator.class.getSimpleName()
+            LazyResolveTestGenerator.class
         ).generateAndSave();
     }
 
diff --git a/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java b/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java
index b542e7be978..6689452c98d 100644
--- a/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java
+++ b/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java
@@ -139,10 +139,10 @@ public class TestGenerator {
             @NotNull String suiteClassName,
             @NotNull Class<?> baseTestClass,
             @NotNull Collection<? extends TestClassModel> testClassModels,
-            @NotNull String generatorName
+            @NotNull Class<?> generatorClass
     ) {
         this(baseDir, suiteClassPackage, suiteClassName, baseTestClass, testClassModels,
-             generatorName, TargetTestFrameworks.JUNIT_4);
+             generatorClass, TargetTestFrameworks.JUNIT_4);
     }
 
     public TestGenerator(
@@ -151,7 +151,7 @@ public class TestGenerator {
             @NotNull String suiteClassName,
             @NotNull Class<?> baseTestClass,
             @NotNull Collection<? extends TestClassModel> testClassModels,
-            @NotNull String generatorName,
+            @NotNull Class<?> generatorClass,
             @NotNull TargetTestFramework targetTestFramework
     ) {
         this.baseDir = baseDir;
@@ -160,7 +160,7 @@ public class TestGenerator {
         this.baseTestClassPackage = baseTestClass.getPackage().getName();
         this.baseTestClassName = baseTestClass.getSimpleName();
         this.testClassModels = Lists.newArrayList(testClassModels);
-        this.generatorName = generatorName;
+        this.generatorName = generatorClass.getCanonicalName();
         this.targetTestFramework = targetTestFramework;
     }