diff --git a/compiler/fir/analysis-tests/legacy-fir-tests/tests-gen/org/jetbrains/kotlin/fir/FirLoadCompiledKotlinGenerated.java b/compiler/fir/analysis-tests/legacy-fir-tests/tests-gen/org/jetbrains/kotlin/fir/FirLoadCompiledKotlinGenerated.java
index eabe40a114f..9d2427317de 100644
--- a/compiler/fir/analysis-tests/legacy-fir-tests/tests-gen/org/jetbrains/kotlin/fir/FirLoadCompiledKotlinGenerated.java
+++ b/compiler/fir/analysis-tests/legacy-fir-tests/tests-gen/org/jetbrains/kotlin/fir/FirLoadCompiledKotlinGenerated.java
@@ -51,11 +51,6 @@ public class FirLoadCompiledKotlinGenerated extends AbstractFirLoadCompiledKotli
             runTest("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedMethod.kt");
         }
 
-        @TestMetadata("AnnotationInAnnotationArguments.kt")
-        public void testAnnotationInAnnotationArguments() throws Exception {
-            runTest("compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.kt");
-        }
-
         @TestMetadata("AnnotationInArray.kt")
         public void testAnnotationInArray() throws Exception {
             runTest("compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInArray.kt");
@@ -66,11 +61,6 @@ public class FirLoadCompiledKotlinGenerated extends AbstractFirLoadCompiledKotli
             runTest("compiler/testData/loadJava/compiledKotlin/annotations/ClassLiteralArguments.kt");
         }
 
-        @TestMetadata("EnumArgumentWithCustomToString.kt")
-        public void testEnumArgumentWithCustomToString() throws Exception {
-            runTest("compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.kt");
-        }
-
         @TestMetadata("MultiDimensionalArrayMethod.kt")
         public void testMultiDimensionalArrayMethod() throws Exception {
             runTest("compiler/testData/loadJava/compiledKotlin/annotations/MultiDimensionalArrayMethod.kt");
@@ -123,11 +113,6 @@ public class FirLoadCompiledKotlinGenerated extends AbstractFirLoadCompiledKotli
                 runTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.kt");
             }
 
-            @TestMetadata("EnumEntry.kt")
-            public void testEnumEntry() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumEntry.kt");
-            }
-
             @TestMetadata("Function.kt")
             public void testFunction() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.kt");
@@ -317,11 +302,6 @@ public class FirLoadCompiledKotlinGenerated extends AbstractFirLoadCompiledKotli
                 runTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.kt");
             }
 
-            @TestMetadata("EnumConstructor.kt")
-            public void testEnumConstructor() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.kt");
-            }
-
             @TestMetadata("ExtensionFunction.kt")
             public void testExtensionFunction() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.kt");
@@ -605,16 +585,6 @@ public class FirLoadCompiledKotlinGenerated extends AbstractFirLoadCompiledKotli
             runTest("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams2.kt");
         }
 
-        @TestMetadata("EnumWithGenericConstructorParameter.kt")
-        public void testEnumWithGenericConstructorParameter() throws Exception {
-            runTest("compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.kt");
-        }
-
-        @TestMetadata("EnumWithPrimitiveConstructorParameter.kt")
-        public void testEnumWithPrimitiveConstructorParameter() throws Exception {
-            runTest("compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.kt");
-        }
-
         @TestMetadata("FunInterface.kt")
         public void testFunInterface() throws Exception {
             runTest("compiler/testData/loadJava/compiledKotlin/class/FunInterface.kt");
@@ -1065,49 +1035,6 @@ public class FirLoadCompiledKotlinGenerated extends AbstractFirLoadCompiledKotli
         }
     }
 
-    @TestMetadata("compiler/testData/loadJava/compiledKotlin/enum")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Enum extends AbstractFirLoadCompiledKotlin {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInEnum() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/enum"), Pattern.compile("^(.+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("enumVisibility.kt")
-        public void testEnumVisibility() throws Exception {
-            runTest("compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.kt");
-        }
-
-        @TestMetadata("enumWithConstuctor.kt")
-        public void testEnumWithConstuctor() throws Exception {
-            runTest("compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.kt");
-        }
-
-        @TestMetadata("enumWithInnerClasses.kt")
-        public void testEnumWithInnerClasses() throws Exception {
-            runTest("compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.kt");
-        }
-
-        @TestMetadata("innerEnum.kt")
-        public void testInnerEnum() throws Exception {
-            runTest("compiler/testData/loadJava/compiledKotlin/enum/innerEnum.kt");
-        }
-
-        @TestMetadata("innerEnumExistingClassObject.kt")
-        public void testInnerEnumExistingClassObject() throws Exception {
-            runTest("compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.kt");
-        }
-
-        @TestMetadata("simpleEnum.kt")
-        public void testSimpleEnum() throws Exception {
-            runTest("compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.kt");
-        }
-    }
-
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -1175,11 +1102,6 @@ public class FirLoadCompiledKotlinGenerated extends AbstractFirLoadCompiledKotli
             runTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.kt");
         }
 
-        @TestMetadata("enum.kt")
-        public void testEnum() throws Exception {
-            runTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.kt");
-        }
-
         @TestMetadata("FieldAsVar.kt")
         public void testFieldAsVar() throws Exception {
             runTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldAsVar.kt");
@@ -2343,11 +2265,6 @@ public class FirLoadCompiledKotlinGenerated extends AbstractFirLoadCompiledKotli
             runTest("compiler/testData/loadJava/compiledKotlin/memberOrder/callablesNameClash.kt");
         }
 
