diff --git a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/enum.fir.txt b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/enum.fir.txt
index 76aebf6029f..76e0c5910bf 100644
--- a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/enum.fir.txt
+++ b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/enum.fir.txt
@@ -21,6 +21,6 @@ FILE: enum.kt
         }
 
         public final static [BODY_RESOLVE] val entries: R|kotlin/enums/EnumEntries<Enum>|
-            public [BODY_RESOLVE] get(): R|kotlin/enums/EnumEntries<Enum>|
+            public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<Enum>|
 
     }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationParameters.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationParameters.txt
index af9e6722b96..9e0655433d5 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationParameters.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationParameters.txt
@@ -14,7 +14,7 @@ FILE: annotationParameters.kt
         }
 
         public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-            public [TYPES] get(): R|kotlin/enums/EnumEntries<X>|
+            public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<X>|
 
     }
     public? final? [RAW_FIR] annotation class Anno : R|kotlin/Annotation| {
@@ -52,7 +52,7 @@ FILE: annotationParameters.kt
         }
 
         public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-            public [TYPES] get(): R|kotlin/enums/EnumEntries<X>|
+            public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<X>|
 
     }
     public? final? [RAW_FIR] annotation class Anno : R|kotlin/Annotation| {
@@ -90,7 +90,7 @@ FILE: annotationParameters.kt
         }
 
         public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-            public [TYPES] get(): R|kotlin/enums/EnumEntries<X>|
+            public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<X>|
 
     }
     public? final? [RAW_FIR] annotation class Anno : R|kotlin/Annotation| {
@@ -128,7 +128,7 @@ FILE: annotationParameters.kt
         }
 
         public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-            public [TYPES] get(): R|kotlin/enums/EnumEntries<X>|
+            public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<X>|
 
     }
     public? final? [RAW_FIR] annotation class Anno : R|kotlin/Annotation| {
@@ -166,7 +166,7 @@ FILE: annotationParameters.kt
         }
 
         public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-            public [TYPES] get(): R|kotlin/enums/EnumEntries<X>|
+            public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<X>|
 
     }
     public? final? [RAW_FIR] annotation class Anno : R|kotlin/Annotation| {
@@ -204,7 +204,7 @@ FILE: annotationParameters.kt
         }
 
         public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-            public [TYPES] get(): R|kotlin/enums/EnumEntries<X>|
+            public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<X>|
 
     }
     public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| {
@@ -242,7 +242,7 @@ FILE: annotationParameters.kt
         }
 
         public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-            public [TYPES] get(): R|kotlin/enums/EnumEntries<X>|
+            public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<X>|
 
     }
     public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| {
@@ -280,7 +280,7 @@ FILE: annotationParameters.kt
         }
 
         public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-            public [BODY_RESOLVE] get(): R|kotlin/enums/EnumEntries<X>|
+            public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<X>|
 
     }
     public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| {
@@ -318,7 +318,7 @@ FILE: annotationParameters.kt
         }
 
         public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-            public [BODY_RESOLVE] get(): R|kotlin/enums/EnumEntries<X>|
+            public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<X>|
 
     }
     public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| {
@@ -357,7 +357,7 @@ FILE: annotationParameters.kt
         }
 
         public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-            public [BODY_RESOLVE] get(): R|kotlin/enums/EnumEntries<X>|
+            public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<X>|
 
     }
     public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| {
@@ -396,7 +396,7 @@ FILE: annotationParameters.kt
         }
 
         public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-            public [BODY_RESOLVE] get(): R|kotlin/enums/EnumEntries<X>|
+            public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<X>|
 
     }
     public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| {
@@ -435,7 +435,7 @@ FILE: annotationParameters.kt
         }
 
         public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-            public [BODY_RESOLVE] get(): R|kotlin/enums/EnumEntries<X>|
+            public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<X>|
 
     }
     public final [SUPER_TYPES] annotation class Anno : R|kotlin/Annotation| {
@@ -474,7 +474,7 @@ FILE: annotationParameters.kt
         }
 
         public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
