diff --git a/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/fir/Fir2IrTextTestGenerated.java b/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/fir/Fir2IrTextTestGenerated.java
index 69c70d8d0e6..32eb0e19a0c 100644
--- a/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/fir/Fir2IrTextTestGenerated.java
+++ b/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/fir/Fir2IrTextTestGenerated.java
@@ -787,31 +787,6 @@ public class Fir2IrTextTestGenerated extends AbstractFir2IrTextTest {
             runTest("compiler/testData/ir/irText/expressions/callWithReorderedArguments.kt");
         }
 
-        @TestMetadata("callableRefToGenericMember.kt")
-        public void testCallableRefToGenericMember() throws Exception {
-            runTest("compiler/testData/ir/irText/expressions/callableRefToGenericMember.kt");
-        }
-
-        @TestMetadata("callableReferenceToImportedFromObject.kt")
-        public void testCallableReferenceToImportedFromObject() throws Exception {
-            runTest("compiler/testData/ir/irText/expressions/callableReferenceToImportedFromObject.kt");
-        }
-
-        @TestMetadata("callableReferenceTypeArguments.kt")
-        public void testCallableReferenceTypeArguments() throws Exception {
-            runTest("compiler/testData/ir/irText/expressions/callableReferenceTypeArguments.kt");
-        }
-
-        @TestMetadata("callableReferenceWithArgumentsConversion.kt")
-        public void testCallableReferenceWithArgumentsConversion() throws Exception {
-            runTest("compiler/testData/ir/irText/expressions/callableReferenceWithArgumentsConversion.kt");
-        }
-
-        @TestMetadata("callableReferenceWithVarargViewedAsArray.kt")
-        public void testCallableReferenceWithVarargViewedAsArray() throws Exception {
-            runTest("compiler/testData/ir/irText/expressions/callableReferenceWithVarargViewedAsArray.kt");
-        }
-
         @TestMetadata("calls.kt")
         public void testCalls() throws Exception {
             runTest("compiler/testData/ir/irText/expressions/calls.kt");
@@ -1362,6 +1337,44 @@ public class Fir2IrTextTestGenerated extends AbstractFir2IrTextTest {
             runTest("compiler/testData/ir/irText/expressions/whileDoWhile.kt");
         }
 
+        @TestMetadata("compiler/testData/ir/irText/expressions/callableReferences")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class CallableReferences extends AbstractFir2IrTextTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.ANY, testDataFilePath, "// IGNORE_BACKEND_FIR: ");
+            }
+
+            public void testAllFilesPresentInCallableReferences() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/expressions/callableReferences"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            }
+
+            @TestMetadata("genericMember.kt")
+            public void testGenericMember() throws Exception {
+                runTest("compiler/testData/ir/irText/expressions/callableReferences/genericMember.kt");
+            }
+
+            @TestMetadata("importedFromObject.kt")
+            public void testImportedFromObject() throws Exception {
+                runTest("compiler/testData/ir/irText/expressions/callableReferences/importedFromObject.kt");
+            }
+
+            @TestMetadata("typeArguments.kt")
+            public void testTypeArguments() throws Exception {
+                runTest("compiler/testData/ir/irText/expressions/callableReferences/typeArguments.kt");
+            }
+
+            @TestMetadata("withAdaptedArguments.kt")
+            public void testWithAdaptedArguments() throws Exception {
+                runTest("compiler/testData/ir/irText/expressions/callableReferences/withAdaptedArguments.kt");
+            }
+
+            @TestMetadata("withVarargViewedAsArray.kt")
+            public void testWithVarargViewedAsArray() throws Exception {
+                runTest("compiler/testData/ir/irText/expressions/callableReferences/withVarargViewedAsArray.kt");
+            }
+        }
+
         @TestMetadata("compiler/testData/ir/irText/expressions/floatingPointComparisons")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
diff --git a/compiler/testData/ir/irText/expressions/callableRefToGenericMember.fir.txt b/compiler/testData/ir/irText/expressions/callableReferences/genericMember.fir.txt
similarity index 98%
rename from compiler/testData/ir/irText/expressions/callableRefToGenericMember.fir.txt
rename to compiler/testData/ir/irText/expressions/callableReferences/genericMember.fir.txt
index 7e60cb118dc..f40447c681e 100644
--- a/compiler/testData/ir/irText/expressions/callableRefToGenericMember.fir.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/genericMember.fir.txt
@@ -1,4 +1,4 @@
-FILE fqName:<root> fileName:/callableRefToGenericMember.kt
+FILE fqName:<root> fileName:/genericMember.kt
   CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A
     TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?]