-        @TestMetadata("enumEntries.kt")
-        public void testEnumEntries() throws Exception {
-            runTest("compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.kt");
-        }
-
         @TestMetadata("extensionMembers.kt")
         public void testExtensionMembers() throws Exception {
             runTest("compiler/testData/loadJava/compiledKotlin/memberOrder/extensionMembers.kt");
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.kt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/AnnotationInAnnotationArguments.kt
similarity index 100%
rename from compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.kt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/AnnotationInAnnotationArguments.kt
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/AnnotationInAnnotationArguments.txt
similarity index 93%
rename from compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.txt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/AnnotationInAnnotationArguments.txt
index 83c1c6e283a..66afe9b5cb7 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.txt
+++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/AnnotationInAnnotationArguments.txt
@@ -18,6 +18,8 @@ public final enum class E : kotlin.Enum<test.E> {
     public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<test.E!>!
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<test.E>
+        public final /*synthesized*/ fun `<get-entries>`(): kotlin.enums.EnumEntries<test.E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.E
     public final /*synthesized*/ fun values(): kotlin.Array<test.E>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.kt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/EnumArgumentWithCustomToString.kt
similarity index 100%
rename from compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.kt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/EnumArgumentWithCustomToString.kt
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/EnumArgumentWithCustomToString.txt
similarity index 91%
rename from compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/EnumArgumentWithCustomToString.txt
index 8b72a6d7485..c2379113d1b 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt
+++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/EnumArgumentWithCustomToString.txt
@@ -14,6 +14,8 @@ public final enum class E : kotlin.Enum<test.E> {
     public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<test.E!>!
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<test.E>
+        public final /*synthesized*/ fun `<get-entries>`(): kotlin.enums.EnumEntries<test.E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.E
     public final /*synthesized*/ fun values(): kotlin.Array<test.E>
 }
diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/WithUnsignedTypeParameters.kt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/WithUnsignedTypeParameters.kt
index fe597530f63..1e88a8641bf 100644
--- a/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/WithUnsignedTypeParameters.kt
+++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/WithUnsignedTypeParameters.kt
@@ -1,5 +1,3 @@
-// WITH_STDLIB
-
 package test
 
 @Target(AnnotationTarget.TYPE, AnnotationTarget.TYPE_PARAMETER)
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumEntry.kt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers/EnumEntry.kt
similarity index 100%
rename from compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumEntry.kt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers/EnumEntry.kt
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumEntry.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers/EnumEntry.txt
similarity index 90%
rename from compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumEntry.txt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers/EnumEntry.txt
index 6ae8ccf49ca..dc0dc741b9a 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumEntry.txt
+++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers/EnumEntry.txt
@@ -32,6 +32,8 @@ public final enum class Eee : kotlin.Enum<test.Eee> {
     public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<test.Eee!>!
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<test.Eee>
+        public final /*synthesized*/ fun `<get-entries>`(): kotlin.enums.EnumEntries<test.Eee>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Eee
     public final /*synthesized*/ fun values(): kotlin.Array<test.Eee>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.kt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/parameters/EnumConstructor.kt
similarity index 100%
rename from compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.kt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/parameters/EnumConstructor.kt
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/parameters/EnumConstructor.txt
similarity index 90%
rename from compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/parameters/EnumConstructor.txt
index ab46ab7d51b..556838c195b 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt
+++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/parameters/EnumConstructor.txt
@@ -24,6 +24,8 @@ public final enum class E : kotlin.Enum<test.E> {
     public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<test.E!>!
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<test.E>
+        public final /*synthesized*/ fun `<get-entries>`(): kotlin.enums.EnumEntries<test.E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.E
     public final /*synthesized*/ fun values(): kotlin.Array<test.E>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.kt b/compiler/testData/loadJava/compiledKotlinWithStdlib/class/EnumWithGenericConstructorParameter.kt
similarity index 100%
rename from compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.kt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/class/EnumWithGenericConstructorParameter.kt
diff --git a/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/class/EnumWithGenericConstructorParameter.txt
similarity index 85%
rename from compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/class/EnumWithGenericConstructorParameter.txt
index dde8550ff40..df0f0c8534b 100644
--- a/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt
+++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/class/EnumWithGenericConstructorParameter.txt
@@ -12,6 +12,8 @@ public final enum class EnumWithGenericConstructorParameter : kotlin.Enum<test.E
     public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<test.EnumWithGenericConstructorParameter!>!
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<test.EnumWithGenericConstructorParameter>
+        public final /*synthesized*/ fun `<get-entries>`(): kotlin.enums.EnumEntries<test.EnumWithGenericConstructorParameter>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumWithGenericConstructorParameter
     public final /*synthesized*/ fun values(): kotlin.Array<test.EnumWithGenericConstructorParameter>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.kt b/compiler/testData/loadJava/compiledKotlinWithStdlib/class/EnumWithPrimitiveConstructorParameter.kt
similarity index 100%
rename from compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.kt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/class/EnumWithPrimitiveConstructorParameter.kt
diff --git a/compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/class/EnumWithPrimitiveConstructorParameter.txt
similarity index 85%
rename from compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/class/EnumWithPrimitiveConstructorParameter.txt
index 250375ca1c1..7aa4b4f9485 100644
--- a/compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt
+++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/class/EnumWithPrimitiveConstructorParameter.txt
@@ -12,6 +12,8 @@ public final enum class EnumWithPrimitiveConstructorParameter : kotlin.Enum<test
     public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<test.EnumWithPrimitiveConstructorParameter!>!
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<test.EnumWithPrimitiveConstructorParameter>
+        public final /*synthesized*/ fun `<get-entries>`(): kotlin.enums.EnumEntries<test.EnumWithPrimitiveConstructorParameter>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumWithPrimitiveConstructorParameter
     public final /*synthesized*/ fun values(): kotlin.Array<test.EnumWithPrimitiveConstructorParameter>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.kt b/compiler/testData/loadJava/compiledKotlinWithStdlib/enum/enumVisibility.kt
similarity index 100%
rename from compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.kt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/enum/enumVisibility.kt
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/enum/enumVisibility.txt
similarity index 86%
rename from compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/enum/enumVisibility.txt
index 4503fc37a7b..80e1aff92d0 100644
--- a/compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt
+++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/enum/enumVisibility.txt
@@ -14,6 +14,8 @@ internal final enum class In : kotlin.Enum<test.In> {
     public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<test.In!>!
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<test.In>
+        public final /*synthesized*/ fun `<get-entries>`(): kotlin.enums.EnumEntries<test.In>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.In
     public final /*synthesized*/ fun values(): kotlin.Array<test.In>
 }
@@ -32,6 +34,8 @@ private final enum class Pr : kotlin.Enum<test.Pr> {
     public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<test.Pr!>!
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<test.Pr>
+        public final /*synthesized*/ fun `<get-entries>`(): kotlin.enums.EnumEntries<test.Pr>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Pr
     public final /*synthesized*/ fun values(): kotlin.Array<test.Pr>
 }
@@ -50,6 +54,8 @@ public final enum class Pu : kotlin.Enum<test.Pu> {
     public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<test.Pu!>!
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<test.Pu>
+        public final /*synthesized*/ fun `<get-entries>`(): kotlin.enums.EnumEntries<test.Pu>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Pu
     public final /*synthesized*/ fun values(): kotlin.Array<test.Pu>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.kt b/compiler/testData/loadJava/compiledKotlinWithStdlib/enum/enumWithConstuctor.kt
similarity index 100%
rename from compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.kt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/enum/enumWithConstuctor.kt
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/enum/enumWithConstuctor.txt
similarity index 89%
rename from compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.txt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/enum/enumWithConstuctor.txt
index 2248359c661..b4119289890 100644
--- a/compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.txt
+++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/enum/enumWithConstuctor.txt
@@ -22,6 +22,8 @@ public final enum class En : kotlin.Enum<test.En> {
     public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<test.En!>!
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<test.En>
+        public final /*synthesized*/ fun `<get-entries>`(): kotlin.enums.EnumEntries<test.En>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.En
     public final /*synthesized*/ fun values(): kotlin.Array<test.En>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.kt b/compiler/testData/loadJava/compiledKotlinWithStdlib/enum/enumWithInnerClasses.kt
similarity index 100%
rename from compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.kt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/enum/enumWithInnerClasses.kt
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/enum/enumWithInnerClasses.txt
similarity index 89%
rename from compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.txt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/enum/enumWithInnerClasses.txt
index 343b9b0de5f..9233f6d264f 100644
--- a/compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.txt
+++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/enum/enumWithInnerClasses.txt
@@ -30,6 +30,8 @@ public final enum class Enum : kotlin.Enum<test.Enum> {
     }
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<test.Enum>
+        public final /*synthesized*/ fun `<get-entries>`(): kotlin.enums.EnumEntries<test.Enum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Enum
     public final /*synthesized*/ fun values(): kotlin.Array<test.Enum>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/innerEnum.kt b/compiler/testData/loadJava/compiledKotlinWithStdlib/enum/innerEnum.kt
similarity index 100%
rename from compiler/testData/loadJava/compiledKotlin/enum/innerEnum.kt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/enum/innerEnum.kt
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/enum/innerEnum.txt
similarity index 87%
rename from compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/enum/innerEnum.txt
index 6b9919daae1..c7826d77498 100644
--- a/compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt
+++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/enum/innerEnum.txt
@@ -17,6 +17,8 @@ public final class A {
         public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<test.A.E!>!
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<test.A.E>
+            public final /*synthesized*/ fun `<get-entries>`(): kotlin.enums.EnumEntries<test.A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.A.E
         public final /*synthesized*/ fun values(): kotlin.Array<test.A.E>
     }
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.kt b/compiler/testData/loadJava/compiledKotlinWithStdlib/enum/innerEnumExistingClassObject.kt
similarity index 100%
rename from compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.kt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/enum/innerEnumExistingClassObject.kt
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/enum/innerEnumExistingClassObject.txt
similarity index 88%
rename from compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/enum/innerEnumExistingClassObject.txt
index 170341c86ce..1238f09213e 100644
--- a/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt
+++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/enum/innerEnumExistingClassObject.txt
@@ -21,6 +21,8 @@ public final class A {
         public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<test.A.E!>!
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<test.A.E>
+            public final /*synthesized*/ fun `<get-entries>`(): kotlin.enums.EnumEntries<test.A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.A.E
         public final /*synthesized*/ fun values(): kotlin.Array<test.A.E>
     }
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.kt b/compiler/testData/loadJava/compiledKotlinWithStdlib/enum/simpleEnum.kt
similarity index 100%
rename from compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.kt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/enum/simpleEnum.kt
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/enum/simpleEnum.txt
similarity index 86%
rename from compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/enum/simpleEnum.txt
index 7e5721bea50..84731da06ba 100644
--- a/compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt
+++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/enum/simpleEnum.txt
@@ -14,6 +14,8 @@ public final enum class MyEnum : kotlin.Enum<test.MyEnum> {
     public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<test.MyEnum!>!
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<test.MyEnum>
+        public final /*synthesized*/ fun `<get-entries>`(): kotlin.enums.EnumEntries<test.MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<test.MyEnum>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.kt b/compiler/testData/loadJava/compiledKotlinWithStdlib/fromLoadJava/enum.kt
similarity index 100%
rename from compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.kt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/fromLoadJava/enum.kt
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/fromLoadJava/enum.txt
similarity index 87%
rename from compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.txt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/fromLoadJava/enum.txt
index f9aedfb6bad..8487cca9625 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.txt
+++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/fromLoadJava/enum.txt
@@ -16,6 +16,8 @@ public final enum class Test : kotlin.Enum<test.Test> {
     public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<test.Test!>!
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<test.Test>
+        public final /*synthesized*/ fun `<get-entries>`(): kotlin.enums.EnumEntries<test.Test>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Test
     public final /*synthesized*/ fun values(): kotlin.Array<test.Test>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.kt b/compiler/testData/loadJava/compiledKotlinWithStdlib/memberOrder/enumEntries.kt
similarity index 100%
rename from compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.kt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/memberOrder/enumEntries.kt
diff --git a/compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/memberOrder/enumEntries.txt
similarity index 88%
rename from compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.txt
rename to compiler/testData/loadJava/compiledKotlinWithStdlib/memberOrder/enumEntries.txt
index 69cd367b6a5..4aff5c13ca2 100644
--- a/compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.txt
+++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/memberOrder/enumEntries.txt
@@ -28,6 +28,8 @@ public final enum class E : kotlin.Enum<test.E> {
     public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<test.E!>!
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<test.E>
+        public final /*synthesized*/ fun `<get-entries>`(): kotlin.enums.EnumEntries<test.E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.E
     public final /*synthesized*/ fun values(): kotlin.Array<test.E>
 }
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java
index 28bffe87a0b..565f5c83443 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java
@@ -1729,11 +1729,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 runTest("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedMethod.kt");
             }
 
-            @TestMetadata("AnnotationInAnnotationArguments.kt")
-            public void testAnnotationInAnnotationArguments() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.kt");
-            }
-
             @TestMetadata("AnnotationInArray.kt")
             public void testAnnotationInArray() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInArray.kt");
@@ -1744,11 +1739,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 runTest("compiler/testData/loadJava/compiledKotlin/annotations/ClassLiteralArguments.kt");
             }
 
-            @TestMetadata("EnumArgumentWithCustomToString.kt")
-            public void testEnumArgumentWithCustomToString() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.kt");
-            }
-
             @TestMetadata("MultiDimensionalArrayMethod.kt")
             public void testMultiDimensionalArrayMethod() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlin/annotations/MultiDimensionalArrayMethod.kt");
@@ -1801,11 +1791,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                     runTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.kt");
                 }
 
-                @TestMetadata("EnumEntry.kt")
-                public void testEnumEntry() throws Exception {
-                    runTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumEntry.kt");
-                }
-
                 @TestMetadata("Function.kt")
                 public void testFunction() throws Exception {
                     runTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.kt");
@@ -1995,11 +1980,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                     runTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.kt");
                 }
 
-                @TestMetadata("EnumConstructor.kt")
-                public void testEnumConstructor() throws Exception {
-                    runTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.kt");
-                }
-
                 @TestMetadata("ExtensionFunction.kt")
                 public void testExtensionFunction() throws Exception {
                     runTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.kt");
@@ -2283,16 +2263,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 runTest("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams2.kt");
             }
 
-            @TestMetadata("EnumWithGenericConstructorParameter.kt")
-            public void testEnumWithGenericConstructorParameter() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.kt");
-            }
-
-            @TestMetadata("EnumWithPrimitiveConstructorParameter.kt")
-            public void testEnumWithPrimitiveConstructorParameter() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.kt");
-            }
-
             @TestMetadata("FunInterface.kt")
             public void testFunInterface() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlin/class/FunInterface.kt");
@@ -2743,49 +2713,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             }
         }
 
