diff --git a/compiler/fir/resolve/testData/resolveWithStdlib/anonymousInDelegate.kt b/compiler/fir/resolve/testData/resolveWithStdlib/delegates/anonymousInDelegate.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolveWithStdlib/anonymousInDelegate.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/delegates/anonymousInDelegate.kt
diff --git a/compiler/fir/resolve/testData/resolveWithStdlib/anonymousInDelegate.txt b/compiler/fir/resolve/testData/resolveWithStdlib/delegates/anonymousInDelegate.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolveWithStdlib/anonymousInDelegate.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/delegates/anonymousInDelegate.txt
diff --git a/compiler/fir/resolve/testData/resolveWithStdlib/delegateTypeMismatch.kt b/compiler/fir/resolve/testData/resolveWithStdlib/delegates/delegateTypeMismatch.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolveWithStdlib/delegateTypeMismatch.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/delegates/delegateTypeMismatch.kt
diff --git a/compiler/fir/resolve/testData/resolveWithStdlib/delegateTypeMismatch.txt b/compiler/fir/resolve/testData/resolveWithStdlib/delegates/delegateTypeMismatch.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolveWithStdlib/delegateTypeMismatch.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/delegates/delegateTypeMismatch.txt
diff --git a/compiler/fir/resolve/testData/resolveWithStdlib/delegateWithAnonymousObject.dot b/compiler/fir/resolve/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.dot
similarity index 100%
rename from compiler/fir/resolve/testData/resolveWithStdlib/delegateWithAnonymousObject.dot
rename to compiler/fir/resolve/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.dot
diff --git a/compiler/fir/resolve/testData/resolveWithStdlib/delegateWithAnonymousObject.kt b/compiler/fir/resolve/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolveWithStdlib/delegateWithAnonymousObject.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.kt
diff --git a/compiler/fir/resolve/testData/resolveWithStdlib/delegateWithAnonymousObject.txt b/compiler/fir/resolve/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolveWithStdlib/delegateWithAnonymousObject.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.txt
diff --git a/compiler/fir/resolve/testData/resolveWithStdlib/simpleDelegateProvider.kt b/compiler/fir/resolve/testData/resolveWithStdlib/delegates/simpleDelegateProvider.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolveWithStdlib/simpleDelegateProvider.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/delegates/simpleDelegateProvider.kt
diff --git a/compiler/fir/resolve/testData/resolveWithStdlib/simpleDelegateProvider.txt b/compiler/fir/resolve/testData/resolveWithStdlib/delegates/simpleDelegateProvider.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolveWithStdlib/simpleDelegateProvider.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/delegates/simpleDelegateProvider.txt
diff --git a/compiler/fir/resolve/testData/resolveWithStdlib/simpleDelegatedToMap.kt b/compiler/fir/resolve/testData/resolveWithStdlib/delegates/simpleDelegatedToMap.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolveWithStdlib/simpleDelegatedToMap.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/delegates/simpleDelegatedToMap.kt
diff --git a/compiler/fir/resolve/testData/resolveWithStdlib/simpleDelegatedToMap.txt b/compiler/fir/resolve/testData/resolveWithStdlib/delegates/simpleDelegatedToMap.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolveWithStdlib/simpleDelegatedToMap.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/delegates/simpleDelegatedToMap.txt
diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithStdlibTestGenerated.java b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithStdlibTestGenerated.java
index 02046394147..4588a0dae31 100644
--- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithStdlibTestGenerated.java
+++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithStdlibTestGenerated.java
@@ -33,11 +33,6 @@ public class FirDiagnosticsWithStdlibTestGenerated extends AbstractFirDiagnostic
         KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/resolve/testData/resolveWithStdlib"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
     }
 
-    @TestMetadata("anonymousInDelegate.kt")
-    public void testAnonymousInDelegate() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolveWithStdlib/anonymousInDelegate.kt");
-    }
-
     @TestMetadata("arrayFilterCapturedType.kt")
     public void testArrayFilterCapturedType() throws Exception {
         runTest("compiler/fir/resolve/testData/resolveWithStdlib/arrayFilterCapturedType.kt");
@@ -88,16 +83,6 @@ public class FirDiagnosticsWithStdlibTestGenerated extends AbstractFirDiagnostic
         runTest("compiler/fir/resolve/testData/resolveWithStdlib/concurrentMapOfAliases.kt");
     }
 
-    @TestMetadata("delegateTypeMismatch.kt")
-    public void testDelegateTypeMismatch() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolveWithStdlib/delegateTypeMismatch.kt");
-    }
-
-    @TestMetadata("delegateWithAnonymousObject.kt")
-    public void testDelegateWithAnonymousObject() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolveWithStdlib/delegateWithAnonymousObject.kt");
-    }
-
     @TestMetadata("emptyArray.kt")
     public void testEmptyArray() throws Exception {
         runTest("compiler/fir/resolve/testData/resolveWithStdlib/emptyArray.kt");
@@ -238,16 +223,6 @@ public class FirDiagnosticsWithStdlibTestGenerated extends AbstractFirDiagnostic
         runTest("compiler/fir/resolve/testData/resolveWithStdlib/runOnIntegerLiteral.kt");
     }
 
-    @TestMetadata("simpleDelegateProvider.kt")
-    public void testSimpleDelegateProvider() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolveWithStdlib/simpleDelegateProvider.kt");
-    }
-
-    @TestMetadata("simpleDelegatedToMap.kt")
-    public void testSimpleDelegatedToMap() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolveWithStdlib/simpleDelegatedToMap.kt");
-    }
-
     @TestMetadata("simpleLazy.kt")
     public void testSimpleLazy() throws Exception {
         runTest("compiler/fir/resolve/testData/resolveWithStdlib/simpleLazy.kt");
@@ -517,6 +492,44 @@ public class FirDiagnosticsWithStdlibTestGenerated extends AbstractFirDiagnostic
         }
     }
 
+    @TestMetadata("compiler/fir/resolve/testData/resolveWithStdlib/delegates")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Delegates extends AbstractFirDiagnosticsWithStdlibTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInDelegates() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/resolve/testData/resolveWithStdlib/delegates"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+        }
+
+        @TestMetadata("anonymousInDelegate.kt")
+        public void testAnonymousInDelegate() throws Exception {
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/delegates/anonymousInDelegate.kt");
+        }
+
+        @TestMetadata("delegateTypeMismatch.kt")
+        public void testDelegateTypeMismatch() throws Exception {
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/delegates/delegateTypeMismatch.kt");
+        }
+
+        @TestMetadata("delegateWithAnonymousObject.kt")
+        public void testDelegateWithAnonymousObject() throws Exception {
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.kt");
+        }
+
+        @TestMetadata("simpleDelegateProvider.kt")
+        public void testSimpleDelegateProvider() throws Exception {
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/delegates/simpleDelegateProvider.kt");
+        }
+
+        @TestMetadata("simpleDelegatedToMap.kt")
+        public void testSimpleDelegatedToMap() throws Exception {
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/delegates/simpleDelegatedToMap.kt");
+        }
+    }
+
     @TestMetadata("compiler/fir/resolve/testData/resolveWithStdlib/inference")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)