diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/boundFunctionReference.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/boundFunctionReference.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/boundFunctionReference.kt
rename to compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/boundFunctionReference.kt
diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/boundPropertyReference.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/boundPropertyReference.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/boundPropertyReference.kt
rename to compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/boundPropertyReference.kt
diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/constuctorReference.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/constuctorReference.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/constuctorReference.kt
rename to compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/constuctorReference.kt
diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/functionImportedFromObject.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/functionImportedFromObject.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/functionImportedFromObject.kt
rename to compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/functionImportedFromObject.kt
diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/functionReference.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/functionReference.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/functionReference.kt
rename to compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/functionReference.kt
diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/functionReferenceFromClass.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/functionReferenceFromClass.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/functionReferenceFromClass.kt
rename to compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/functionReferenceFromClass.kt
diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/functionReferenceFromObject.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/functionReferenceFromObject.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/functionReferenceFromObject.kt
rename to compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/functionReferenceFromObject.kt
diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/innerClassConstuctorReference.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/innerClassConstuctorReference.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/innerClassConstuctorReference.kt
rename to compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/innerClassConstuctorReference.kt
diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/privateFunctionReference.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/privateFunctionReference.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/privateFunctionReference.kt
rename to compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/privateFunctionReference.kt
diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/privatePropertyReference.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/privatePropertyReference.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/privatePropertyReference.kt
rename to compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/privatePropertyReference.kt
diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/propertyImportedFromObject.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/propertyImportedFromObject.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/propertyImportedFromObject.kt
rename to compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/propertyImportedFromObject.kt
diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/propertyReference.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/propertyReference.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/propertyReference.kt
rename to compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/propertyReference.kt
diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/propertyReferenceFromClass.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/propertyReferenceFromClass.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/propertyReferenceFromClass.kt
rename to compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/propertyReferenceFromClass.kt
diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/propertyReferenceFromObject.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/propertyReferenceFromObject.kt
similarity index 100%
rename from compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/propertyReferenceFromObject.kt
rename to compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/propertyReferenceFromObject.kt
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java
index b347a002b34..8893f2b47c3 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java
@@ -961,60 +961,12 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo
                 KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
             }
 
-            @TestMetadata("boundFunctionReference.kt")
-            public void testBoundFunctionReference() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/boundFunctionReference.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("boundPropertyReference.kt")
-            public void testBoundPropertyReference() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/boundPropertyReference.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("constuctorReference.kt")
-            public void testConstuctorReference() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/constuctorReference.kt");
-                doTest(fileName);
-            }
-
             @TestMetadata("defaultLambdaInNoInline.kt")
             public void testDefaultLambdaInNoInline() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/defaultLambdaInNoInline.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("functionImportedFromObject.kt")
-            public void testFunctionImportedFromObject() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/functionImportedFromObject.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("functionReference.kt")
-            public void testFunctionReference() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/functionReference.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("functionReferenceFromClass.kt")
-            public void testFunctionReferenceFromClass() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/functionReferenceFromClass.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("functionReferenceFromObject.kt")
-            public void testFunctionReferenceFromObject() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/functionReferenceFromObject.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("innerClassConstuctorReference.kt")
-            public void testInnerClassConstuctorReference() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/innerClassConstuctorReference.kt");
-                doTest(fileName);
-            }
-
             @TestMetadata("instanceCapuredInClass.kt")
             public void testInstanceCapuredInClass() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/instanceCapuredInClass.kt");
@@ -1045,42 +997,6 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo
                 doTest(fileName);
             }
 
-            @TestMetadata("privateFunctionReference.kt")
-            public void testPrivateFunctionReference() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/privateFunctionReference.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("privatePropertyReference.kt")
-            public void testPrivatePropertyReference() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/privatePropertyReference.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("propertyImportedFromObject.kt")
-            public void testPropertyImportedFromObject() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/propertyImportedFromObject.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("propertyReference.kt")
-            public void testPropertyReference() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/propertyReference.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("propertyReferenceFromClass.kt")
-            public void testPropertyReferenceFromClass() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/propertyReferenceFromClass.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("propertyReferenceFromObject.kt")
-            public void testPropertyReferenceFromObject() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/propertyReferenceFromObject.kt");
-                doTest(fileName);
-            }
-
             @TestMetadata("simple.kt")
             public void testSimple() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/simple.kt");
@@ -1110,6 +1026,99 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/simpleStaticInstance.kt");
                 doTest(fileName);
             }