-        @TestMetadata("compiler/testData/loadJava/compiledKotlin/enum")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Enum extends AbstractLoadJavaTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTestCompiledKotlin, this, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInEnum() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/enum"), Pattern.compile("^(.+)\\.kt$"), null, true);
-            }
-
-            @TestMetadata("enumVisibility.kt")
-            public void testEnumVisibility() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.kt");
-            }
-
-            @TestMetadata("enumWithConstuctor.kt")
-            public void testEnumWithConstuctor() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.kt");
-            }
-
-            @TestMetadata("enumWithInnerClasses.kt")
-            public void testEnumWithInnerClasses() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.kt");
-            }
-
-            @TestMetadata("innerEnum.kt")
-            public void testInnerEnum() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/enum/innerEnum.kt");
-            }
-
-            @TestMetadata("innerEnumExistingClassObject.kt")
-            public void testInnerEnumExistingClassObject() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.kt");
-            }
-
-            @TestMetadata("simpleEnum.kt")
-            public void testSimpleEnum() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.kt");
-            }
-        }
-
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
@@ -2853,11 +2780,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 runTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.kt");
             }
 
-            @TestMetadata("enum.kt")
-            public void testEnum() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.kt");
-            }
-
             @TestMetadata("FieldAsVar.kt")
             public void testFieldAsVar() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldAsVar.kt");
