diff --git a/compiler/testData/codegen/java8/box/jvm8/bridgeInClass.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInClass.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/bridgeInClass.kt
rename to compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInClass.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/bridgeInInterface.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/bridgeInInterface.kt
rename to compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaultArgs.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/defaultArgs.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/defaultArgs.kt
rename to compiler/testData/codegen/java8/box/jvm8/defaults/defaultArgs.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/diamond.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/diamond.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/diamond.kt
rename to compiler/testData/codegen/java8/box/jvm8/defaults/diamond.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/kt11969.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/kt11969.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/kt11969.kt
rename to compiler/testData/codegen/java8/box/jvm8/defaults/kt11969.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/kt14243.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/kt14243.kt
rename to compiler/testData/codegen/java8/box/jvm8/defaults/kt14243.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/kt14243_2.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_2.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/kt14243_2.kt
rename to compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_2.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/kt14243_prop.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_prop.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/kt14243_prop.kt
rename to compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_prop.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/noDelegation/noDelegationToDefaultMethodInClass.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/noDelegation/noDelegationToDefaultMethodInClass.kt
rename to compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/noDelegation/noDelegationToDefaultMethodInInterface.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/noDelegation/noDelegationToDefaultMethodInInterface.kt
rename to compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/noDelegation/noDelegationToDefaultMethodInInterface2.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/noDelegation/noDelegationToDefaultMethodInInterface2.kt
rename to compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/oneImplementation.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/oneImplementation.kt
rename to compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/oneImplementation2.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation2.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/oneImplementation2.kt
rename to compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation2.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/reflection/propertyAnnotations.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/reflection/propertyAnnotations.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/reflection/propertyAnnotations.kt
rename to compiler/testData/codegen/java8/box/jvm8/defaults/reflection/propertyAnnotations.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/reflection/propertyAnnotationsCompatibility.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/reflection/propertyAnnotationsCompatibility.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/reflection/propertyAnnotationsCompatibility.kt
rename to compiler/testData/codegen/java8/box/jvm8/defaults/reflection/propertyAnnotationsCompatibility.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/simpleCall.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/simpleCall.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/simpleCall.kt
rename to compiler/testData/codegen/java8/box/jvm8/defaults/simpleCall.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/simpleProperty.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/simpleProperty.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/simpleProperty.kt
rename to compiler/testData/codegen/java8/box/jvm8/defaults/simpleProperty.kt
diff --git a/compiler/testData/codegen/java8/box/jvm8/superCall.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/superCall.kt
similarity index 100%
rename from compiler/testData/codegen/java8/box/jvm8/superCall.kt
rename to compiler/testData/codegen/java8/box/jvm8/defaults/superCall.kt
diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/codegen/BlackBoxWithJava8CodegenTestGenerated.java b/compiler/tests-java8/tests/org/jetbrains/kotlin/codegen/BlackBoxWithJava8CodegenTestGenerated.java
index b1d397857b0..1fc180ace71 100644
--- a/compiler/tests-java8/tests/org/jetbrains/kotlin/codegen/BlackBoxWithJava8CodegenTestGenerated.java
+++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/codegen/BlackBoxWithJava8CodegenTestGenerated.java
@@ -179,82 +179,139 @@ public class BlackBoxWithJava8CodegenTestGenerated extends AbstractBlackBoxCodeg
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/java8/box/jvm8"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
-        @TestMetadata("bridgeInClass.kt")
-        public void testBridgeInClass() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/bridgeInClass.kt");
-            doTest(fileName);
-        }
+        @TestMetadata("compiler/testData/codegen/java8/box/jvm8/defaults")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Defaults extends AbstractBlackBoxCodegenTest {
+            public void testAllFilesPresentInDefaults() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/java8/box/jvm8/defaults"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
+            }
 
-        @TestMetadata("bridgeInInterface.kt")
-        public void testBridgeInInterface() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/bridgeInInterface.kt");
-            doTest(fileName);
-        }
+            @TestMetadata("bridgeInClass.kt")
+            public void testBridgeInClass() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInClass.kt");
+                doTest(fileName);
+            }
 
-        @TestMetadata("defaultArgs.kt")
-        public void testDefaultArgs() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/defaultArgs.kt");
-            doTest(fileName);
-        }
+            @TestMetadata("bridgeInInterface.kt")
+            public void testBridgeInInterface() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface.kt");
+                doTest(fileName);
+            }
 
-        @TestMetadata("diamond.kt")
-        public void testDiamond() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/diamond.kt");
-            doTest(fileName);
-        }
+            @TestMetadata("defaultArgs.kt")
+            public void testDefaultArgs() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/defaults/defaultArgs.kt");
+                doTest(fileName);
+            }
 
-        @TestMetadata("kt11969.kt")
-        public void testKt11969() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/kt11969.kt");
-            doTest(fileName);
-        }
+            @TestMetadata("diamond.kt")
+            public void testDiamond() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/defaults/diamond.kt");
+                doTest(fileName);
+            }
 
-        @TestMetadata("kt14243.kt")
-        public void testKt14243() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/kt14243.kt");
-            doTest(fileName);
-        }
+            @TestMetadata("kt11969.kt")
+            public void testKt11969() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/defaults/kt11969.kt");
+                doTest(fileName);
+            }
 
