diff --git a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java
index 5c3cb63b4f8..40360adcc11 100644
--- a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java
@@ -916,16 +916,31 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
             runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/anonymousObjectByDelegate.kt");
         }
 
+        @TestMetadata("classInSupertypeForEnum.kt")
+        public void testClassInSupertypeForEnum() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/classInSupertypeForEnum.kt");
+        }
+
         @TestMetadata("conflictingOverloads.kt")
         public void testConflictingOverloads() throws Exception {
             runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/conflictingOverloads.kt");
         }
 
+        @TestMetadata("constructorInInterface.kt")
+        public void testConstructorInInterface() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/constructorInInterface.kt");
+        }
+
         @TestMetadata("cyclicConstructorDelegationCall.kt")
         public void testCyclicConstructorDelegationCall() throws Exception {
             runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/cyclicConstructorDelegationCall.kt");
         }
 
+        @TestMetadata("delegationInInterface.kt")
+        public void testDelegationInInterface() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/delegationInInterface.kt");
+        }
+
         @TestMetadata("delegationSuperCallInEnumConstructor.kt")
         public void testDelegationSuperCallInEnumConstructor() throws Exception {
             runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/delegationSuperCallInEnumConstructor.kt");
@@ -936,21 +951,6 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
             runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/explicitDelegationCallRequired.kt");
         }
 
-        @TestMetadata("classInSupertypeForEnum.kt")
-        public void testClassInSupertypeForEnum() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/classInSupertypeForEnum.kt");
-        }
-
-        @TestMetadata("constructorInInterface.kt")
-        public void testConstructorInInterface() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/constructorInInterface.kt");
-        }
-
-        @TestMetadata("delegationInInterface.kt")
-        public void testDelegationInInterface() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/delegationInInterface.kt");
-        }
-
         @TestMetadata("incompatibleModifiers.kt")
         public void testIncompatibleModifiers() throws Exception {
             runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/incompatibleModifiers.kt");
@@ -1041,6 +1041,11 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
             runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/superclassNotAccessibleFromInterface.kt");
         }
 
+        @TestMetadata("supertypeInitializedInInterface.kt")
+        public void testSupertypeInitializedInInterface() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/supertypeInitializedInInterface.kt");
+        }
+
         @TestMetadata("supertypeInitializedWithoutPrimaryConstructor.kt")
         public void testSupertypeInitializedWithoutPrimaryConstructor() throws Exception {
             runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/supertypeInitializedWithoutPrimaryConstructor.kt");
@@ -1051,26 +1056,21 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
             runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/typeArgumentsNotAllowed.kt");
         }
 
-        @TestMetadata("supertypeInitializedInInterface.kt")
-        public void testSupertypeInitializedInInterface() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/supertypeInitializedInInterface.kt");
-        }
-
         @TestMetadata("typeOfAnnotationMember.kt")
         public void testTypeOfAnnotationMember() throws Exception {
             runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/typeOfAnnotationMember.kt");
         }
 
-        @TestMetadata("typeParametersInObject.kt")
-        public void testTypeParametersInObject() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/typeParametersInObject.kt");
-        }
-
         @TestMetadata("typeParametersInEnum.kt")
         public void testTypeParametersInEnum() throws Exception {
             runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/typeParametersInEnum.kt");
         }
 
+        @TestMetadata("typeParametersInObject.kt")
+        public void testTypeParametersInObject() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/typeParametersInObject.kt");
+        }
+
         @TestMetadata("upperBoundViolated.kt")
         public void testUpperBoundViolated() throws Exception {
             runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.kt");
diff --git a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java
index a0e41a27011..601ca9b8f41 100644
--- a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java
@@ -916,16 +916,31 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
             runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/anonymousObjectByDelegate.kt");
         }
 
+        @TestMetadata("classInSupertypeForEnum.kt")
+        public void testClassInSupertypeForEnum() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/classInSupertypeForEnum.kt");
+        }
+
         @TestMetadata("conflictingOverloads.kt")
         public void testConflictingOverloads() throws Exception {
             runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/conflictingOverloads.kt");
         }
 
+        @TestMetadata("constructorInInterface.kt")
+        public void testConstructorInInterface() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/constructorInInterface.kt");
+        }
+
         @TestMetadata("cyclicConstructorDelegationCall.kt")
         public void testCyclicConstructorDelegationCall() throws Exception {
             runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/cyclicConstructorDelegationCall.kt");
         }
 
+        @TestMetadata("delegationInInterface.kt")
+        public void testDelegationInInterface() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/delegationInInterface.kt");
+        }
+
         @TestMetadata("delegationSuperCallInEnumConstructor.kt")
         public void testDelegationSuperCallInEnumConstructor() throws Exception {
             runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/delegationSuperCallInEnumConstructor.kt");
@@ -936,21 +951,6 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
             runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/explicitDelegationCallRequired.kt");
         }
 
-        @TestMetadata("classInSupertypeForEnum.kt")
-        public void testClassInSupertypeForEnum() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/classInSupertypeForEnum.kt");
-        }
-
-        @TestMetadata("constructorInInterface.kt")
-        public void testConstructorInInterface() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/constructorInInterface.kt");
-        }
-
-        @TestMetadata("delegationInInterface.kt")
-        public void testDelegationInInterface() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/delegationInInterface.kt");
-        }
-
         @TestMetadata("incompatibleModifiers.kt")
         public void testIncompatibleModifiers() throws Exception {
             runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/incompatibleModifiers.kt");
@@ -1041,6 +1041,11 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
             runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/superclassNotAccessibleFromInterface.kt");
         }
 
+        @TestMetadata("supertypeInitializedInInterface.kt")
+        public void testSupertypeInitializedInInterface() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/supertypeInitializedInInterface.kt");
+        }
+
         @TestMetadata("supertypeInitializedWithoutPrimaryConstructor.kt")
         public void testSupertypeInitializedWithoutPrimaryConstructor() throws Exception {
             runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/supertypeInitializedWithoutPrimaryConstructor.kt");
@@ -1051,26 +1056,21 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
             runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/typeArgumentsNotAllowed.kt");
         }
 
-        @TestMetadata("supertypeInitializedInInterface.kt")
-        public void testSupertypeInitializedInInterface() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/supertypeInitializedInInterface.kt");
-        }
-
         @TestMetadata("typeOfAnnotationMember.kt")
         public void testTypeOfAnnotationMember() throws Exception {
             runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/typeOfAnnotationMember.kt");
         }
 
-        @TestMetadata("typeParametersInObject.kt")
-        public void testTypeParametersInObject() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/typeParametersInObject.kt");
-        }
-
         @TestMetadata("typeParametersInEnum.kt")
         public void testTypeParametersInEnum() throws Exception {
             runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/typeParametersInEnum.kt");
         }
 
+        @TestMetadata("typeParametersInObject.kt")
+        public void testTypeParametersInObject() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/typeParametersInObject.kt");
+        }
+
         @TestMetadata("upperBoundViolated.kt")
         public void testUpperBoundViolated() throws Exception {
             runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.kt");