diff --git a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt
index f2c77ba2dac..08a0b0abd71 100644
--- a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt
@@ -230,11 +230,11 @@ fun main(args: Array<String>) {
             model("checker", recursive = false)
             model("checker/regression")
             model("checker/rendering")
-            model("checker/infos", recursive = false, testMethod = "doTestWithInfos") // TODO remove recursive = false
+            model("checker/infos", testMethod = "doTestWithInfos")
         }
 
         testClass(javaClass<AbstractJetJsCheckerTest>()) {
-            model("checker/js", recursive = false)
+            model("checker/js")
         }
 
         testClass(javaClass<AbstractQuickFixTest>()) {
@@ -264,7 +264,7 @@ fun main(args: Array<String>) {
         }
 
         testClass(javaClass<JetAbstractGotoSuperTest>(), "JetGotoSuperTestGenerated") {
-            model("navigation/gotoSuper", recursive = false, extension = "test") // TODO remove recursive = false
+            model("navigation/gotoSuper", extension = "test")
         }
 
         testClass(javaClass<AbstractQuickFixMultiFileTest>()) {
diff --git a/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java b/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java
index f8d3b0a098f..09c85adeb3d 100644
--- a/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java
@@ -424,7 +424,7 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
     @TestMetadata("idea/testData/checker/infos")
     public static class Infos extends AbstractJetPsiCheckerTest {
         public void testAllFilesPresentInInfos() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/checker/infos"), Pattern.compile("^(.+)\\.kt$"), false);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/checker/infos"), Pattern.compile("^(.+)\\.kt$"), true);
         }
         
         @TestMetadata("Autocasts.kt")
diff --git a/idea/tests/org/jetbrains/jet/plugin/navigation/JetGotoSuperTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/navigation/JetGotoSuperTestGenerated.java
index c9b10922840..74b9e7410f7 100644
--- a/idea/tests/org/jetbrains/jet/plugin/navigation/JetGotoSuperTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/navigation/JetGotoSuperTestGenerated.java
@@ -33,7 +33,7 @@ import org.jetbrains.jet.plugin.navigation.JetAbstractGotoSuperTest;
 @TestMetadata("idea/testData/navigation/gotoSuper")
 public class JetGotoSuperTestGenerated extends JetAbstractGotoSuperTest {
     public void testAllFilesPresentInGotoSuper() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/navigation/gotoSuper"), Pattern.compile("^(.+)\\.test$"), false);
+        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/navigation/gotoSuper"), Pattern.compile("^(.+)\\.test$"), true);
     }
     
     @TestMetadata("ClassSimple.test")