diff --git a/src/class-fields/computed-name-referenceerror.case b/src/class-fields/computed-name-referenceerror.case
index 6717a2889e..d2d628f297 100644
--- a/src/class-fields/computed-name-referenceerror.case
+++ b/src/class-fields/computed-name-referenceerror.case
@@ -37,7 +37,7 @@ info: |
   2. Let propName be ? GetValue(exprValue).
   3. Return ? ToPropertyKey(propName).
 template: class-evaluation-error
-features: [computed-property-names]
+features: [class-fields-public, computed-property-names]
 ---*/
 
 //- setup
diff --git a/src/class-fields/computed-name-toprimitive-err.case b/src/class-fields/computed-name-toprimitive-err.case
index 026d93f78b..6c0301f613 100644
--- a/src/class-fields/computed-name-toprimitive-err.case
+++ b/src/class-fields/computed-name-toprimitive-err.case
@@ -37,7 +37,7 @@ info: |
   2. Let propName be ? GetValue(exprValue).
   3. Return ? ToPropertyKey(propName).
 template: class-evaluation-error
-features: [computed-property-names, Symbol.toPrimitive]
+features: [class-fields-public, computed-property-names, Symbol.toPrimitive]
 ---*/
 
 //- setup
diff --git a/src/class-fields/computed-name-toprimitive-returns-noncallable.case b/src/class-fields/computed-name-toprimitive-returns-noncallable.case
index 0a45416bae..304011abd8 100644
--- a/src/class-fields/computed-name-toprimitive-returns-noncallable.case
+++ b/src/class-fields/computed-name-toprimitive-returns-noncallable.case
@@ -37,7 +37,7 @@ info: |
   2. Let propName be ? GetValue(exprValue).
   3. Return ? ToPropertyKey(propName).
 template: class-evaluation-error
-features: [computed-property-names, Symbol.toPrimitive]
+features: [class-fields-public, computed-property-names, Symbol.toPrimitive]
 ---*/
 
 //- setup
diff --git a/src/class-fields/computed-name-toprimitive-returns-nonobject.case b/src/class-fields/computed-name-toprimitive-returns-nonobject.case
index eae5ce14e6..daddfa510e 100644
--- a/src/class-fields/computed-name-toprimitive-returns-nonobject.case
+++ b/src/class-fields/computed-name-toprimitive-returns-nonobject.case
@@ -37,7 +37,7 @@ info: |
   2. Let propName be ? GetValue(exprValue).
   3. Return ? ToPropertyKey(propName).
 template: class-evaluation-error
-features: [computed-property-names, Symbol.toPrimitive]
+features: [class-fields-public, computed-property-names, Symbol.toPrimitive]
 ---*/
 
 //- setup
diff --git a/src/class-fields/computed-name-toprimitive-symbol.case b/src/class-fields/computed-name-toprimitive-symbol.case
index 708cbd62b1..84b1d59eb4 100644
--- a/src/class-fields/computed-name-toprimitive-symbol.case
+++ b/src/class-fields/computed-name-toprimitive-symbol.case
@@ -37,7 +37,7 @@ info: |
   2. Let propName be ? GetValue(exprValue).
   3. Return ? ToPropertyKey(propName).
 template: default
-features: [computed-property-names, Symbol.toPrimitive, Symbol]
+features: [class-fields-public, computed-property-names, Symbol.toPrimitive, Symbol]
 includes: [propertyHelper.js]
 ---*/
 
diff --git a/src/class-fields/computed-name-toprimitive.case b/src/class-fields/computed-name-toprimitive.case
index 025e158f0d..5a9e5ca60b 100644
--- a/src/class-fields/computed-name-toprimitive.case
+++ b/src/class-fields/computed-name-toprimitive.case
@@ -37,7 +37,7 @@ info: |
   2. Let propName be ? GetValue(exprValue).
   3. Return ? ToPropertyKey(propName).
 template: default
-features: [computed-property-names, Symbol.toPrimitive]
+features: [class-fields-public, computed-property-names, Symbol.toPrimitive]
 includes: [propertyHelper.js]
 ---*/
 
diff --git a/src/class-fields/computed-name-tostring-err.case b/src/class-fields/computed-name-tostring-err.case
index fd3c6949d2..06b314a603 100644
--- a/src/class-fields/computed-name-tostring-err.case
+++ b/src/class-fields/computed-name-tostring-err.case
@@ -37,7 +37,7 @@ info: |
   2. Let propName be ? GetValue(exprValue).
   3. Return ? ToPropertyKey(propName).
 template: class-evaluation-error
-features: [computed-property-names]
+features: [class-fields-public, computed-property-names]
 ---*/
 
 //- setup