@@ -4021,11 +3943,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 runTest("compiler/testData/loadJava/compiledKotlin/memberOrder/callablesNameClash.kt");
             }
 
-            @TestMetadata("enumEntries.kt")
-            public void testEnumEntries() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.kt");
-            }
-
             @TestMetadata("extensionMembers.kt")
             public void testExtensionMembers() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlin/memberOrder/extensionMembers.kt");
@@ -4638,11 +4555,21 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations"), Pattern.compile("^(.+)\\.kt$"), null, true);
             }
 
+            @TestMetadata("AnnotationInAnnotationArguments.kt")
+            public void testAnnotationInAnnotationArguments() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/AnnotationInAnnotationArguments.kt");
+            }
+
             @TestMetadata("ConstValInMultifileClass.kt")
             public void testConstValInMultifileClass() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/ConstValInMultifileClass.kt");
             }
 
+            @TestMetadata("EnumArgumentWithCustomToString.kt")
+            public void testEnumArgumentWithCustomToString() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/EnumArgumentWithCustomToString.kt");
+            }
+
             @TestMetadata("JvmFieldInInterfaceCompanion.kt")
             public void testJvmFieldInInterfaceCompanion() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.kt");
@@ -4652,6 +4579,65 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             public void testWithUnsignedTypeParameters() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/WithUnsignedTypeParameters.kt");
             }
+
+            @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class ClassMembers extends AbstractLoadJavaTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest(this::doTestCompiledKotlinWithStdlib, this, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInClassMembers() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                }
+
+                @TestMetadata("EnumEntry.kt")
+                public void testEnumEntry() throws Exception {
+                    runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers/EnumEntry.kt");
+                }
+            }
+
+            @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/parameters")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Parameters extends AbstractLoadJavaTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest(this::doTestCompiledKotlinWithStdlib, this, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInParameters() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/parameters"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                }
+
+                @TestMetadata("EnumConstructor.kt")
+                public void testEnumConstructor() throws Exception {
+                    runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/parameters/EnumConstructor.kt");
+                }
+            }
+        }
+
+        @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/class")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Class extends AbstractLoadJavaTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestCompiledKotlinWithStdlib, this, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInClass() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/class"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            }
+
+            @TestMetadata("EnumWithGenericConstructorParameter.kt")
+            public void testEnumWithGenericConstructorParameter() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/class/EnumWithGenericConstructorParameter.kt");
+            }
+
+            @TestMetadata("EnumWithPrimitiveConstructorParameter.kt")
+            public void testEnumWithPrimitiveConstructorParameter() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/class/EnumWithPrimitiveConstructorParameter.kt");
+            }
         }
 
         @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/contracts")
@@ -4745,6 +4731,85 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             }
         }
 
+        @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/enum")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Enum extends AbstractLoadJavaTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestCompiledKotlinWithStdlib, this, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInEnum() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/enum"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            }
+
+            @TestMetadata("enumVisibility.kt")
+            public void testEnumVisibility() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/enum/enumVisibility.kt");
+            }
+
+            @TestMetadata("enumWithConstuctor.kt")
+            public void testEnumWithConstuctor() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/enum/enumWithConstuctor.kt");
+            }
+
+            @TestMetadata("enumWithInnerClasses.kt")
+            public void testEnumWithInnerClasses() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/enum/enumWithInnerClasses.kt");
+            }
+
+            @TestMetadata("innerEnum.kt")
+            public void testInnerEnum() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/enum/innerEnum.kt");
+            }
+
+            @TestMetadata("innerEnumExistingClassObject.kt")
+            public void testInnerEnumExistingClassObject() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/enum/innerEnumExistingClassObject.kt");
+            }
+
+            @TestMetadata("simpleEnum.kt")
+            public void testSimpleEnum() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/enum/simpleEnum.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/fromLoadJava")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class FromLoadJava extends AbstractLoadJavaTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestCompiledKotlinWithStdlib, this, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInFromLoadJava() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/fromLoadJava"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            }
+
+            @TestMetadata("enum.kt")
+            public void testEnum() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/fromLoadJava/enum.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/memberOrder")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class MemberOrder extends AbstractLoadJavaTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestCompiledKotlinWithStdlib, this, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInMemberOrder() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/memberOrder"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            }
+
+            @TestMetadata("enumEntries.kt")
+            public void testEnumEntries() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/memberOrder/enumEntries.kt");
+            }
+        }
+
         @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/mutability")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadKotlinWithTypeTableTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadKotlinWithTypeTableTestGenerated.java
index e89aa6dc572..06999b82332 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadKotlinWithTypeTableTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadKotlinWithTypeTableTestGenerated.java
@@ -51,11 +51,6 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith
             runTest("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedMethod.kt");
         }
 
-        @TestMetadata("AnnotationInAnnotationArguments.kt")
-        public void testAnnotationInAnnotationArguments() throws Exception {
-            runTest("compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.kt");
-        }
-
         @TestMetadata("AnnotationInArray.kt")
         public void testAnnotationInArray() throws Exception {
             runTest("compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInArray.kt");
@@ -66,11 +61,6 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith
             runTest("compiler/testData/loadJava/compiledKotlin/annotations/ClassLiteralArguments.kt");
         }
 