diff --git a/compiler/testData/ir/irText/expressions/callableRefToGenericMember.kt b/compiler/testData/ir/irText/expressions/callableReferences/genericMember.kt
similarity index 100%
rename from compiler/testData/ir/irText/expressions/callableRefToGenericMember.kt
rename to compiler/testData/ir/irText/expressions/callableReferences/genericMember.kt
diff --git a/compiler/testData/ir/irText/expressions/callableRefToGenericMember.txt b/compiler/testData/ir/irText/expressions/callableReferences/genericMember.txt
similarity index 98%
rename from compiler/testData/ir/irText/expressions/callableRefToGenericMember.txt
rename to compiler/testData/ir/irText/expressions/callableReferences/genericMember.txt
index 071a81f5297..ca62bb0bfcb 100644
--- a/compiler/testData/ir/irText/expressions/callableRefToGenericMember.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/genericMember.txt
@@ -1,4 +1,4 @@
-FILE fqName:<root> fileName:/callableRefToGenericMember.kt
+FILE fqName:<root> fileName:/genericMember.kt
   CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A<T of <root>.A>
     TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?]
diff --git a/compiler/testData/ir/irText/expressions/callableReferenceToImportedFromObject.fir.txt b/compiler/testData/ir/irText/expressions/callableReferences/importedFromObject.fir.txt
similarity index 98%
rename from compiler/testData/ir/irText/expressions/callableReferenceToImportedFromObject.fir.txt
rename to compiler/testData/ir/irText/expressions/callableReferences/importedFromObject.fir.txt
index 59b8ce20723..518e97e4b09 100644
--- a/compiler/testData/ir/irText/expressions/callableReferenceToImportedFromObject.fir.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/importedFromObject.fir.txt
@@ -1,4 +1,4 @@
-FILE fqName:test fileName:/callableReferenceToImportedFromObject.kt
+FILE fqName:test fileName:/importedFromObject.kt
   CLASS OBJECT name:Foo modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:test.Foo
     CONSTRUCTOR visibility:private <> () returnType:test.Foo [primary]
diff --git a/compiler/testData/ir/irText/expressions/callableReferenceToImportedFromObject.kt b/compiler/testData/ir/irText/expressions/callableReferences/importedFromObject.kt
similarity index 100%
rename from compiler/testData/ir/irText/expressions/callableReferenceToImportedFromObject.kt
rename to compiler/testData/ir/irText/expressions/callableReferences/importedFromObject.kt
diff --git a/compiler/testData/ir/irText/expressions/callableReferenceToImportedFromObject.txt b/compiler/testData/ir/irText/expressions/callableReferences/importedFromObject.txt
similarity index 99%
rename from compiler/testData/ir/irText/expressions/callableReferenceToImportedFromObject.txt
rename to compiler/testData/ir/irText/expressions/callableReferences/importedFromObject.txt
index 0eb60fc6c28..c5002c7a0fd 100644
--- a/compiler/testData/ir/irText/expressions/callableReferenceToImportedFromObject.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/importedFromObject.txt
@@ -1,4 +1,4 @@
-FILE fqName:test fileName:/callableReferenceToImportedFromObject.kt
+FILE fqName:test fileName:/importedFromObject.kt
   CLASS OBJECT name:Foo modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:test.Foo
     CONSTRUCTOR visibility:private <> () returnType:test.Foo [primary]
diff --git a/compiler/testData/ir/irText/expressions/callableReferenceTypeArguments.fir.txt b/compiler/testData/ir/irText/expressions/callableReferences/typeArguments.fir.txt
similarity index 98%
rename from compiler/testData/ir/irText/expressions/callableReferenceTypeArguments.fir.txt
rename to compiler/testData/ir/irText/expressions/callableReferences/typeArguments.fir.txt
index 8ac52eccfa0..2549cc0b035 100644
--- a/compiler/testData/ir/irText/expressions/callableReferenceTypeArguments.fir.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/typeArguments.fir.txt
@@ -1,4 +1,4 @@
-FILE fqName:<root> fileName:/callableReferenceTypeArguments.kt
+FILE fqName:<root> fileName:/typeArguments.kt
   CLASS OBJECT name:Host modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Host
     CONSTRUCTOR visibility:private <> () returnType:<root>.Host [primary]
diff --git a/compiler/testData/ir/irText/expressions/callableReferenceTypeArguments.kt b/compiler/testData/ir/irText/expressions/callableReferences/typeArguments.kt
similarity index 100%
rename from compiler/testData/ir/irText/expressions/callableReferenceTypeArguments.kt
rename to compiler/testData/ir/irText/expressions/callableReferences/typeArguments.kt
diff --git a/compiler/testData/ir/irText/expressions/callableReferenceTypeArguments.txt b/compiler/testData/ir/irText/expressions/callableReferences/typeArguments.txt
similarity index 98%
rename from compiler/testData/ir/irText/expressions/callableReferenceTypeArguments.txt
rename to compiler/testData/ir/irText/expressions/callableReferences/typeArguments.txt
index 09d06009166..771af5c37ff 100644
--- a/compiler/testData/ir/irText/expressions/callableReferenceTypeArguments.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/typeArguments.txt
@@ -1,4 +1,4 @@
-FILE fqName:<root> fileName:/callableReferenceTypeArguments.kt
+FILE fqName:<root> fileName:/typeArguments.kt
   CLASS OBJECT name:Host modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Host
     CONSTRUCTOR visibility:private <> () returnType:<root>.Host [primary]