diff --git a/src/class-fields/computed-name-valueof-err.case b/src/class-fields/computed-name-valueof-err.case
index f91cca77bf..5b53d1d170 100644
--- a/src/class-fields/computed-name-valueof-err.case
+++ b/src/class-fields/computed-name-valueof-err.case
@@ -37,7 +37,7 @@ info: |
   2. Let propName be ? GetValue(exprValue).
   3. Return ? ToPropertyKey(propName).
 template: class-evaluation-error
-features: [computed-property-names]
+features: [class-fields-public, computed-property-names]
 ---*/
 
 //- setup
diff --git a/src/class-fields/computed-names.case b/src/class-fields/computed-names.case
index 318b5b5ada..835db98a17 100644
--- a/src/class-fields/computed-names.case
+++ b/src/class-fields/computed-names.case
@@ -15,7 +15,7 @@ info: |
     PropertyName
 template: productions
 includes: [propertyHelper.js]
-features: [computed-property-names]
+features: [class-fields-public, computed-property-names]
 ---*/
 
 //- setup
diff --git a/src/class-fields/computed-symbol-names.case b/src/class-fields/computed-symbol-names.case
index 106bdc4b14..17aa16dda3 100644
--- a/src/class-fields/computed-symbol-names.case
+++ b/src/class-fields/computed-symbol-names.case
@@ -15,7 +15,7 @@ info: |
     PropertyName
 template: productions
 includes: [propertyHelper.js]
-features: [Symbol, computed-property-names]
+features: [class-fields-public, Symbol, computed-property-names]
 ---*/
 
 //- setup
diff --git a/src/class-fields/ctor-called-after-fields-init.case b/src/class-fields/ctor-called-after-fields-init.case
index 4ab2253926..d091d8c5e2 100644
--- a/src/class-fields/ctor-called-after-fields-init.case
+++ b/src/class-fields/ctor-called-after-fields-init.case
@@ -14,6 +14,7 @@ info: |
   11. Let result be OrdinaryCallEvaluateBody(F, argumentsList).
   ...
 template: default
+features: [class-fields-public]
 ---*/
 
 //- setup
diff --git a/src/class-fields/init-err-evaluation.case b/src/class-fields/init-err-evaluation.case
index caac1c029d..db17e76674 100644
--- a/src/class-fields/init-err-evaluation.case
+++ b/src/class-fields/init-err-evaluation.case
@@ -14,6 +14,7 @@ info: |
   11. Let result be OrdinaryCallEvaluateBody(F, argumentsList).
   ...
 template: default
+features: [class-fields-public]
 ---*/
 
 //- setup
diff --git a/src/class-fields/init-value-defined-after-class.case b/src/class-fields/init-value-defined-after-class.case
index 51c754c783..d742d14280 100644
--- a/src/class-fields/init-value-defined-after-class.case
+++ b/src/class-fields/init-value-defined-after-class.case
@@ -14,7 +14,7 @@ info: |
   11. Let result be OrdinaryCallEvaluateBody(F, argumentsList).
   ...
 template: default
-features: [computed-property-names]
+features: [class-fields-public, computed-property-names]
 includes: [propertyHelper.js]
 ---*/
 
diff --git a/src/class-fields/init-value-incremental.case b/src/class-fields/init-value-incremental.case
index 2a1ce00886..84fd4c9a25 100644
--- a/src/class-fields/init-value-incremental.case
+++ b/src/class-fields/init-value-incremental.case
@@ -23,7 +23,7 @@ info: |
   11. Let result be OrdinaryCallEvaluateBody(F, argumentsList).
   ...
 template: default
-features: [computed-property-names]
+features: [class-fields-public, computed-property-names]
 includes: [propertyHelper.js]
 ---*/
 
diff --git a/src/class-fields/initializer-error/cls-decl-fields-comp-name.template b/src/class-fields/initializer-error/cls-decl-fields-comp-name.template
index 0bdf663715..555c8abd7e 100644
--- a/src/class-fields/initializer-error/cls-decl-fields-comp-name.template
+++ b/src/class-fields/initializer-error/cls-decl-fields-comp-name.template
@@ -5,7 +5,7 @@
 esid: sec-class-definitions-static-semantics-early-errors
 path: language/statements/class/fields-comp-name-
 name: computed ClassElementName
-features: [class, class-fields-public]
+features: [class, class-fields-public, computed-property-names]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/src/class-fields/initializer-error/cls-decl-fields-static-comp-name.template b/src/class-fields/initializer-error/cls-decl-fields-static-comp-name.template
index fe3e30a682..48b35370d8 100644
--- a/src/class-fields/initializer-error/cls-decl-fields-static-comp-name.template
+++ b/src/class-fields/initializer-error/cls-decl-fields-static-comp-name.template
@@ -5,7 +5,7 @@
 esid: sec-class-definitions-static-semantics-early-errors
 path: language/statements/class/fields-static-comp-name-
 name: static computed ClassElementName