-        @TestMetadata("EnumArgumentWithCustomToString.kt")
-        public void testEnumArgumentWithCustomToString() throws Exception {
-            runTest("compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.kt");
-        }
-
         @TestMetadata("MultiDimensionalArrayMethod.kt")
         public void testMultiDimensionalArrayMethod() throws Exception {
             runTest("compiler/testData/loadJava/compiledKotlin/annotations/MultiDimensionalArrayMethod.kt");
@@ -123,11 +113,6 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith
                 runTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.kt");
             }
 
-            @TestMetadata("EnumEntry.kt")
-            public void testEnumEntry() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumEntry.kt");
-            }
-
             @TestMetadata("Function.kt")
             public void testFunction() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.kt");
@@ -317,11 +302,6 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith
                 runTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.kt");
             }
 
-            @TestMetadata("EnumConstructor.kt")
-            public void testEnumConstructor() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.kt");
-            }
-
             @TestMetadata("ExtensionFunction.kt")
             public void testExtensionFunction() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.kt");
@@ -605,16 +585,6 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith
             runTest("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams2.kt");
         }
 
-        @TestMetadata("EnumWithGenericConstructorParameter.kt")
-        public void testEnumWithGenericConstructorParameter() throws Exception {
-            runTest("compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.kt");
-        }
-
-        @TestMetadata("EnumWithPrimitiveConstructorParameter.kt")
-        public void testEnumWithPrimitiveConstructorParameter() throws Exception {
-            runTest("compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.kt");
-        }
-
         @TestMetadata("FunInterface.kt")
         public void testFunInterface() throws Exception {
             runTest("compiler/testData/loadJava/compiledKotlin/class/FunInterface.kt");
@@ -1065,49 +1035,6 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith
         }
     }
 
-    @TestMetadata("compiler/testData/loadJava/compiledKotlin/enum")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Enum extends AbstractLoadKotlinWithTypeTableTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInEnum() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/enum"), Pattern.compile("^(.+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("enumVisibility.kt")
-        public void testEnumVisibility() throws Exception {
-            runTest("compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.kt");
-        }
-
-        @TestMetadata("enumWithConstuctor.kt")
-        public void testEnumWithConstuctor() throws Exception {
-            runTest("compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.kt");
-        }
-
-        @TestMetadata("enumWithInnerClasses.kt")
-        public void testEnumWithInnerClasses() throws Exception {
-            runTest("compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.kt");
-        }
-
-        @TestMetadata("innerEnum.kt")
-        public void testInnerEnum() throws Exception {
-            runTest("compiler/testData/loadJava/compiledKotlin/enum/innerEnum.kt");
-        }
-
-        @TestMetadata("innerEnumExistingClassObject.kt")
-        public void testInnerEnumExistingClassObject() throws Exception {
-            runTest("compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.kt");
-        }
-
-        @TestMetadata("simpleEnum.kt")
-        public void testSimpleEnum() throws Exception {
-            runTest("compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.kt");
-        }
-    }
-
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -1175,11 +1102,6 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith
             runTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.kt");
         }
 
-        @TestMetadata("enum.kt")
-        public void testEnum() throws Exception {
-            runTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.kt");
-        }
-
         @TestMetadata("FieldAsVar.kt")
         public void testFieldAsVar() throws Exception {
             runTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldAsVar.kt");
@@ -2343,11 +2265,6 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith
             runTest("compiler/testData/loadJava/compiledKotlin/memberOrder/callablesNameClash.kt");
         }
 
-        @TestMetadata("enumEntries.kt")
-        public void testEnumEntries() throws Exception {
-            runTest("compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.kt");
-        }
-
         @TestMetadata("extensionMembers.kt")
         public void testExtensionMembers() throws Exception {
             runTest("compiler/testData/loadJava/compiledKotlin/memberOrder/extensionMembers.kt");
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/ir/IrLoadJavaTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/ir/IrLoadJavaTestGenerated.java
index 7d5dba0d2ab..4f536be54d3 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/ir/IrLoadJavaTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/ir/IrLoadJavaTestGenerated.java
@@ -1730,11 +1730,6 @@ public class IrLoadJavaTestGenerated extends AbstractIrLoadJavaTest {
                 runTest("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedMethod.kt");
             }
 
-            @TestMetadata("AnnotationInAnnotationArguments.kt")
-            public void testAnnotationInAnnotationArguments() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.kt");
-            }
-
             @TestMetadata("AnnotationInArray.kt")
             public void testAnnotationInArray() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInArray.kt");
@@ -1745,11 +1740,6 @@ public class IrLoadJavaTestGenerated extends AbstractIrLoadJavaTest {
                 runTest("compiler/testData/loadJava/compiledKotlin/annotations/ClassLiteralArguments.kt");
             }
 
-            @TestMetadata("EnumArgumentWithCustomToString.kt")
-            public void testEnumArgumentWithCustomToString() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.kt");
-            }
-
             @TestMetadata("MultiDimensionalArrayMethod.kt")
             public void testMultiDimensionalArrayMethod() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlin/annotations/MultiDimensionalArrayMethod.kt");
@@ -1802,11 +1792,6 @@ public class IrLoadJavaTestGenerated extends AbstractIrLoadJavaTest {
                     runTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.kt");
                 }
 
-                @TestMetadata("EnumEntry.kt")
-                public void testEnumEntry() throws Exception {
-                    runTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumEntry.kt");
-                }
-
                 @TestMetadata("Function.kt")
                 public void testFunction() throws Exception {
                     runTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.kt");
@@ -1996,11 +1981,6 @@ public class IrLoadJavaTestGenerated extends AbstractIrLoadJavaTest {
                     runTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.kt");
                 }
 
-                @TestMetadata("EnumConstructor.kt")
-                public void testEnumConstructor() throws Exception {
-                    runTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.kt");
-                }
-
                 @TestMetadata("ExtensionFunction.kt")
                 public void testExtensionFunction() throws Exception {
                     runTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.kt");
@@ -2284,16 +2264,6 @@ public class IrLoadJavaTestGenerated extends AbstractIrLoadJavaTest {
                 runTest("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams2.kt");
             }
 
-            @TestMetadata("EnumWithGenericConstructorParameter.kt")
-            public void testEnumWithGenericConstructorParameter() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.kt");
-            }
-
-            @TestMetadata("EnumWithPrimitiveConstructorParameter.kt")
-            public void testEnumWithPrimitiveConstructorParameter() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.kt");
-            }
-
             @TestMetadata("FunInterface.kt")
             public void testFunInterface() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlin/class/FunInterface.kt");
