diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/java9/afterIteratePredicate.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/java9/afterIteratePredicateJava9.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/java9/afterIteratePredicate.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/java9/afterIteratePredicateJava9.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/takeWhile/afterTakeWhileJava9.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/java9/afterTakeWhileJava9.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/takeWhile/afterTakeWhileJava9.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/java9/afterTakeWhileJava9.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/java9/beforeIteratePredicateDifferentVars.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/java9/beforeIteratePredicateDifferentVarsJava9.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/java9/beforeIteratePredicateDifferentVars.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/java9/beforeIteratePredicateDifferentVarsJava9.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/java9/beforeIteratePredicate.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/java9/beforeIteratePredicateJava9.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/java9/beforeIteratePredicate.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/java9/beforeIteratePredicateJava9.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/takeWhile/beforeTakeWhile.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/java9/beforeTakeWhile.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/takeWhile/beforeTakeWhile.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/java9/beforeTakeWhile.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/takeWhile/beforeTakeWhileJava9.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/java9/beforeTakeWhileJava9.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/takeWhile/beforeTakeWhileJava9.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/java9/beforeTakeWhileJava9.java
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/StreamApiMigrationInspectionTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/StreamApiMigrationInspectionTestSuite.java
similarity index 77%
rename from java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/StreamApiMigrationInspectionTest.java
rename to java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/StreamApiMigrationInspectionTestSuite.java
index c1f714101240..a3118a4051ac 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/StreamApiMigrationInspectionTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/StreamApiMigrationInspectionTestSuite.java
@@ -26,29 +26,29 @@ import org.junit.runners.Suite;
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
-  StreamApiMigrationInspectionTest.AddAllTest.class,
-  StreamApiMigrationInspectionTest.AfterAllActionsTest.class,
-  StreamApiMigrationInspectionTest.AllMatchTest.class,
-  StreamApiMigrationInspectionTest.AnyMatchTest.class,
-  StreamApiMigrationInspectionTest.BufferedReaderTest.class,
-  StreamApiMigrationInspectionTest.CollectTest.class,
-  StreamApiMigrationInspectionTest.ContinueTest.class,
-  StreamApiMigrationInspectionTest.CountTest.class,
-  StreamApiMigrationInspectionTest.FilterTest.class,
-  StreamApiMigrationInspectionTest.FindFirstTest.class,
-  StreamApiMigrationInspectionTest.FlatMapFirstTest.class,
-  StreamApiMigrationInspectionTest.ForEachTest.class,
-  StreamApiMigrationInspectionTest.JoiningTest.class,
-  StreamApiMigrationInspectionTest.LimitTest.class,
-  StreamApiMigrationInspectionTest.MinMaxTest.class,
-  StreamApiMigrationInspectionTest.NoneMatchTest.class,
-  StreamApiMigrationInspectionTest.OtherTest.class,
-  StreamApiMigrationInspectionTest.ReductionTest.class,
-  StreamApiMigrationInspectionTest.SummingTest.class,
-  StreamApiMigrationInspectionTest.TakeWhileTest.class,
-  StreamApiMigrationInspectionTest.Java9Test.class,
+  StreamApiMigrationInspectionTestSuite.AddAllTest.class,
+  StreamApiMigrationInspectionTestSuite.AfterAllActionsTest.class,
+  StreamApiMigrationInspectionTestSuite.AllMatchTest.class,
+  StreamApiMigrationInspectionTestSuite.AnyMatchTest.class,
+  StreamApiMigrationInspectionTestSuite.BufferedReaderTest.class,
+  StreamApiMigrationInspectionTestSuite.CollectTest.class,
+  StreamApiMigrationInspectionTestSuite.ContinueTest.class,
+  StreamApiMigrationInspectionTestSuite.CountTest.class,
+  StreamApiMigrationInspectionTestSuite.FilterTest.class,
+  StreamApiMigrationInspectionTestSuite.FindFirstTest.class,
+  StreamApiMigrationInspectionTestSuite.FlatMapFirstTest.class,
+  StreamApiMigrationInspectionTestSuite.ForEachTest.class,
+  StreamApiMigrationInspectionTestSuite.JoiningTest.class,
+  StreamApiMigrationInspectionTestSuite.LimitTest.class,
+  StreamApiMigrationInspectionTestSuite.MinMaxTest.class,
+  StreamApiMigrationInspectionTestSuite.NoneMatchTest.class,
+  StreamApiMigrationInspectionTestSuite.OtherTest.class,
+  StreamApiMigrationInspectionTestSuite.ReductionTest.class,
+  StreamApiMigrationInspectionTestSuite.SummingTest.class,
+  StreamApiMigrationInspectionTestSuite.Java9Test.class,
+  StreamApiMigrationInspectionTestSuite.Java10Test.class,
 })
-public class StreamApiMigrationInspectionTest {
+public class StreamApiMigrationInspectionTestSuite {
   public static abstract class StreamApiMigrationInspectionBaseTest extends LightQuickFixParameterizedTestCase {
     @NotNull
     @Override
@@ -209,23 +209,11 @@ public class StreamApiMigrationInspectionTest {
     }
   }
 
-  public static class TakeWhileTest extends StreamApiMigrationInspectionBaseTest {
-    @Override
-    String getFolder() {
-      return "takeWhile";
-    }
-  }
-
   public static class Java9Test extends StreamApiMigrationInspectionBaseTest {
     @Override
     String getFolder() {
       return "java9";
     }
-
-    @Override
-    protected LanguageLevel getDefaultLanguageLevel() {
-      return LanguageLevel.JDK_1_9;
-    }
   }
 
   public static class Java10Test extends StreamApiMigrationInspectionBaseTest {