-features: [class, class-static-fields-public]
+features: [class, class-static-fields-public, computed-property-names]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/src/class-fields/initializer-error/cls-expr-fields-static-comp-name.template b/src/class-fields/initializer-error/cls-expr-fields-static-comp-name.template
index 2ad6b7b348..dc2a9bf3ac 100644
--- a/src/class-fields/initializer-error/cls-expr-fields-static-comp-name.template
+++ b/src/class-fields/initializer-error/cls-expr-fields-static-comp-name.template
@@ -5,7 +5,7 @@
 esid: sec-class-definitions-static-semantics-early-errors
 path: language/expressions/class/fields-static-comp-name-
 name: static computed ClassElementName
-features: [class, class-static-fields-public]
+features: [class, class-static-fields-public, computed-property-names]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/src/class-fields/initializer-eval-super-property/cls-decl-fields-indirect-eval.template b/src/class-fields/initializer-eval-super-property/cls-decl-fields-indirect-eval.template
index ad0bf241de..f521f89829 100644
--- a/src/class-fields/initializer-eval-super-property/cls-decl-fields-indirect-eval.template
+++ b/src/class-fields/initializer-eval-super-property/cls-decl-fields-indirect-eval.template
@@ -5,6 +5,7 @@
 esid: sec-performeval-rules-in-initializer
 path: language/statements/class/fields-derived-cls-indirect-
 name: indirect eval
+features: [class, class-fields-public]
 ---*/
 
 var executed = false;
diff --git a/src/class-fields/initializer-eval-super-property/cls-decl-private-fields-eval.template b/src/class-fields/initializer-eval-super-property/cls-decl-private-fields-eval.template
index 7934a034f0..b50d046983 100644
--- a/src/class-fields/initializer-eval-super-property/cls-decl-private-fields-eval.template
+++ b/src/class-fields/initializer-eval-super-property/cls-decl-private-fields-eval.template
@@ -5,6 +5,7 @@
 esid: sec-performeval-rules-in-initializer
 path: language/statements/class/fields-private-derived-cls-direct-
 name: direct eval
+features: [class, class-fields-private]
 ---*/
 
 var executed = false;
diff --git a/src/class-fields/initializer-eval-super-property/cls-decl-private-fields-indirect-eval.template b/src/class-fields/initializer-eval-super-property/cls-decl-private-fields-indirect-eval.template
index cc49df82ab..68fb2ca06f 100644
--- a/src/class-fields/initializer-eval-super-property/cls-decl-private-fields-indirect-eval.template
+++ b/src/class-fields/initializer-eval-super-property/cls-decl-private-fields-indirect-eval.template
@@ -5,6 +5,7 @@
 esid: sec-performeval-rules-in-initializer
 path: language/statements/class/fields-private-derived-cls-indirect-
 name: indirect eval
+features: [class, class-fields-private]
 ---*/
 
 var executed = false;
diff --git a/src/class-fields/initializer-eval-super-property/cls-expr-fields-eval.template b/src/class-fields/initializer-eval-super-property/cls-expr-fields-eval.template
index 61bb0eeb75..c25cb861f5 100644
--- a/src/class-fields/initializer-eval-super-property/cls-expr-fields-eval.template
+++ b/src/class-fields/initializer-eval-super-property/cls-expr-fields-eval.template
@@ -5,6 +5,7 @@
 esid: sec-performeval-rules-in-initializer
 path: language/expressions/class/fields-derived-cls-direct-
 name: direct eval
+features: [class, class-fields-public]
 ---*/
 
 var executed = false;
diff --git a/src/class-fields/initializer-eval-super-property/cls-expr-fields-indirect-eval.template b/src/class-fields/initializer-eval-super-property/cls-expr-fields-indirect-eval.template
index 02db8f40f1..20d6c9c9de 100644
--- a/src/class-fields/initializer-eval-super-property/cls-expr-fields-indirect-eval.template
+++ b/src/class-fields/initializer-eval-super-property/cls-expr-fields-indirect-eval.template
@@ -5,6 +5,7 @@
 esid: sec-performeval-rules-in-initializer
 path: language/expressions/class/fields-derived-cls-indirect-
 name: indirect eval
+features: [class, class-fields-public]
 ---*/
 
 var executed = false;