@@ -2744,49 +2714,6 @@ public class IrLoadJavaTestGenerated extends AbstractIrLoadJavaTest {
             }
         }
 
-        @TestMetadata("compiler/testData/loadJava/compiledKotlin/enum")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Enum extends AbstractIrLoadJavaTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTestCompiledKotlin, TargetBackend.JVM_IR, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInEnum() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/enum"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-            }
-
-            @TestMetadata("enumVisibility.kt")
-            public void testEnumVisibility() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.kt");
-            }
-
-            @TestMetadata("enumWithConstuctor.kt")
-            public void testEnumWithConstuctor() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.kt");
-            }
-
-            @TestMetadata("enumWithInnerClasses.kt")
-            public void testEnumWithInnerClasses() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.kt");
-            }
-
-            @TestMetadata("innerEnum.kt")
-            public void testInnerEnum() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/enum/innerEnum.kt");
-            }
-
-            @TestMetadata("innerEnumExistingClassObject.kt")
-            public void testInnerEnumExistingClassObject() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.kt");
-            }
-
-            @TestMetadata("simpleEnum.kt")
-            public void testSimpleEnum() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.kt");
-            }
-        }
-
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
@@ -2854,11 +2781,6 @@ public class IrLoadJavaTestGenerated extends AbstractIrLoadJavaTest {
                 runTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.kt");
             }
 
-            @TestMetadata("enum.kt")
-            public void testEnum() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.kt");
-            }
-
             @TestMetadata("FieldAsVar.kt")
             public void testFieldAsVar() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldAsVar.kt");
@@ -4022,11 +3944,6 @@ public class IrLoadJavaTestGenerated extends AbstractIrLoadJavaTest {
                 runTest("compiler/testData/loadJava/compiledKotlin/memberOrder/callablesNameClash.kt");
             }
 
-            @TestMetadata("enumEntries.kt")
-            public void testEnumEntries() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.kt");
-            }
-
             @TestMetadata("extensionMembers.kt")
             public void testExtensionMembers() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlin/memberOrder/extensionMembers.kt");
@@ -4639,11 +4556,21 @@ public class IrLoadJavaTestGenerated extends AbstractIrLoadJavaTest {
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
             }
 
+            @TestMetadata("AnnotationInAnnotationArguments.kt")
+            public void testAnnotationInAnnotationArguments() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/AnnotationInAnnotationArguments.kt");
+            }
+
             @TestMetadata("ConstValInMultifileClass.kt")
             public void testConstValInMultifileClass() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/ConstValInMultifileClass.kt");
             }
 
+            @TestMetadata("EnumArgumentWithCustomToString.kt")
+            public void testEnumArgumentWithCustomToString() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/EnumArgumentWithCustomToString.kt");
+            }
+
             @TestMetadata("JvmFieldInInterfaceCompanion.kt")
             public void testJvmFieldInInterfaceCompanion() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.kt");
@@ -4653,6 +4580,65 @@ public class IrLoadJavaTestGenerated extends AbstractIrLoadJavaTest {
             public void testWithUnsignedTypeParameters() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/WithUnsignedTypeParameters.kt");
             }
+
+            @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class ClassMembers extends AbstractIrLoadJavaTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest(this::doTestCompiledKotlinWithStdlib, TargetBackend.JVM_IR, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInClassMembers() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+                }
+
+                @TestMetadata("EnumEntry.kt")
+                public void testEnumEntry() throws Exception {
+                    runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers/EnumEntry.kt");
+                }
+            }
+
+            @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/parameters")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Parameters extends AbstractIrLoadJavaTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest(this::doTestCompiledKotlinWithStdlib, TargetBackend.JVM_IR, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInParameters() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/parameters"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+                }
+
+                @TestMetadata("EnumConstructor.kt")
+                public void testEnumConstructor() throws Exception {
+                    runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/parameters/EnumConstructor.kt");
+                }
+            }
+        }
+
+        @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/class")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Class extends AbstractIrLoadJavaTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestCompiledKotlinWithStdlib, TargetBackend.JVM_IR, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInClass() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/class"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            }
+
+            @TestMetadata("EnumWithGenericConstructorParameter.kt")
+            public void testEnumWithGenericConstructorParameter() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/class/EnumWithGenericConstructorParameter.kt");
+            }
+
+            @TestMetadata("EnumWithPrimitiveConstructorParameter.kt")
+            public void testEnumWithPrimitiveConstructorParameter() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/class/EnumWithPrimitiveConstructorParameter.kt");
+            }
         }
 
         @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/contracts")
@@ -4746,6 +4732,85 @@ public class IrLoadJavaTestGenerated extends AbstractIrLoadJavaTest {
             }
         }
 
+        @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/enum")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Enum extends AbstractIrLoadJavaTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestCompiledKotlinWithStdlib, TargetBackend.JVM_IR, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInEnum() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/enum"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            }
+
+            @TestMetadata("enumVisibility.kt")
+            public void testEnumVisibility() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/enum/enumVisibility.kt");
+            }
+
+            @TestMetadata("enumWithConstuctor.kt")
+            public void testEnumWithConstuctor() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/enum/enumWithConstuctor.kt");
+            }
+
+            @TestMetadata("enumWithInnerClasses.kt")
+            public void testEnumWithInnerClasses() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/enum/enumWithInnerClasses.kt");
+            }
+
+            @TestMetadata("innerEnum.kt")
+            public void testInnerEnum() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/enum/innerEnum.kt");
+            }
+
+            @TestMetadata("innerEnumExistingClassObject.kt")
+            public void testInnerEnumExistingClassObject() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/enum/innerEnumExistingClassObject.kt");
+            }
+
+            @TestMetadata("simpleEnum.kt")
+            public void testSimpleEnum() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/enum/simpleEnum.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/fromLoadJava")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class FromLoadJava extends AbstractIrLoadJavaTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestCompiledKotlinWithStdlib, TargetBackend.JVM_IR, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInFromLoadJava() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/fromLoadJava"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            }
+
+            @TestMetadata("enum.kt")
+            public void testEnum() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/fromLoadJava/enum.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/memberOrder")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class MemberOrder extends AbstractIrLoadJavaTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestCompiledKotlinWithStdlib, TargetBackend.JVM_IR, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInMemberOrder() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/memberOrder"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            }
+
+            @TestMetadata("enumEntries.kt")
+            public void testEnumEntries() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/memberOrder/enumEntries.kt");
+            }
+        }
+
         @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/mutability")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/javac/LoadJavaUsingJavacTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/javac/LoadJavaUsingJavacTestGenerated.java
