diff --git a/test/built-ins/TypedArrays/internals/Get/infinity-detached-buffer.js b/test/built-ins/TypedArrays/internals/Get/infinity-detached-buffer.js
index 3451ea24949ad0b5133bcf82602749f1526ba3c7..ae2a8cdfc78d704461b2409cfbf752ac1fcc0aec 100644
--- a/test/built-ins/TypedArrays/internals/Get/infinity-detached-buffer.js
+++ b/test/built-ins/TypedArrays/internals/Get/infinity-detached-buffer.js
@@ -2,10 +2,10 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-integerindexedelementget
-info: >
+esid: sec-integerindexedelementget
+description: >
   "Infinity" is a canonical numeric string, test with access on detached buffer.
-description: |
+info: |
   9.4.5.4 [[Get]] ( P, Receiver )
   ...
   2. If Type(P) is String, then
@@ -27,6 +27,7 @@ description: |
     ...
 
 includes: [testTypedArray.js, detachArrayBuffer.js]
+features: [TypedArray]
 ---*/
 
 testWithTypedArrayConstructors(function(TA) {
diff --git a/test/built-ins/TypedArrays/internals/GetOwnProperty/enumerate-detached-buffer.js b/test/built-ins/TypedArrays/internals/GetOwnProperty/enumerate-detached-buffer.js
index b5ff13a34dfea83e0718ae3c18da31aa71c0dfc0..40d7630dd663af04cf72c04e0d468abd7d93670a 100644
--- a/test/built-ins/TypedArrays/internals/GetOwnProperty/enumerate-detached-buffer.js
+++ b/test/built-ins/TypedArrays/internals/GetOwnProperty/enumerate-detached-buffer.js
@@ -2,9 +2,9 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-integer-indexed-exotic-objects-getownproperty-p
-info: Test for-in enumeration with detached buffer.
-description: |
+esid: sec-integer-indexed-exotic-objects-getownproperty-p
+description: Test for-in enumeration with detached buffer.
+info: |
   9.4.5.1 [[GetOwnProperty]] ( P )
     ...
     3. If Type(P) is String, then
@@ -27,6 +27,7 @@ description: |
     calling its [[GetOwnProperty]] internal method.
 
 includes: [testTypedArray.js, detachArrayBuffer.js]
+features: [TypedArray]
 ---*/
 
 testWithTypedArrayConstructors(function(TA) {
diff --git a/test/built-ins/TypedArrays/internals/HasProperty/infinity-with-detached-buffer.js b/test/built-ins/TypedArrays/internals/HasProperty/infinity-with-detached-buffer.js
index 4d2001f03f345f732e8dceac4772d4a3fda7f4f3..7a79bec7b9443a52599d4e0883aef7c4956d345c 100644
--- a/test/built-ins/TypedArrays/internals/HasProperty/infinity-with-detached-buffer.js
+++ b/test/built-ins/TypedArrays/internals/HasProperty/infinity-with-detached-buffer.js
@@ -2,10 +2,10 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-integer-indexed-exotic-objects-hasproperty-p
-info: >
+esid: sec-integer-indexed-exotic-objects-hasproperty-p
+description: >
   "Infinity" is a canonical numeric string, test with access on detached buffer.
-description: |
+info: |
   9.4.5.2 [[HasProperty]]( P )
   ...
   3. If Type(P) is String, then
@@ -23,6 +23,7 @@ description: |
 
 flags: [noStrict]
 includes: [testTypedArray.js, detachArrayBuffer.js]
+features: [TypedArray]
 ---*/
 
 testWithTypedArrayConstructors(function(TA) {
diff --git a/test/language/expressions/call/eval-spread-empty-leading.js b/test/language/expressions/call/eval-spread-empty-leading.js
index 74ddaa89e9e4a02301443b7bcc3d9ca02880eeb6..e456a2d79797954e339eab2e19e0fb9e2380497c 100644
--- a/test/language/expressions/call/eval-spread-empty-leading.js
+++ b/test/language/expressions/call/eval-spread-empty-leading.js
@@ -2,10 +2,10 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-function-calls-runtime-semantics-evaluation
-info: >
+esid: sec-function-calls-runtime-semantics-evaluation
+description: >
   Direct eval call with empty leading spread.
-description: |
+info: |
   12.3.4.1 Runtime Semantics: Evaluation
     ...
     3. If Type(ref) is Reference and IsPropertyReference(ref) is false and GetReferencedName(ref) is "eval", then
diff --git a/test/language/expressions/call/eval-spread-empty-trailing.js b/test/language/expressions/call/eval-spread-empty-trailing.js
index ee92dc95b7f8938bf0d5c35370185e0f25e426d5..b8a2708e546bdfd101d0897246b180c8ee0b4cb9 100644
--- a/test/language/expressions/call/eval-spread-empty-trailing.js
+++ b/test/language/expressions/call/eval-spread-empty-trailing.js
@@ -2,10 +2,10 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-function-calls-runtime-semantics-evaluation
-info: >
+esid: sec-function-calls-runtime-semantics-evaluation
+description: >
   Direct eval call with empty trailing spread.
-description: |
+info: |
   12.3.4.1 Runtime Semantics: Evaluation
     ...
     3. If Type(ref) is Reference and IsPropertyReference(ref) is false and GetReferencedName(ref) is "eval", then
diff --git a/test/language/expressions/call/eval-spread-empty.js b/test/language/expressions/call/eval-spread-empty.js
index 3c462a686d8415640d82407d196f536084b5bc56..e88171076f2b530c8fc44327457ce08c30e1b325 100644
--- a/test/language/expressions/call/eval-spread-empty.js
+++ b/test/language/expressions/call/eval-spread-empty.js
@@ -2,10 +2,10 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-function-calls-runtime-semantics-evaluation
-info: >
+esid: sec-function-calls-runtime-semantics-evaluation
+description: >
   Direct eval call with empty spread.
-description: |
+info: |
   12.3.4.1 Runtime Semantics: Evaluation
     ...
     3. If Type(ref) is Reference and IsPropertyReference(ref) is false and GetReferencedName(ref) is "eval", then
diff --git a/test/language/expressions/call/eval-spread.js b/test/language/expressions/call/eval-spread.js
index 8ad99fcf9c037a6dd2de657cda30a37e15c7f8f0..7baca35754051bce172705b7714f10a849fc7329 100644
--- a/test/language/expressions/call/eval-spread.js
+++ b/test/language/expressions/call/eval-spread.js
@@ -2,10 +2,10 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-function-calls-runtime-semantics-evaluation
-info: >
+esid: sec-function-calls-runtime-semantics-evaluation
+description: >
   Direct eval call with spread.
-description: |
+info: |
   12.3.4.1 Runtime Semantics: Evaluation
     ...
     3. If Type(ref) is Reference and IsPropertyReference(ref) is false and GetReferencedName(ref) is "eval", then
diff --git a/test/language/expressions/call/tco-cross-realm-class-construct.js b/test/language/expressions/call/tco-cross-realm-class-construct.js
index 8d74cee29a191ae258c8af435f9bc49242c362df..08361636b3bec7117646f1b00fc6fa14ed6a1c89 100644
--- a/test/language/expressions/call/tco-cross-realm-class-construct.js
+++ b/test/language/expressions/call/tco-cross-realm-class-construct.js
@@ -2,11 +2,11 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-function-calls-runtime-semantics-evaluation
-info: >
+esid: sec-function-calls-runtime-semantics-evaluation
+description: >
   Check TypeError is thrown from correct realm with tco-call to class constructor from derived
   class [[Construct]] invocation.
-description: |
+info: |
   12.3.4.3 Runtime Semantics: EvaluateDirectCall( func, thisValue, arguments, tailPosition )
     ...
     4. If tailPosition is true, perform PrepareForTailCall().
diff --git a/test/language/expressions/call/tco-cross-realm-class-derived-construct.js b/test/language/expressions/call/tco-cross-realm-class-derived-construct.js
index f55a8fe9b9ebdd45508a1f3ea88a5161e01569a1..b478884234cb79d49bcb7aca969440175f6ca5bd 100644
--- a/test/language/expressions/call/tco-cross-realm-class-derived-construct.js
+++ b/test/language/expressions/call/tco-cross-realm-class-derived-construct.js
@@ -2,11 +2,11 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-function-calls-runtime-semantics-evaluation
-info: >
+esid: sec-function-calls-runtime-semantics-evaluation
+description: >
   Check TypeError is thrown from correct realm with tco-call to class constructor from
   class [[Construct]] invocation.
-description: |
+info: |
   12.3.4.3 Runtime Semantics: EvaluateDirectCall( func, thisValue, arguments, tailPosition )
     ...
     4. If tailPosition is true, perform PrepareForTailCall().
diff --git a/test/language/expressions/call/tco-cross-realm-fun-call.js b/test/language/expressions/call/tco-cross-realm-fun-call.js
index 6c0b3e30a43515748ee8c32d9f137c9f225d36f0..5a254a02b3b769a5947276fc3b9574d1c3c300c5 100644
--- a/test/language/expressions/call/tco-cross-realm-fun-call.js
+++ b/test/language/expressions/call/tco-cross-realm-fun-call.js
@@ -2,10 +2,10 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-function-calls-runtime-semantics-evaluation
-info: >
+esid: sec-function-calls-runtime-semantics-evaluation
+description: >
   Check TypeError is thrown from correct realm with tco-call to class constructor from [[Call]] invocation.
-description: |
+info: |
   12.3.4.3 Runtime Semantics: EvaluateDirectCall( func, thisValue, arguments, tailPosition )
     ...
     4. If tailPosition is true, perform PrepareForTailCall().
diff --git a/test/language/expressions/call/tco-cross-realm-fun-construct.js b/test/language/expressions/call/tco-cross-realm-fun-construct.js
index e26165ec869136da87339109ffa6ec52e34ff73c..f026a8d441efff4272042f40ee2ba8fc6892d99f 100644
--- a/test/language/expressions/call/tco-cross-realm-fun-construct.js
+++ b/test/language/expressions/call/tco-cross-realm-fun-construct.js
@@ -2,10 +2,10 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-function-calls-runtime-semantics-evaluation
-info: >
+esid: sec-function-calls-runtime-semantics-evaluation
+description: >
   Check TypeError is thrown from correct realm with tco-call to class constructor from [[Construct]] invocation.
-description: |
+info: |
   12.3.4.3 Runtime Semantics: EvaluateDirectCall( func, thisValue, arguments, tailPosition )
     ...
     4. If tailPosition is true, perform PrepareForTailCall().
diff --git a/test/language/expressions/call/tco-non-eval-function-dynamic.js b/test/language/expressions/call/tco-non-eval-function-dynamic.js
index a570c791cd3afbf36cafd33e5b4b835382725c96..8ef0f92a22a30db9d278bd51901d3ab91b3e05d2 100644
--- a/test/language/expressions/call/tco-non-eval-function-dynamic.js
+++ b/test/language/expressions/call/tco-non-eval-function-dynamic.js
@@ -2,10 +2,10 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-function-calls-runtime-semantics-evaluation
-info: >
+esid: sec-function-calls-runtime-semantics-evaluation
+description: >
   Tail-call with identifier named "eval" in function environment, local "eval" binding dynamically added.
-description: |
+info: |
   12.3.4.1 Runtime Semantics: Evaluation
     ...
     6. If Type(ref) is Reference and IsPropertyReference(ref) is false and
diff --git a/test/language/expressions/call/tco-non-eval-function.js b/test/language/expressions/call/tco-non-eval-function.js
index 623a101273b2867e79e2e2eb8cf1e551f6438813..200666bfe5aa36fc59b24239c01d106d226dbc7d 100644
--- a/test/language/expressions/call/tco-non-eval-function.js
+++ b/test/language/expressions/call/tco-non-eval-function.js
@@ -2,10 +2,10 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-function-calls-runtime-semantics-evaluation
-info: >
+esid: sec-function-calls-runtime-semantics-evaluation
+description: >
   Tail-call with identifier named "eval" in function environment.
-description: |
+info: |
   12.3.4.1 Runtime Semantics: Evaluation
     ...
     6. If Type(ref) is Reference and IsPropertyReference(ref) is false and
diff --git a/test/language/expressions/call/tco-non-eval-global.js b/test/language/expressions/call/tco-non-eval-global.js
index 8152b825389ef25ca7a31bcd1ad16067a561a8aa..208b3f0e8dcf826826a063e7538abf84def9b7f3 100644
--- a/test/language/expressions/call/tco-non-eval-global.js
+++ b/test/language/expressions/call/tco-non-eval-global.js
@@ -2,10 +2,10 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-function-calls-runtime-semantics-evaluation
-info: >
+esid: sec-function-calls-runtime-semantics-evaluation
+description: >
   Tail-call with identifier named "eval" in global environment.
-description: |
+info: |
   12.3.4.1 Runtime Semantics: Evaluation
     ...
     6. If Type(ref) is Reference and IsPropertyReference(ref) is false and
diff --git a/test/language/expressions/call/tco-non-eval-with.js b/test/language/expressions/call/tco-non-eval-with.js
index 679787442978e00bcd00539586a0d33ddb434b7d..920e09a115a68d6487d6e9bdfd730e07154a792d 100644
--- a/test/language/expressions/call/tco-non-eval-with.js
+++ b/test/language/expressions/call/tco-non-eval-with.js
@@ -2,10 +2,10 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-function-calls-runtime-semantics-evaluation
-info: >
+esid: sec-function-calls-runtime-semantics-evaluation
+description: >
   Tail-call with identifier named "eval" in object environment.
-description: |
+info: |
   12.3.4.1 Runtime Semantics: Evaluation
     ...
     6. If Type(ref) is Reference and IsPropertyReference(ref) is false and
diff --git a/test/language/identifiers/other_id_continue-escaped.js b/test/language/identifiers/other_id_continue-escaped.js
index 48efba77575ac895d0aa50c5a98d7734a9af0932..7723c2a91b37e94235fd5945c99906e0bfb1c6b1 100644
--- a/test/language/identifiers/other_id_continue-escaped.js
+++ b/test/language/identifiers/other_id_continue-escaped.js
@@ -2,9 +2,9 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-names-and-keywords
-info: Test grandfathered characters of ID_Continue.
-description: >
+esid: sec-names-and-keywords
+description: Test grandfathered characters of ID_Continue.
+info: >
   Grandfathered characters (Other_ID_Start + Other_ID_Continue)
 ---*/
 
diff --git a/test/language/identifiers/other_id_continue.js b/test/language/identifiers/other_id_continue.js
index ebe7f3fca4c742566d8d387cadf158725cfb42d6..7f2ffa98154bd5545e0b3c9dd73be5e1eca6e456 100644
--- a/test/language/identifiers/other_id_continue.js
+++ b/test/language/identifiers/other_id_continue.js
@@ -2,9 +2,9 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-names-and-keywords
-info: Test grandfathered characters of ID_Continue.
-description: >
+esid: sec-names-and-keywords
+description: Test grandfathered characters of ID_Continue.
+info: >
   Grandfathered characters (Other_ID_Start + Other_ID_Continue)
 ---*/
 
diff --git a/test/language/identifiers/other_id_start-escaped.js b/test/language/identifiers/other_id_start-escaped.js
index 2173e0959f531d6668dd49b449ed9cb702b9ff90..e4cf756afb2bc9a4b46635a4a30754f6892d8cbc 100644
--- a/test/language/identifiers/other_id_start-escaped.js
+++ b/test/language/identifiers/other_id_start-escaped.js
@@ -2,9 +2,9 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-names-and-keywords
-info: Test grandfathered characters of ID_Start.
-description: >
+esid: sec-names-and-keywords
+description: Test grandfathered characters of ID_Start.
+info: >
   Grandfathered characters (Other_ID_Start)
 ---*/
 
diff --git a/test/language/identifiers/other_id_start.js b/test/language/identifiers/other_id_start.js
index 04fcfa36084c5c98e8f880a9326ccb69d9072bda..8e520cce49549c1363ab1c4d2fc89c242e68e200 100644
--- a/test/language/identifiers/other_id_start.js
+++ b/test/language/identifiers/other_id_start.js
@@ -2,9 +2,9 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-names-and-keywords
-info: Test grandfathered characters of ID_Start.
-description: >
+esid: sec-names-and-keywords
+description: Test grandfathered characters of ID_Start.
+info: |
   Grandfathered characters (Other_ID_Start)
 ---*/
 
diff --git a/test/language/identifiers/vertical-tilde-continue-escaped.js b/test/language/identifiers/vertical-tilde-continue-escaped.js
index b7acc2786dc9c50cd6b6cd67a9414cf2f76225cb..e66b9ff4416941fe6a482d7c85a8d0449af77a0a 100644
--- a/test/language/identifiers/vertical-tilde-continue-escaped.js
+++ b/test/language/identifiers/vertical-tilde-continue-escaped.js
@@ -2,9 +2,9 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-names-and-keywords
-info: Test VERTICAL TILDE (U+2E2F) is not recognized as ID_Continue character.
-description: >
+esid: sec-names-and-keywords
+description: Test VERTICAL TILDE (U+2E2F) is not recognized as ID_Continue character.
+info: >
   VERTICAL TILDE is in General Category 'Lm' and [:Pattern_Syntax:].
 negative:
   type: SyntaxError
diff --git a/test/language/identifiers/vertical-tilde-continue.js b/test/language/identifiers/vertical-tilde-continue.js
index ed07cd02914e0092038057ec379f008c67ec8b7d..edd7aaaab1bae47f8a6fc65f79d04c697dc0d9eb 100644
--- a/test/language/identifiers/vertical-tilde-continue.js
+++ b/test/language/identifiers/vertical-tilde-continue.js
@@ -2,9 +2,9 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-names-and-keywords
-info: Test VERTICAL TILDE (U+2E2F) is not recognized as ID_Continue character.
-description: >
+esid: sec-names-and-keywords
+description: Test VERTICAL TILDE (U+2E2F) is not recognized as ID_Continue character.
+info: >
   VERTICAL TILDE is in General Category 'Lm' and [:Pattern_Syntax:].
 negative:
   type: SyntaxError
diff --git a/test/language/identifiers/vertical-tilde-start-escaped.js b/test/language/identifiers/vertical-tilde-start-escaped.js
index ee0f2fc44c4f387b28367758cf1bef63db92bfb6..8264d180d55221a56ac41caefadb16ce8d2d1041 100644
--- a/test/language/identifiers/vertical-tilde-start-escaped.js
+++ b/test/language/identifiers/vertical-tilde-start-escaped.js
@@ -2,9 +2,9 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-names-and-keywords
-info: Test VERTICAL TILDE (U+2E2F) is not recognized as ID_Start character.
-description: >
+esid: sec-names-and-keywords
+description: Test VERTICAL TILDE (U+2E2F) is not recognized as ID_Start character.
+info: |
   VERTICAL TILDE is in General Category 'Lm' and [:Pattern_Syntax:].
 negative:
   type: SyntaxError
diff --git a/test/language/identifiers/vertical-tilde-start.js b/test/language/identifiers/vertical-tilde-start.js
index 815a6654d81796dc5d517a952ac8139a733e3ca6..78476a6b499320a3d27163a42b6d5cb95207a78d 100644
--- a/test/language/identifiers/vertical-tilde-start.js
+++ b/test/language/identifiers/vertical-tilde-start.js
@@ -2,9 +2,9 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-names-and-keywords
-info: Test VERTICAL TILDE (U+2E2F) is not recognized as ID_Start character.
-description: >
+esid: sec-names-and-keywords
+description: Test VERTICAL TILDE (U+2E2F) is not recognized as ID_Start character.
+info: |
   VERTICAL TILDE is in General Category 'Lm' and [:Pattern_Syntax:].
 negative:
   type: SyntaxError
diff --git a/test/language/module-code/namespace/internals/enumerate-binding-uninit.js b/test/language/module-code/namespace/internals/enumerate-binding-uninit.js
index a56408e8d80c5b1806e2916c8ec4debe352951d8..d7c9418c3a4d5de4ccddf89d188add63ca5168b1 100644
--- a/test/language/module-code/namespace/internals/enumerate-binding-uninit.js
+++ b/test/language/module-code/namespace/internals/enumerate-binding-uninit.js
@@ -2,10 +2,10 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-enumerate-object-properties
-info: >
+esid: sec-enumerate-object-properties
+description: >
   Test for-in enumeration with uninitialized binding.
-description: |
+info: |
   13.7.5.15 EnumerateObjectProperties (O)
     ...
     EnumerateObjectProperties must obtain the own property keys of the
diff --git a/test/language/module-code/namespace/internals/object-hasOwnProperty-binding-uninit.js b/test/language/module-code/namespace/internals/object-hasOwnProperty-binding-uninit.js
index fc90814fbbbe4fae403de3c00981ff60e5b7df22..f58a4441eadddc7119cbd1f9923d8ff7def70df8 100644
--- a/test/language/module-code/namespace/internals/object-hasOwnProperty-binding-uninit.js
+++ b/test/language/module-code/namespace/internals/object-hasOwnProperty-binding-uninit.js
@@ -2,10 +2,10 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.prototype.hasownproperty
-info: >
+esid: sec-object.prototype.hasownproperty
+description: >
   Test Object.prototype.hasOwnProperty() with uninitialized binding.
-description: |
+info: |
   19.1.3.2 Object.prototype.hasOwnProperty ( V )
     ...
     3. Return ? HasOwnProperty(O, P).
diff --git a/test/language/module-code/namespace/internals/object-keys-binding-uninit.js b/test/language/module-code/namespace/internals/object-keys-binding-uninit.js
index 842ae50d6e72dc381cdac91719f5010f29e4a14d..44fb97b7ee5ea0b2557d626e09d86861b5b20652 100644
--- a/test/language/module-code/namespace/internals/object-keys-binding-uninit.js
+++ b/test/language/module-code/namespace/internals/object-keys-binding-uninit.js
@@ -2,10 +2,10 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.keys
-info: >
+esid: sec-object.keys
+description: >
   Test Object.keys() with uninitialized binding.
-description: |
+info: |
   19.1.2.16 Object.keys ( O )
     ...
     2. Let nameList be ? EnumerableOwnProperties(obj, "key").
diff --git a/test/language/module-code/namespace/internals/object-propertyIsEnumerable-binding-uninit.js b/test/language/module-code/namespace/internals/object-propertyIsEnumerable-binding-uninit.js
index 285a6c9af28f9f1ed772310fe7b322245beec7ff..7490f02da37c366f45760af88466a46feede4429 100644
--- a/test/language/module-code/namespace/internals/object-propertyIsEnumerable-binding-uninit.js
+++ b/test/language/module-code/namespace/internals/object-propertyIsEnumerable-binding-uninit.js
@@ -2,10 +2,10 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.prototype.propertyisenumerable
-info: >
+esid: sec-object.prototype.propertyisenumerable
+description: >
   Test Object.prototype.propertyIsEnumerable() with uninitialized binding.
-description: |
+info: |
   19.1.3.4 Object.prototype.propertyIsEnumerable ( V )
     ...
     3. Let desc be ? O.[[GetOwnProperty]](P).
diff --git a/test/language/statements/for-of/generator-close-via-continue.js b/test/language/statements/for-of/generator-close-via-continue.js
index b8afad37ce32d0ab9486efde2e373365fd8ba245..0fe66db8e88685b82ae5f90b8628518f8d5e2660 100644
--- a/test/language/statements/for-of/generator-close-via-continue.js
+++ b/test/language/statements/for-of/generator-close-via-continue.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-runtime-semantics-forin-div-ofbodyevaluation-lhs-stmt-iterator-lhskind-labelset
+esid: sec-runtime-semantics-forin-div-ofbodyevaluation-lhs-stmt-iterator-lhskind-labelset
 description: >
   Generators should be closed via their `return` method when iteration is
   interrupted via a `continue` statement.
diff --git a/test/language/statements/for-of/iterator-close-via-continue.js b/test/language/statements/for-of/iterator-close-via-continue.js
index 6c98fb6b84eb18a5f15e44612ee40d87407ec320..1d902643cf274d5708d0e81f833af6c4a1e5b16a 100644
--- a/test/language/statements/for-of/iterator-close-via-continue.js
+++ b/test/language/statements/for-of/iterator-close-via-continue.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-runtime-semantics-forin-div-ofbodyevaluation-lhs-stmt-iterator-lhskind-labelset
+esid: sec-runtime-semantics-forin-div-ofbodyevaluation-lhs-stmt-iterator-lhskind-labelset
 description: >
   Iterators should be closed via their `return` method when iteration is
   interrupted via a `continue` statement.