diff --git a/compiler/testData/ir/irText/expressions/callableReferenceWithArgumentsConversion.fir.txt b/compiler/testData/ir/irText/expressions/callableReferences/withAdaptedArguments.fir.txt
similarity index 98%
rename from compiler/testData/ir/irText/expressions/callableReferenceWithArgumentsConversion.fir.txt
rename to compiler/testData/ir/irText/expressions/callableReferences/withAdaptedArguments.fir.txt
index d78e2c2d129..1dc12a7259a 100644
--- a/compiler/testData/ir/irText/expressions/callableReferenceWithArgumentsConversion.fir.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/withAdaptedArguments.fir.txt
@@ -1,4 +1,4 @@
-FILE fqName:<root> fileName:/callableReferenceWithArgumentsConversion.kt
+FILE fqName:<root> fileName:/withAdaptedArguments.kt
   FUN name:use visibility:public modality:FINAL <> (fn:kotlin.Function1<kotlin.Int, kotlin.String>) returnType:kotlin.String
     VALUE_PARAMETER name:fn index:0 type:kotlin.Function1<kotlin.Int, kotlin.String>
     BLOCK_BODY
diff --git a/compiler/testData/ir/irText/expressions/callableReferenceWithArgumentsConversion.kt b/compiler/testData/ir/irText/expressions/callableReferences/withAdaptedArguments.kt
similarity index 100%
rename from compiler/testData/ir/irText/expressions/callableReferenceWithArgumentsConversion.kt
rename to compiler/testData/ir/irText/expressions/callableReferences/withAdaptedArguments.kt
diff --git a/compiler/testData/ir/irText/expressions/callableReferenceWithArgumentsConversion.txt b/compiler/testData/ir/irText/expressions/callableReferences/withAdaptedArguments.txt
similarity index 99%
rename from compiler/testData/ir/irText/expressions/callableReferenceWithArgumentsConversion.txt
rename to compiler/testData/ir/irText/expressions/callableReferences/withAdaptedArguments.txt
index 63b85b59fbe..4eb4c8d8c24 100644
--- a/compiler/testData/ir/irText/expressions/callableReferenceWithArgumentsConversion.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/withAdaptedArguments.txt
@@ -1,4 +1,4 @@
-FILE fqName:<root> fileName:/callableReferenceWithArgumentsConversion.kt
+FILE fqName:<root> fileName:/withAdaptedArguments.kt
   FUN name:use visibility:public modality:FINAL <> (fn:kotlin.Function1<kotlin.Int, kotlin.String>) returnType:kotlin.String
     VALUE_PARAMETER name:fn index:0 type:kotlin.Function1<kotlin.Int, kotlin.String>
     BLOCK_BODY
diff --git a/compiler/testData/ir/irText/expressions/callableReferenceWithVarargViewedAsArray.fir.txt b/compiler/testData/ir/irText/expressions/callableReferences/withVarargViewedAsArray.fir.txt
similarity index 98%
rename from compiler/testData/ir/irText/expressions/callableReferenceWithVarargViewedAsArray.fir.txt
rename to compiler/testData/ir/irText/expressions/callableReferences/withVarargViewedAsArray.fir.txt
index 36abd7accb4..b6763dea0bc 100644
--- a/compiler/testData/ir/irText/expressions/callableReferenceWithVarargViewedAsArray.fir.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/withVarargViewedAsArray.fir.txt
@@ -1,4 +1,4 @@
-FILE fqName:<root> fileName:/callableReferenceWithVarargViewedAsArray.kt
+FILE fqName:<root> fileName:/withVarargViewedAsArray.kt
   FUN name:sum visibility:public modality:FINAL <> (args:kotlin.IntArray) returnType:kotlin.Int
     VALUE_PARAMETER name:args index:0 type:kotlin.IntArray
     BLOCK_BODY