index 7e312279db8..335830f1390 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/javac/LoadJavaUsingJavacTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/javac/LoadJavaUsingJavacTestGenerated.java
@@ -1729,11 +1729,6 @@ public class LoadJavaUsingJavacTestGenerated extends AbstractLoadJavaUsingJavacT
                 runTest("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedMethod.kt");
             }
 
-            @TestMetadata("AnnotationInAnnotationArguments.kt")
-            public void testAnnotationInAnnotationArguments() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.kt");
-            }
-
             @TestMetadata("AnnotationInArray.kt")
             public void testAnnotationInArray() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInArray.kt");
@@ -1744,11 +1739,6 @@ public class LoadJavaUsingJavacTestGenerated extends AbstractLoadJavaUsingJavacT
                 runTest("compiler/testData/loadJava/compiledKotlin/annotations/ClassLiteralArguments.kt");
             }
 
-            @TestMetadata("EnumArgumentWithCustomToString.kt")
-            public void testEnumArgumentWithCustomToString() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.kt");
-            }
-
             @TestMetadata("MultiDimensionalArrayMethod.kt")
             public void testMultiDimensionalArrayMethod() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlin/annotations/MultiDimensionalArrayMethod.kt");
@@ -1801,11 +1791,6 @@ public class LoadJavaUsingJavacTestGenerated extends AbstractLoadJavaUsingJavacT
                     runTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.kt");
                 }
 
-                @TestMetadata("EnumEntry.kt")
-                public void testEnumEntry() throws Exception {
-                    runTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumEntry.kt");
-                }
-
                 @TestMetadata("Function.kt")
                 public void testFunction() throws Exception {
                     runTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.kt");
@@ -1995,11 +1980,6 @@ public class LoadJavaUsingJavacTestGenerated extends AbstractLoadJavaUsingJavacT
                     runTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.kt");
                 }
 
-                @TestMetadata("EnumConstructor.kt")
-                public void testEnumConstructor() throws Exception {
-                    runTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.kt");
-                }
-
                 @TestMetadata("ExtensionFunction.kt")
                 public void testExtensionFunction() throws Exception {
                     runTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.kt");
@@ -2283,16 +2263,6 @@ public class LoadJavaUsingJavacTestGenerated extends AbstractLoadJavaUsingJavacT
                 runTest("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams2.kt");
             }
 
-            @TestMetadata("EnumWithGenericConstructorParameter.kt")
-            public void testEnumWithGenericConstructorParameter() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.kt");
-            }
-
-            @TestMetadata("EnumWithPrimitiveConstructorParameter.kt")
-            public void testEnumWithPrimitiveConstructorParameter() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.kt");
-            }
-
             @TestMetadata("FunInterface.kt")
             public void testFunInterface() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlin/class/FunInterface.kt");
@@ -2743,49 +2713,6 @@ public class LoadJavaUsingJavacTestGenerated extends AbstractLoadJavaUsingJavacT
             }
         }
 
-        @TestMetadata("compiler/testData/loadJava/compiledKotlin/enum")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Enum extends AbstractLoadJavaUsingJavacTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTestCompiledKotlin, this, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInEnum() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/enum"), Pattern.compile("^(.+)\\.kt$"), null, true);
-            }
-
-            @TestMetadata("enumVisibility.kt")
-            public void testEnumVisibility() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.kt");
-            }
-
-            @TestMetadata("enumWithConstuctor.kt")
-            public void testEnumWithConstuctor() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.kt");
-            }
-
-            @TestMetadata("enumWithInnerClasses.kt")
-            public void testEnumWithInnerClasses() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.kt");
-            }
-
-            @TestMetadata("innerEnum.kt")
-            public void testInnerEnum() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/enum/innerEnum.kt");
-            }
-
-            @TestMetadata("innerEnumExistingClassObject.kt")
-            public void testInnerEnumExistingClassObject() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.kt");
-            }
-
-            @TestMetadata("simpleEnum.kt")
-            public void testSimpleEnum() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.kt");
-            }
-        }
-
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
@@ -2853,11 +2780,6 @@ public class LoadJavaUsingJavacTestGenerated extends AbstractLoadJavaUsingJavacT
                 runTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.kt");
             }
 
-            @TestMetadata("enum.kt")
-            public void testEnum() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.kt");
-            }
-
             @TestMetadata("FieldAsVar.kt")
             public void testFieldAsVar() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldAsVar.kt");
@@ -4021,11 +3943,6 @@ public class LoadJavaUsingJavacTestGenerated extends AbstractLoadJavaUsingJavacT
                 runTest("compiler/testData/loadJava/compiledKotlin/memberOrder/callablesNameClash.kt");
             }
 
-            @TestMetadata("enumEntries.kt")
-            public void testEnumEntries() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.kt");
-            }
-
             @TestMetadata("extensionMembers.kt")
             public void testExtensionMembers() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlin/memberOrder/extensionMembers.kt");
@@ -4638,11 +4555,21 @@ public class LoadJavaUsingJavacTestGenerated extends AbstractLoadJavaUsingJavacT
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations"), Pattern.compile("^(.+)\\.kt$"), null, true);
             }
 
+            @TestMetadata("AnnotationInAnnotationArguments.kt")
+            public void testAnnotationInAnnotationArguments() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/AnnotationInAnnotationArguments.kt");
+            }
+
             @TestMetadata("ConstValInMultifileClass.kt")
             public void testConstValInMultifileClass() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/ConstValInMultifileClass.kt");
             }
 
+            @TestMetadata("EnumArgumentWithCustomToString.kt")
+            public void testEnumArgumentWithCustomToString() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/EnumArgumentWithCustomToString.kt");
+            }
+
             @TestMetadata("JvmFieldInInterfaceCompanion.kt")
             public void testJvmFieldInInterfaceCompanion() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.kt");
@@ -4652,6 +4579,65 @@ public class LoadJavaUsingJavacTestGenerated extends AbstractLoadJavaUsingJavacT
             public void testWithUnsignedTypeParameters() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/WithUnsignedTypeParameters.kt");
             }
+
+            @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class ClassMembers extends AbstractLoadJavaUsingJavacTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest(this::doTestCompiledKotlinWithStdlib, this, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInClassMembers() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                }
+
+                @TestMetadata("EnumEntry.kt")
+                public void testEnumEntry() throws Exception {
+                    runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers/EnumEntry.kt");
+                }
+            }
+
+            @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/parameters")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Parameters extends AbstractLoadJavaUsingJavacTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest(this::doTestCompiledKotlinWithStdlib, this, testDataFilePath);
+                }
+
+                public void testAllFilesPresentInParameters() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/parameters"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                }
+
+                @TestMetadata("EnumConstructor.kt")
+                public void testEnumConstructor() throws Exception {
+                    runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/parameters/EnumConstructor.kt");
+                }
+            }
+        }
+
+        @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/class")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Class extends AbstractLoadJavaUsingJavacTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestCompiledKotlinWithStdlib, this, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInClass() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/class"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            }
+
+            @TestMetadata("EnumWithGenericConstructorParameter.kt")
+            public void testEnumWithGenericConstructorParameter() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/class/EnumWithGenericConstructorParameter.kt");
+            }
+
+            @TestMetadata("EnumWithPrimitiveConstructorParameter.kt")
+            public void testEnumWithPrimitiveConstructorParameter() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/class/EnumWithPrimitiveConstructorParameter.kt");
+            }
         }
 
         @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/contracts")
