diff --git a/compiler/tests/org/jetbrains/jet/test/generator/TestDataSource.java b/compiler/tests/org/jetbrains/jet/test/generator/TestDataSource.java
index 31b1885fb1b..e1fdb75b325 100644
--- a/compiler/tests/org/jetbrains/jet/test/generator/TestDataSource.java
+++ b/compiler/tests/org/jetbrains/jet/test/generator/TestDataSource.java
@@ -78,7 +78,7 @@ public class TestDataSource {
     }
 
     public String getAllTestsPresentMethodName() {
-        return "allTestsPresentIn" + StringUtil.capitalize(rootFile.getName());
+        return "testAllFilesPresentIn" + StringUtil.capitalize(rootFile.getName());
     }
 
     public String getTestClassName() {
diff --git a/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java b/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java
index 4b1ff559b11..c1f0c6270f1 100644
--- a/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java
+++ b/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java
@@ -75,6 +75,7 @@ public class TestGenerator {
         p.print(FileUtil.loadFile(new File("injector-generator/copyright.txt")));
         p.println("package ", suiteClassPackage, ";");
         p.println();
+        p.println("import junit.framework.TestSuite;");
         p.println("import org.junit.Assert;");
         p.println("import org.junit.Test;");
         p.println("import org.junit.runner.RunWith;");
@@ -101,6 +102,8 @@ public class TestGenerator {
             p.println();
         }
 
+        generateSuiteMethod(p);
+
         p.popIndent();
         p.println("}");
 
@@ -110,6 +113,20 @@ public class TestGenerator {
         System.out.println("Output written to file:\n" + testSourceFile.getAbsolutePath());
     }
 
+    private void generateSuiteMethod(Printer p) {
+        p.println("public static junit.framework.Test suite() {");
+        p.pushIndent();
+        p.println("TestSuite suite = new TestSuite();");
+
+        for (TestDataSource testDataSource : testDataSources) {
+            p.println("suite.addTestSuite(", testDataSource.getTestClassName(), ".class);");
+        }
+
+        p.println("return suite;");
+        p.popIndent();
+        p.println("}");
+    }
+
     private void generateSuiteAnnotations(Printer p) {
         p.println("@RunWith(Suite.class)");
         p.println("@Suite.SuiteClasses({");