diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
index 6eda2d2ef3d..a14617a1ec5 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
@@ -38097,6 +38097,40 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
             }
         }
 
+        @Nested
+        @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava21")
+        @TestDataPath("$PROJECT_ROOT")
+        public class TestsWithJava21 {
+            @Test
+            public void testAllFilesPresentInTestsWithJava21() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava21"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
+            }
+
+            @Test
+            @TestMetadata("implementationsForSequencedCollection.kt")
+            public void testImplementationsForSequencedCollection() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/testsWithJava21/implementationsForSequencedCollection.kt");
+            }
+
+            @Test
+            @TestMetadata("newListMethods.kt")
+            public void testNewListMethods() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.kt");
+            }
+
+            @Test
+            @TestMetadata("newListMethodsImmutable.kt")
+            public void testNewListMethodsImmutable() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/testsWithJava21/newListMethodsImmutable.kt");
+            }
+
+            @Test
+            @TestMetadata("noFalsePositiveAbstractToArray.kt")
+            public void testNoFalsePositiveAbstractToArray() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/testsWithJava21/noFalsePositiveAbstractToArray.kt");
+            }
+        }
+
         @Nested
         @TestMetadata("compiler/testData/diagnostics/tests/thisAndSuper")
         @TestDataPath("$PROJECT_ROOT")
diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
index 76da35ae223..6abecf5fad7 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
@@ -38097,6 +38097,40 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
             }
         }
 