@@ -4745,6 +4731,85 @@ public class LoadJavaUsingJavacTestGenerated extends AbstractLoadJavaUsingJavacT
             }
         }
 
+        @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/enum")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Enum extends AbstractLoadJavaUsingJavacTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestCompiledKotlinWithStdlib, this, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInEnum() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/enum"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            }
+
+            @TestMetadata("enumVisibility.kt")
+            public void testEnumVisibility() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/enum/enumVisibility.kt");
+            }
+
+            @TestMetadata("enumWithConstuctor.kt")
+            public void testEnumWithConstuctor() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/enum/enumWithConstuctor.kt");
+            }
+
+            @TestMetadata("enumWithInnerClasses.kt")
+            public void testEnumWithInnerClasses() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/enum/enumWithInnerClasses.kt");
+            }
+
+            @TestMetadata("innerEnum.kt")
+            public void testInnerEnum() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/enum/innerEnum.kt");
+            }
+
+            @TestMetadata("innerEnumExistingClassObject.kt")
+            public void testInnerEnumExistingClassObject() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/enum/innerEnumExistingClassObject.kt");
+            }
+
+            @TestMetadata("simpleEnum.kt")
+            public void testSimpleEnum() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/enum/simpleEnum.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/fromLoadJava")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class FromLoadJava extends AbstractLoadJavaUsingJavacTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestCompiledKotlinWithStdlib, this, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInFromLoadJava() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/fromLoadJava"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            }
+
+            @TestMetadata("enum.kt")
+            public void testEnum() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/fromLoadJava/enum.kt");
+            }
+        }
+
+        @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/memberOrder")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class MemberOrder extends AbstractLoadJavaUsingJavacTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestCompiledKotlinWithStdlib, this, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInMemberOrder() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/memberOrder"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            }
+
+            @TestMetadata("enumEntries.kt")
+            public void testEnumEntries() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlinWithStdlib/memberOrder/enumEntries.kt");
+            }
+        }
+
         @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/mutability")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
diff --git a/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/JvmRuntimeDescriptorLoaderTestGenerated.java b/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/JvmRuntimeDescriptorLoaderTestGenerated.java
index 4ede0a52c87..f265a5e0f6d 100644
--- a/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/JvmRuntimeDescriptorLoaderTestGenerated.java
+++ b/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/JvmRuntimeDescriptorLoaderTestGenerated.java
@@ -53,11 +53,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD
                 runTest("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedMethod.kt");
             }
 
-            @TestMetadata("AnnotationInAnnotationArguments.kt")
-            public void testAnnotationInAnnotationArguments() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.kt");
-            }
-
             @TestMetadata("AnnotationInArray.kt")
             public void testAnnotationInArray() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInArray.kt");
@@ -68,11 +63,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD
                 runTest("compiler/testData/loadJava/compiledKotlin/annotations/ClassLiteralArguments.kt");
             }
 
-            @TestMetadata("EnumArgumentWithCustomToString.kt")
-            public void testEnumArgumentWithCustomToString() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.kt");
-            }
-
             @TestMetadata("MultiDimensionalArrayMethod.kt")
             public void testMultiDimensionalArrayMethod() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlin/annotations/MultiDimensionalArrayMethod.kt");
@@ -125,11 +115,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD
                     runTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.kt");
                 }
 
-                @TestMetadata("EnumEntry.kt")
-                public void testEnumEntry() throws Exception {
-                    runTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumEntry.kt");
-                }
-
                 @TestMetadata("Function.kt")
                 public void testFunction() throws Exception {
                     runTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.kt");
@@ -319,11 +304,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD
                     runTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.kt");
                 }
 
-                @TestMetadata("EnumConstructor.kt")
-                public void testEnumConstructor() throws Exception {
-                    runTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.kt");
-                }
-
                 @TestMetadata("ExtensionFunction.kt")
                 public void testExtensionFunction() throws Exception {
                     runTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.kt");
@@ -607,16 +587,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD
                 runTest("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams2.kt");
             }
 
-            @TestMetadata("EnumWithGenericConstructorParameter.kt")
-            public void testEnumWithGenericConstructorParameter() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.kt");
-            }
-
-            @TestMetadata("EnumWithPrimitiveConstructorParameter.kt")
-            public void testEnumWithPrimitiveConstructorParameter() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.kt");
-            }
-
             @TestMetadata("FunInterface.kt")
             public void testFunInterface() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlin/class/FunInterface.kt");
@@ -1067,49 +1037,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD
             }
         }
 
-        @TestMetadata("compiler/testData/loadJava/compiledKotlin/enum")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Enum extends AbstractJvmRuntimeDescriptorLoaderTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInEnum() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/enum"), Pattern.compile("^(.+)\\.kt$"), null, true);
-            }
-
-            @TestMetadata("enumVisibility.kt")
-            public void testEnumVisibility() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.kt");
-            }
-
-            @TestMetadata("enumWithConstuctor.kt")
-            public void testEnumWithConstuctor() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.kt");
-            }
-
-            @TestMetadata("enumWithInnerClasses.kt")
-            public void testEnumWithInnerClasses() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.kt");
-            }
-
-            @TestMetadata("innerEnum.kt")
-            public void testInnerEnum() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/enum/innerEnum.kt");
-            }
-
-            @TestMetadata("innerEnumExistingClassObject.kt")
-            public void testInnerEnumExistingClassObject() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.kt");
-            }
-
-            @TestMetadata("simpleEnum.kt")
-            public void testSimpleEnum() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.kt");
-            }
-        }
-
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
@@ -1177,11 +1104,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD
                 runTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.kt");
             }
 
-            @TestMetadata("enum.kt")
-            public void testEnum() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.kt");
-            }
-
             @TestMetadata("FieldAsVar.kt")
             public void testFieldAsVar() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldAsVar.kt");
@@ -2345,11 +2267,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD
                 runTest("compiler/testData/loadJava/compiledKotlin/memberOrder/callablesNameClash.kt");
             }
 
-            @TestMetadata("enumEntries.kt")
-            public void testEnumEntries() throws Exception {
-                runTest("compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.kt");
-            }
-
             @TestMetadata("extensionMembers.kt")
             public void testExtensionMembers() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlin/memberOrder/extensionMembers.kt");