diff --git a/compiler/testData/ir/irText/expressions/callableReferenceWithVarargViewedAsArray.kt b/compiler/testData/ir/irText/expressions/callableReferences/withVarargViewedAsArray.kt
similarity index 100%
rename from compiler/testData/ir/irText/expressions/callableReferenceWithVarargViewedAsArray.kt
rename to compiler/testData/ir/irText/expressions/callableReferences/withVarargViewedAsArray.kt
diff --git a/compiler/testData/ir/irText/expressions/callableReferenceWithVarargViewedAsArray.txt b/compiler/testData/ir/irText/expressions/callableReferences/withVarargViewedAsArray.txt
similarity index 99%
rename from compiler/testData/ir/irText/expressions/callableReferenceWithVarargViewedAsArray.txt
rename to compiler/testData/ir/irText/expressions/callableReferences/withVarargViewedAsArray.txt
index 2912fcb183c..2002fe994fb 100644
--- a/compiler/testData/ir/irText/expressions/callableReferenceWithVarargViewedAsArray.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/withVarargViewedAsArray.txt
@@ -1,4 +1,4 @@
-FILE fqName:<root> fileName:/callableReferenceWithVarargViewedAsArray.kt
+FILE fqName:<root> fileName:/withVarargViewedAsArray.kt
   FUN name:sum visibility:public modality:FINAL <> (args:kotlin.IntArray) returnType:kotlin.Int
     VALUE_PARAMETER name:args index:0 type:kotlin.IntArray varargElementType:kotlin.Int [vararg]
     BLOCK_BODY
diff --git a/compiler/tests/org/jetbrains/kotlin/ir/IrTextTestCaseGenerated.java b/compiler/tests/org/jetbrains/kotlin/ir/IrTextTestCaseGenerated.java
index 92bbfec52c7..a05961c1a9b 100644
--- a/compiler/tests/org/jetbrains/kotlin/ir/IrTextTestCaseGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/ir/IrTextTestCaseGenerated.java
@@ -786,31 +786,6 @@ public class IrTextTestCaseGenerated extends AbstractIrTextTestCase {
             runTest("compiler/testData/ir/irText/expressions/callWithReorderedArguments.kt");
         }
 
-        @TestMetadata("callableRefToGenericMember.kt")
-        public void testCallableRefToGenericMember() throws Exception {
-            runTest("compiler/testData/ir/irText/expressions/callableRefToGenericMember.kt");
-        }
-
-        @TestMetadata("callableReferenceToImportedFromObject.kt")
-        public void testCallableReferenceToImportedFromObject() throws Exception {
-            runTest("compiler/testData/ir/irText/expressions/callableReferenceToImportedFromObject.kt");
-        }
-
-        @TestMetadata("callableReferenceTypeArguments.kt")
-        public void testCallableReferenceTypeArguments() throws Exception {
-            runTest("compiler/testData/ir/irText/expressions/callableReferenceTypeArguments.kt");
-        }
-
-        @TestMetadata("callableReferenceWithArgumentsConversion.kt")
-        public void testCallableReferenceWithArgumentsConversion() throws Exception {
-            runTest("compiler/testData/ir/irText/expressions/callableReferenceWithArgumentsConversion.kt");
-        }
-
-        @TestMetadata("callableReferenceWithVarargViewedAsArray.kt")
-        public void testCallableReferenceWithVarargViewedAsArray() throws Exception {
-            runTest("compiler/testData/ir/irText/expressions/callableReferenceWithVarargViewedAsArray.kt");
-        }
-
         @TestMetadata("calls.kt")
         public void testCalls() throws Exception {
             runTest("compiler/testData/ir/irText/expressions/calls.kt");
@@ -1361,6 +1336,44 @@ public class IrTextTestCaseGenerated extends AbstractIrTextTestCase {
             runTest("compiler/testData/ir/irText/expressions/whileDoWhile.kt");
         }
 
+        @TestMetadata("compiler/testData/ir/irText/expressions/callableReferences")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class CallableReferences extends AbstractIrTextTestCase {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInCallableReferences() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/expressions/callableReferences"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            }
+
+            @TestMetadata("genericMember.kt")
+            public void testGenericMember() throws Exception {
+                runTest("compiler/testData/ir/irText/expressions/callableReferences/genericMember.kt");
+            }
+
+            @TestMetadata("importedFromObject.kt")
+            public void testImportedFromObject() throws Exception {
+                runTest("compiler/testData/ir/irText/expressions/callableReferences/importedFromObject.kt");
+            }
+
+            @TestMetadata("typeArguments.kt")
+            public void testTypeArguments() throws Exception {
+                runTest("compiler/testData/ir/irText/expressions/callableReferences/typeArguments.kt");
+            }
+
+            @TestMetadata("withAdaptedArguments.kt")
+            public void testWithAdaptedArguments() throws Exception {
+                runTest("compiler/testData/ir/irText/expressions/callableReferences/withAdaptedArguments.kt");
+            }
+
+            @TestMetadata("withVarargViewedAsArray.kt")
+            public void testWithVarargViewedAsArray() throws Exception {
+                runTest("compiler/testData/ir/irText/expressions/callableReferences/withVarargViewedAsArray.kt");
+            }
+        }
+
         @TestMetadata("compiler/testData/ir/irText/expressions/floatingPointComparisons")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)