-        @TestMetadata("kt14243_2.kt")
-        public void testKt14243_2() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/kt14243_2.kt");
-            doTest(fileName);
-        }
+            @TestMetadata("kt14243.kt")
+            public void testKt14243() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/defaults/kt14243.kt");
+                doTest(fileName);
+            }
 
-        @TestMetadata("kt14243_prop.kt")
-        public void testKt14243_prop() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/kt14243_prop.kt");
-            doTest(fileName);
-        }
+            @TestMetadata("kt14243_2.kt")
+            public void testKt14243_2() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_2.kt");
+                doTest(fileName);
+            }
 
-        @TestMetadata("oneImplementation.kt")
-        public void testOneImplementation() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/oneImplementation.kt");
-            doTest(fileName);
-        }
+            @TestMetadata("kt14243_prop.kt")
+            public void testKt14243_prop() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_prop.kt");
+                doTest(fileName);
+            }
 
-        @TestMetadata("oneImplementation2.kt")
-        public void testOneImplementation2() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/oneImplementation2.kt");
-            doTest(fileName);
-        }
+            @TestMetadata("oneImplementation.kt")
+            public void testOneImplementation() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation.kt");
+                doTest(fileName);
+            }
 
-        @TestMetadata("simpleCall.kt")
-        public void testSimpleCall() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/simpleCall.kt");
-            doTest(fileName);
-        }
+            @TestMetadata("oneImplementation2.kt")
+            public void testOneImplementation2() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation2.kt");
+                doTest(fileName);
+            }
 
-        @TestMetadata("simpleProperty.kt")
-        public void testSimpleProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/simpleProperty.kt");
-            doTest(fileName);
-        }
+            @TestMetadata("simpleCall.kt")
+            public void testSimpleCall() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/defaults/simpleCall.kt");
+                doTest(fileName);
+            }
 
-        @TestMetadata("superCall.kt")
-        public void testSuperCall() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/superCall.kt");
-            doTest(fileName);
+            @TestMetadata("simpleProperty.kt")
+            public void testSimpleProperty() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/defaults/simpleProperty.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("superCall.kt")
+            public void testSuperCall() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/defaults/superCall.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class NoDelegation extends AbstractBlackBoxCodegenTest {
+                public void testAllFilesPresentInNoDelegation() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
+                }
+
+                @TestMetadata("noDelegationToDefaultMethodInClass.kt")
+                public void testNoDelegationToDefaultMethodInClass() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("noDelegationToDefaultMethodInInterface.kt")
+                public void testNoDelegationToDefaultMethodInInterface() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("noDelegationToDefaultMethodInInterface2.kt")
+                public void testNoDelegationToDefaultMethodInInterface2() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt");
+                    doTest(fileName);
+                }
+            }
+
+            @TestMetadata("compiler/testData/codegen/java8/box/jvm8/defaults/reflection")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Reflection extends AbstractBlackBoxCodegenTest {
+                public void testAllFilesPresentInReflection() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/java8/box/jvm8/defaults/reflection"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
+                }
+
+                @TestMetadata("propertyAnnotations.kt")
+                public void testPropertyAnnotations() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/defaults/reflection/propertyAnnotations.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("propertyAnnotationsCompatibility.kt")
+                public void testPropertyAnnotationsCompatibility() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/defaults/reflection/propertyAnnotationsCompatibility.kt");
+                    doTest(fileName);
+                }
+            }
         }
 
         @TestMetadata("compiler/testData/codegen/java8/box/jvm8/interfaceFlag")
@@ -271,54 +328,6 @@ public class BlackBoxWithJava8CodegenTestGenerated extends AbstractBlackBoxCodeg
                 doTest(fileName);
             }
         }
-
-        @TestMetadata("compiler/testData/codegen/java8/box/jvm8/noDelegation")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class NoDelegation extends AbstractBlackBoxCodegenTest {
-            public void testAllFilesPresentInNoDelegation() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/java8/box/jvm8/noDelegation"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
-            }
-
-            @TestMetadata("noDelegationToDefaultMethodInClass.kt")
-            public void testNoDelegationToDefaultMethodInClass() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/noDelegation/noDelegationToDefaultMethodInClass.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("noDelegationToDefaultMethodInInterface.kt")
-            public void testNoDelegationToDefaultMethodInInterface() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/noDelegation/noDelegationToDefaultMethodInInterface.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("noDelegationToDefaultMethodInInterface2.kt")
-            public void testNoDelegationToDefaultMethodInInterface2() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/noDelegation/noDelegationToDefaultMethodInInterface2.kt");
-                doTest(fileName);
-            }
-        }
-
-        @TestMetadata("compiler/testData/codegen/java8/box/jvm8/reflection")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Reflection extends AbstractBlackBoxCodegenTest {
-            public void testAllFilesPresentInReflection() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/java8/box/jvm8/reflection"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
-            }
-
-            @TestMetadata("propertyAnnotations.kt")
-            public void testPropertyAnnotations() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/reflection/propertyAnnotations.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("propertyAnnotationsCompatibility.kt")
-            public void testPropertyAnnotationsCompatibility() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/jvm8/reflection/propertyAnnotationsCompatibility.kt");
-                doTest(fileName);
-            }
-        }
     }
 
     @TestMetadata("compiler/testData/codegen/java8/box/mapGetOrDefault")