+        @Nested
+        @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava21")
+        @TestDataPath("$PROJECT_ROOT")
+        public class TestsWithJava21 {
+            @Test
+            public void testAllFilesPresentInTestsWithJava21() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava21"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
+            }
+
+            @Test
+            @TestMetadata("implementationsForSequencedCollection.kt")
+            public void testImplementationsForSequencedCollection() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/testsWithJava21/implementationsForSequencedCollection.kt");
+            }
+
+            @Test
+            @TestMetadata("newListMethods.kt")
+            public void testNewListMethods() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.kt");
+            }
+
+            @Test
+            @TestMetadata("newListMethodsImmutable.kt")
+            public void testNewListMethodsImmutable() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/testsWithJava21/newListMethodsImmutable.kt");
+            }
+
+            @Test
+            @TestMetadata("noFalsePositiveAbstractToArray.kt")
+            public void testNoFalsePositiveAbstractToArray() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/testsWithJava21/noFalsePositiveAbstractToArray.kt");
+            }
+        }
+
         @Nested
         @TestMetadata("compiler/testData/diagnostics/tests/thisAndSuper")
         @TestDataPath("$PROJECT_ROOT")
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeJdk21DiagnosticTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeJdk21DiagnosticTestGenerated.java
deleted file mode 100644
index 875a2ec6e64..00000000000
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeJdk21DiagnosticTestGenerated.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2010-2024 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.test.runners;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.util.KtTestUtil;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-
-import java.io.File;
-import java.util.regex.Pattern;
-
-/** This class is generated by {@link org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("compiler/testData/diagnostics/testsWithJdk21")
-@TestDataPath("$PROJECT_ROOT")
-public class FirLightTreeJdk21DiagnosticTestGenerated extends AbstractFirLightTreeJdk21DiagnosticTest {
-    @Test
-    public void testAllFilesPresentInTestsWithJdk21() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJdk21"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
-    }
-
-    @Test
-    @TestMetadata("implementationsForSequencedCollection.kt")
-    public void testImplementationsForSequencedCollection() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJdk21/implementationsForSequencedCollection.kt");
-    }
-
-    @Test
-    @TestMetadata("newListMethods.kt")
-    public void testNewListMethods() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJdk21/newListMethods.kt");
-    }
-
-    @Test
-    @TestMetadata("newListMethodsImmutable.kt")
-    public void testNewListMethodsImmutable() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.kt");
-    }
-
-    @Test
-    @TestMetadata("noFalsePositiveAbstractToArray.kt")
-    public void testNoFalsePositiveAbstractToArray() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJdk21/noFalsePositiveAbstractToArray.kt");
-    }
-}
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
index 22b89862189..4b5a8d9bc7a 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
@@ -35817,6 +35817,40 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
             }
         }
 
+        @Nested
+        @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava21")
+        @TestDataPath("$PROJECT_ROOT")
+        public class TestsWithJava21 {
+            @Test
+            public void testAllFilesPresentInTestsWithJava21() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava21"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform");
+            }
+
+            @Test
+            @TestMetadata("implementationsForSequencedCollection.kt")
+            public void testImplementationsForSequencedCollection() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/testsWithJava21/implementationsForSequencedCollection.kt");
+            }
+
+            @Test
+            @TestMetadata("newListMethods.kt")
+            public void testNewListMethods() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.kt");
+            }
+
+            @Test
+            @TestMetadata("newListMethodsImmutable.kt")
+            public void testNewListMethodsImmutable() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/testsWithJava21/newListMethodsImmutable.kt");
+            }
+
+            @Test
+            @TestMetadata("noFalsePositiveAbstractToArray.kt")
+            public void testNoFalsePositiveAbstractToArray() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/testsWithJava21/noFalsePositiveAbstractToArray.kt");
+            }
+        }
+
         @Nested
         @TestMetadata("compiler/testData/diagnostics/tests/thisAndSuper")
         @TestDataPath("$PROJECT_ROOT")
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiJdk21DiagnosticTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiJdk21DiagnosticTestGenerated.java
deleted file mode 100644
index 43270ec8859..00000000000
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiJdk21DiagnosticTestGenerated.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2010-2024 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.test.runners;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.util.KtTestUtil;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-
-import java.io.File;
-import java.util.regex.Pattern;
-
-/** This class is generated by {@link org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("compiler/testData/diagnostics/testsWithJdk21")
-@TestDataPath("$PROJECT_ROOT")
-public class FirPsiJdk21DiagnosticTestGenerated extends AbstractFirPsiJdk21DiagnosticTest {
-    @Test
-    public void testAllFilesPresentInTestsWithJdk21() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJdk21"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
-    }
-
-    @Test
-    @TestMetadata("implementationsForSequencedCollection.kt")
-    public void testImplementationsForSequencedCollection() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJdk21/implementationsForSequencedCollection.kt");
-    }
-
-    @Test
-    @TestMetadata("newListMethods.kt")
-    public void testNewListMethods() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJdk21/newListMethods.kt");
-    }
-
-    @Test
-    @TestMetadata("newListMethodsImmutable.kt")
-    public void testNewListMethodsImmutable() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.kt");
-    }
-
-    @Test
-    @TestMetadata("noFalsePositiveAbstractToArray.kt")
-    public void testNoFalsePositiveAbstractToArray() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJdk21/noFalsePositiveAbstractToArray.kt");
-    }
-}
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
index a7e0019cc97..1324786548f 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
@@ -35937,6 +35937,40 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
             }
         }
 
+        @Nested
+        @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava21")
+        @TestDataPath("$PROJECT_ROOT")
+        public class TestsWithJava21 {
+            @Test
+            public void testAllFilesPresentInTestsWithJava21() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava21"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform");
+            }
+
+            @Test
+            @TestMetadata("implementationsForSequencedCollection.kt")
+            public void testImplementationsForSequencedCollection() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/testsWithJava21/implementationsForSequencedCollection.kt");
+            }
+
+            @Test
+            @TestMetadata("newListMethods.kt")
+            public void testNewListMethods() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.kt");
+            }
+
+            @Test
+            @TestMetadata("newListMethodsImmutable.kt")
+            public void testNewListMethodsImmutable() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/testsWithJava21/newListMethodsImmutable.kt");
+            }
+
+            @Test
+            @TestMetadata("noFalsePositiveAbstractToArray.kt")
+            public void testNoFalsePositiveAbstractToArray() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/testsWithJava21/noFalsePositiveAbstractToArray.kt");
+            }
+        }
+
         @Nested
         @TestMetadata("compiler/testData/diagnostics/tests/thisAndSuper")
         @TestDataPath("$PROJECT_ROOT")
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
index 23134115525..55f0c0e4dfb 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
@@ -38097,6 +38097,40 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
             }
         }
 
+        @Nested
+        @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava21")
+        @TestDataPath("$PROJECT_ROOT")
+        public class TestsWithJava21 {
+            @Test
+            public void testAllFilesPresentInTestsWithJava21() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava21"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
+            }
+
+            @Test
+            @TestMetadata("implementationsForSequencedCollection.kt")
+            public void testImplementationsForSequencedCollection() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/testsWithJava21/implementationsForSequencedCollection.kt");
+            }
+
+            @Test
+            @TestMetadata("newListMethods.kt")
+            public void testNewListMethods() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.kt");
+            }
+
+            @Test
+            @TestMetadata("newListMethodsImmutable.kt")
+            public void testNewListMethodsImmutable() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/testsWithJava21/newListMethodsImmutable.kt");
+            }
+
+            @Test
+            @TestMetadata("noFalsePositiveAbstractToArray.kt")
+            public void testNoFalsePositiveAbstractToArray() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/testsWithJava21/noFalsePositiveAbstractToArray.kt");
+            }
+        }
+
         @Nested
         @TestMetadata("compiler/testData/diagnostics/tests/thisAndSuper")
         @TestDataPath("$PROJECT_ROOT")
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/Jdk21DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/Jdk21DiagnosticTestGenerated.java
deleted file mode 100644
index 40207fab696..00000000000
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/Jdk21DiagnosticTestGenerated.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2010-2024 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.test.runners;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.util.KtTestUtil;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-
-import java.io.File;
-import java.util.regex.Pattern;
-
-/** This class is generated by {@link org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("compiler/testData/diagnostics/testsWithJdk21")
-@TestDataPath("$PROJECT_ROOT")
-public class Jdk21DiagnosticTestGenerated extends AbstractJdk21DiagnosticTest {
-    @Test
-    public void testAllFilesPresentInTestsWithJdk21() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJdk21"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
-    }
-
-    @Test
-    @TestMetadata("implementationsForSequencedCollection.kt")
-    public void testImplementationsForSequencedCollection() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJdk21/implementationsForSequencedCollection.kt");
-    }
-
-    @Test
-    @TestMetadata("newListMethods.kt")
-    public void testNewListMethods() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJdk21/newListMethods.kt");
-    }
-
-    @Test
-    @TestMetadata("newListMethodsImmutable.kt")
-    public void testNewListMethodsImmutable() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.kt");
-    }
-
-    @Test
-    @TestMetadata("noFalsePositiveAbstractToArray.kt")
-    public void testNoFalsePositiveAbstractToArray() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJdk21/noFalsePositiveAbstractToArray.kt");
-    }
-}