diff --git a/src/class-fields/initializer-eval-super-property/cls-expr-private-fields-eval.template b/src/class-fields/initializer-eval-super-property/cls-expr-private-fields-eval.template
index 289a1dd242..e004b28305 100644
--- a/src/class-fields/initializer-eval-super-property/cls-expr-private-fields-eval.template
+++ b/src/class-fields/initializer-eval-super-property/cls-expr-private-fields-eval.template
@@ -5,6 +5,7 @@
 esid: sec-performeval-rules-in-initializer
 path: language/expressions/class/fields-private-derived-cls-direct-
 name: direct eval
+features: [class, class-fields-private]
 ---*/
 
 var executed = false;
diff --git a/src/class-fields/initializer-eval-super-property/cls-expr-private-fields-indirect-eval.template b/src/class-fields/initializer-eval-super-property/cls-expr-private-fields-indirect-eval.template
index 2aa8245cd4..fe02286471 100644
--- a/src/class-fields/initializer-eval-super-property/cls-expr-private-fields-indirect-eval.template
+++ b/src/class-fields/initializer-eval-super-property/cls-expr-private-fields-indirect-eval.template
@@ -5,6 +5,7 @@
 esid: sec-performeval-rules-in-initializer
 path: language/expressions/class/fields-private-derived-cls-indirect-
 name: indirect eval
+features: [class, class-fields-private]
 ---*/
 
 var executed = false;
diff --git a/src/class-fields/literal-names-asi.case b/src/class-fields/literal-names-asi.case
index 8e7cd1bc36..e95dd43018 100644
--- a/src/class-fields/literal-names-asi.case
+++ b/src/class-fields/literal-names-asi.case
@@ -15,6 +15,7 @@ info: |
     PropertyName
 template: productions
 includes: [propertyHelper.js]
+features: [class-fields-public]
 ---*/
 
 //- fields
diff --git a/src/class-fields/literal-names.case b/src/class-fields/literal-names.case
index 3637efbca2..84a8b9fa3b 100644
--- a/src/class-fields/literal-names.case
+++ b/src/class-fields/literal-names.case
@@ -15,6 +15,7 @@ info: |
     PropertyName
 template: productions
 includes: [propertyHelper.js]
+features: [class-fields-public]
 ---*/
 
 //- setup
diff --git a/src/class-fields/redeclaration-symbol.case b/src/class-fields/redeclaration-symbol.case
index fa2d32ed70..ed87d3eff9 100644
--- a/src/class-fields/redeclaration-symbol.case
+++ b/src/class-fields/redeclaration-symbol.case
@@ -26,6 +26,7 @@ info: |
       i. Perform ? DefineField(O, fieldRecord).
 
 template: default
+features: [class-fields-public]
 includes: [propertyHelper.js, compareArray.js]
 ---*/
 
diff --git a/src/class-fields/redeclaration.case b/src/class-fields/redeclaration.case
index e67c145362..22211a6c73 100644
--- a/src/class-fields/redeclaration.case
+++ b/src/class-fields/redeclaration.case
@@ -26,6 +26,7 @@ info: |
       i. Perform ? DefineField(O, fieldRecord).
 
 template: default
+features: [class-fields-public, computed-property-names]
 includes: [propertyHelper.js, compareArray.js]
 ---*/
 
diff --git a/src/class-fields/rs-field-identifier-initializer.case b/src/class-fields/rs-field-identifier-initializer.case
index c88435d355..44723c9a2b 100644
--- a/src/class-fields/rs-field-identifier-initializer.case
+++ b/src/class-fields/rs-field-identifier-initializer.case
@@ -52,7 +52,7 @@ info: |
   properties "Other_ID_Start" and "Other_ID_Continue".
 
 template: productions
-features: [class-fields-private]
+features: [class-fields-public]
 ---*/
 
 //- fields
diff --git a/src/class-fields/rs-field-identifier.case b/src/class-fields/rs-field-identifier.case
index fea8fa0b3c..3b04d47cff 100644
--- a/src/class-fields/rs-field-identifier.case
+++ b/src/class-fields/rs-field-identifier.case
@@ -52,7 +52,7 @@ info: |
   properties "Other_ID_Start" and "Other_ID_Continue".
 
 template: productions
-features: [class-fields-private]
+features: [class-fields-public]
 ---*/
 
 //- fields
diff --git a/src/class-fields/string-literal-names.case b/src/class-fields/string-literal-names.case
index bc22ba9e08..dbcb3c933c 100644
--- a/src/class-fields/string-literal-names.case
+++ b/src/class-fields/string-literal-names.case
@@ -15,6 +15,7 @@ info: |
     PropertyName
 template: productions
 includes: [propertyHelper.js]
+features: [class-fields-public]
 ---*/
 
 //- fields