diff --git a/compiler/testData/compileKotlinAgainstKotlinJava8/jdk8Against6.kt b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm6/jdk8Against6.kt
similarity index 100%
rename from compiler/testData/compileKotlinAgainstKotlinJava8/jdk8Against6.kt
rename to compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm6/jdk8Against6.kt
diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java b/compiler/tests-java8/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java
index 038a1e1dea1..fe67d1af57d 100644
--- a/compiler/tests-java8/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java
+++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java
@@ -27,17 +27,26 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("compiler/testData/compileKotlinAgainstKotlinJava8")
+@TestMetadata("compiler/testData/codegen/java8/compileKotlinAgainstKotlin")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotlinAgainstKotlinTest {
-    public void testAllFilesPresentInCompileKotlinAgainstKotlinJava8() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileKotlinAgainstKotlinJava8"), Pattern.compile("^(.+)\\.kt$"), true);
+    public void testAllFilesPresentInCompileKotlinAgainstKotlin() throws Exception {
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/java8/compileKotlinAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), true);
     }
 
-    @TestMetadata("jdk8Against6.kt")
-    public void testJdk8Against6() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlinJava8/jdk8Against6.kt");
-        doTest(fileName);
+    @TestMetadata("compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm6")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Jvm6 extends AbstractCompileKotlinAgainstKotlinTest {
+        public void testAllFilesPresentInJvm6() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm6"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+
+        @TestMetadata("jdk8Against6.kt")
+        public void testJdk8Against6() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm6/jdk8Against6.kt");
+            doTest(fileName);
+        }
     }
 }
diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index 0abffa389fe..3662b4d3d52 100644
--- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -374,7 +374,7 @@ fun main(args: Array<String>) {
         }
 
         testClass<AbstractCompileKotlinAgainstKotlinTest>() {
-            model("compileKotlinAgainstKotlinJava8")
+            model("codegen/java8/compileKotlinAgainstKotlin")
         }
 
         testClass<AbstractJava8WriteSignatureTest>() {