-            public [BODY_RESOLVE] get(): R|kotlin/enums/EnumEntries<X>|
+            public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<X>|
 
     }
     public final [BODY_RESOLVE] annotation class Anno : R|kotlin/Annotation| {
diff --git a/compiler/testData/codegen/boxInline/anonymousObject/enumEntries/callSite.kt b/compiler/testData/codegen/boxInline/anonymousObject/enumEntries/callSite.kt
index 96b017ce18c..92f6b93a473 100644
--- a/compiler/testData/codegen/boxInline/anonymousObject/enumEntries/callSite.kt
+++ b/compiler/testData/codegen/boxInline/anonymousObject/enumEntries/callSite.kt
@@ -1,6 +1,5 @@
 // TARGET_BACKEND: JVM_IR
 // NO_CHECK_LAMBDA_INLINING
-// WITH_RUNTIME
 
 // WITH_STDLIB
 
diff --git a/compiler/testData/codegen/boxInline/anonymousObject/enumEntries/declSite.kt b/compiler/testData/codegen/boxInline/anonymousObject/enumEntries/declSite.kt
index e2e4edca174..8ab3dac639f 100644
--- a/compiler/testData/codegen/boxInline/anonymousObject/enumEntries/declSite.kt
+++ b/compiler/testData/codegen/boxInline/anonymousObject/enumEntries/declSite.kt
@@ -1,5 +1,4 @@
 // TARGET_BACKEND: JVM_IR
-// WITH_RUNTIME
 // WITH_STDLIB
 
 // MODULE: lib
diff --git a/compiler/testData/codegen/boxInline/anonymousObject/enumEntries/declSiteSeveralMappings.kt b/compiler/testData/codegen/boxInline/anonymousObject/enumEntries/declSiteSeveralMappings.kt
index 1640706fa1d..0ffc0276412 100644
--- a/compiler/testData/codegen/boxInline/anonymousObject/enumEntries/declSiteSeveralMappings.kt
+++ b/compiler/testData/codegen/boxInline/anonymousObject/enumEntries/declSiteSeveralMappings.kt
@@ -1,6 +1,5 @@
 // TARGET_BACKEND: JVM_IR
 
-// WITH_RUNTIME
 // WITH_STDLIB
 
 // MODULE: lib
diff --git a/compiler/testData/codegen/boxInline/anonymousObject/enumEntries/declSiteSeveralMappingsDifOrder.kt b/compiler/testData/codegen/boxInline/anonymousObject/enumEntries/declSiteSeveralMappingsDifOrder.kt
index d7adac3905d..cf67f36a774 100644
--- a/compiler/testData/codegen/boxInline/anonymousObject/enumEntries/declSiteSeveralMappingsDifOrder.kt
+++ b/compiler/testData/codegen/boxInline/anonymousObject/enumEntries/declSiteSeveralMappingsDifOrder.kt
@@ -1,6 +1,5 @@
 // TARGET_BACKEND: JVM_IR
 
-// WITH_RUNTIME
 // WITH_STDLIB
 
 // MODULE: lib
diff --git a/compiler/testData/diagnostics/testsWithStdLib/experimental/subClassOptInModality.txt b/compiler/testData/diagnostics/testsWithStdLib/experimental/subClassOptInModality.txt
index 3218e080b5a..66c9f11dadb 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/experimental/subClassOptInModality.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/experimental/subClassOptInModality.txt
@@ -45,6 +45,7 @@ public fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E1>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E1
     public final /*synthesized*/ fun values(): kotlin.Array<E1>
 }
@@ -64,6 +65,7 @@ public final enum class E2 : kotlin.Enum<E2> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E2>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E2
     public final /*synthesized*/ fun values(): kotlin.Array<E2>
 }
@@ -164,3 +166,4 @@ public final annotation class Simple : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt b/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
index 1e9e81cf08e..d78a74fbfbe 100644
--- a/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
@@ -264,7 +264,6 @@ enum class LanguageFeature(
     GenericInlineClassParameter(sinceVersion = KOTLIN_1_8, kind = UNSTABLE_FEATURE), // KT-32162
     DataObjects(KOTLIN_1_8), // KT-4107
     LightweightLambdas(KOTLIN_1_8, defaultState = State.DISABLED),
-    EnumEntries(KOTLIN_1_8, sinceApiVersion = ApiVersion.KOTLIN_1_8, defaultState = State.DISABLED), // KT-48872
 
     // 1.9
 
@@ -284,6 +283,7 @@ enum class LanguageFeature(
     SkipStandaloneScriptsInSourceRoots(KOTLIN_1_9, kind = OTHER), // KT-52525
     ModifierNonBuiltinSuspendFunError(KOTLIN_1_9),
     BreakContinueInInlineLambdas(KOTLIN_1_9, defaultState = State.ENABLED), // KT-1436
+    EnumEntries(KOTLIN_1_9, sinceApiVersion = ApiVersion.KOTLIN_1_8, defaultState = State.DISABLED), // KT-48872
 
     // Disabled for indefinite time. See KT-48535 and related discussion
     ApproximateIntegerLiteralTypesInReceiverPosition(sinceVersion = null),