+
+            @TestMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class CallableReferences extends AbstractBlackBoxInlineCodegenTest {
+                public void testAllFilesPresentInCallableReferences() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
+                }
+
+                @TestMetadata("boundFunctionReference.kt")
+                public void testBoundFunctionReference() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/boundFunctionReference.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("boundPropertyReference.kt")
+                public void testBoundPropertyReference() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/boundPropertyReference.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("constuctorReference.kt")
+                public void testConstuctorReference() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/constuctorReference.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("functionImportedFromObject.kt")
+                public void testFunctionImportedFromObject() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/functionImportedFromObject.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("functionReference.kt")
+                public void testFunctionReference() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/functionReference.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("functionReferenceFromClass.kt")
+                public void testFunctionReferenceFromClass() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/functionReferenceFromClass.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("functionReferenceFromObject.kt")
+                public void testFunctionReferenceFromObject() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/functionReferenceFromObject.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("innerClassConstuctorReference.kt")
+                public void testInnerClassConstuctorReference() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/innerClassConstuctorReference.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("privateFunctionReference.kt")
+                public void testPrivateFunctionReference() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/privateFunctionReference.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("privatePropertyReference.kt")
+                public void testPrivatePropertyReference() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/privatePropertyReference.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("propertyImportedFromObject.kt")
+                public void testPropertyImportedFromObject() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/propertyImportedFromObject.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("propertyReference.kt")
+                public void testPropertyReference() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/propertyReference.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("propertyReferenceFromClass.kt")
+                public void testPropertyReferenceFromClass() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/propertyReferenceFromClass.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("propertyReferenceFromObject.kt")
+                public void testPropertyReferenceFromObject() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/propertyReferenceFromObject.kt");
+                    doTest(fileName);
+                }
+            }
         }
 
         @TestMetadata("compiler/testData/codegen/boxInline/defaultValues/maskElimination")
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java
index 6fb8e0b239c..e6b77f77964 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java
@@ -961,60 +961,12 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
                 KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
             }
 
-            @TestMetadata("boundFunctionReference.kt")
-            public void testBoundFunctionReference() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/boundFunctionReference.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("boundPropertyReference.kt")
-            public void testBoundPropertyReference() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/boundPropertyReference.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("constuctorReference.kt")
-            public void testConstuctorReference() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/constuctorReference.kt");
-                doTest(fileName);
-            }
-
             @TestMetadata("defaultLambdaInNoInline.kt")
             public void testDefaultLambdaInNoInline() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/defaultLambdaInNoInline.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("functionImportedFromObject.kt")
-            public void testFunctionImportedFromObject() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/functionImportedFromObject.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("functionReference.kt")
-            public void testFunctionReference() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/functionReference.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("functionReferenceFromClass.kt")
-            public void testFunctionReferenceFromClass() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/functionReferenceFromClass.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("functionReferenceFromObject.kt")
-            public void testFunctionReferenceFromObject() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/functionReferenceFromObject.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("innerClassConstuctorReference.kt")
-            public void testInnerClassConstuctorReference() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/innerClassConstuctorReference.kt");
-                doTest(fileName);
-            }
-
             @TestMetadata("instanceCapuredInClass.kt")
             public void testInstanceCapuredInClass() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/instanceCapuredInClass.kt");
@@ -1045,42 +997,6 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
                 doTest(fileName);
             }
 
-            @TestMetadata("privateFunctionReference.kt")
-            public void testPrivateFunctionReference() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/privateFunctionReference.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("privatePropertyReference.kt")
-            public void testPrivatePropertyReference() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/privatePropertyReference.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("propertyImportedFromObject.kt")
-            public void testPropertyImportedFromObject() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/propertyImportedFromObject.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("propertyReference.kt")
-            public void testPropertyReference() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/propertyReference.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("propertyReferenceFromClass.kt")
-            public void testPropertyReferenceFromClass() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/propertyReferenceFromClass.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("propertyReferenceFromObject.kt")
-            public void testPropertyReferenceFromObject() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/propertyReferenceFromObject.kt");
-                doTest(fileName);
-            }
-
             @TestMetadata("simple.kt")
             public void testSimple() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/simple.kt");
@@ -1110,6 +1026,99 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/simpleStaticInstance.kt");
                 doTest(fileName);
             }
+
+            @TestMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class CallableReferences extends AbstractCompileKotlinAgainstInlineKotlinTest {
+                public void testAllFilesPresentInCallableReferences() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
+                }
+
+                @TestMetadata("boundFunctionReference.kt")
+                public void testBoundFunctionReference() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/boundFunctionReference.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("boundPropertyReference.kt")
+                public void testBoundPropertyReference() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/boundPropertyReference.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("constuctorReference.kt")
+                public void testConstuctorReference() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/constuctorReference.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("functionImportedFromObject.kt")
+                public void testFunctionImportedFromObject() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/functionImportedFromObject.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("functionReference.kt")
+                public void testFunctionReference() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/functionReference.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("functionReferenceFromClass.kt")
+                public void testFunctionReferenceFromClass() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/functionReferenceFromClass.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("functionReferenceFromObject.kt")
+                public void testFunctionReferenceFromObject() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/functionReferenceFromObject.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("innerClassConstuctorReference.kt")
+                public void testInnerClassConstuctorReference() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/innerClassConstuctorReference.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("privateFunctionReference.kt")
+                public void testPrivateFunctionReference() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/privateFunctionReference.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("privatePropertyReference.kt")
+                public void testPrivatePropertyReference() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/privatePropertyReference.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("propertyImportedFromObject.kt")
+                public void testPropertyImportedFromObject() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/propertyImportedFromObject.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("propertyReference.kt")
+                public void testPropertyReference() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/propertyReference.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("propertyReferenceFromClass.kt")
+                public void testPropertyReferenceFromClass() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/propertyReferenceFromClass.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("propertyReferenceFromObject.kt")
+                public void testPropertyReferenceFromObject() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/propertyReferenceFromObject.kt");
+                    doTest(fileName);
+                }
+            }
         }
 
         @TestMetadata("compiler/testData/codegen/boxInline/defaultValues/maskElimination")