diff --git a/test/built-ins/Object/is/symbol-object-is-same-value.js b/test/built-ins/Object/is/symbol-object-is-same-value.js
index b4d5a1384312f77f55635f337800493ff1cdd3bd..4a58a0927c1f74842f149ef588a200c0612f712f 100644
--- a/test/built-ins/Object/is/symbol-object-is-same-value.js
+++ b/test/built-ins/Object/is/symbol-object-is-same-value.js
@@ -1,10 +1,10 @@
 // Copyright (C) 2013 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-es6id: 7.2.
+esid: sec-object.is
 description: >
     Object.is/SameValue: Symbol
-features: [Symbol]
+features: [Object.is,Symbol]
 ---*/
 var symA = Symbol('66');
 var symB = Symbol('66');
diff --git a/test/built-ins/StringIteratorPrototype/next/next-missing-internal-slots.js b/test/built-ins/StringIteratorPrototype/next/next-missing-internal-slots.js
index 4eb96687be8c4b8590407c21cb037430ccbc7c13..41c0703cf32c998a5def55be20f34668ba5defeb 100644
--- a/test/built-ins/StringIteratorPrototype/next/next-missing-internal-slots.js
+++ b/test/built-ins/StringIteratorPrototype/next/next-missing-internal-slots.js
@@ -1,10 +1,16 @@
 // Copyright (C) 2014 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-es6id: 21.1.5.2.1 S 3
+esid: sec-properties-of-string-iterator-instances
 description: >
     If the `this` value does not have all of the internal slots of an String
     Iterator Instance (21.1.5.3), throw a `TypeError` exception.
+info: |
+  ...
+  If O does not have all of the internal slots of a String Iterator Instance (21.1.5.3),
+  throw a TypeError exception.
+  ...
+
 features: [Symbol.iterator]
 ---*/
 
diff --git a/test/intl402/NumberFormat/prototype/formatToParts/default-parameter.js b/test/intl402/NumberFormat/prototype/formatToParts/default-parameter.js
index 39c682ca776741940a27303025aefaf71287caa5..347efe03d02333cb92be2b13ad4fb47e70e1f950 100644
--- a/test/intl402/NumberFormat/prototype/formatToParts/default-parameter.js
+++ b/test/intl402/NumberFormat/prototype/formatToParts/default-parameter.js
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 Josh Wolfe. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-esid: #sec-intl.numberformat.prototype.formattoparts
+esid: sec-intl.numberformat.prototype.formattoparts
 description: Intl.NumberFormat.prototype.formatToParts called with no parameters
 info: |
   Intl.NumberFormat.prototype.formatToParts ([ value ])
diff --git a/test/language/expressions/async-generator/early-errors-expression-formals-contains-await.js b/test/language/expressions/async-generator/early-errors-expression-formals-contains-await.js
index 1c748595fc22baa007b0f148c2bc2771878f3579..fe4081d26055965566278c4ef0155a8143da4a9f 100644
--- a/test/language/expressions/async-generator/early-errors-expression-formals-contains-await.js
+++ b/test/language/expressions/async-generator/early-errors-expression-formals-contains-await.js
@@ -3,7 +3,7 @@
 
 /*---
 author: Caitlin Potter <caitp@igalia.com>
-esid: 12.1
+esid: sec-identifiers
 description: >
   `await` is a reserved keyword within async generator function bodies and may
   not be used as the binding identifier of a parameter.
diff --git a/test/language/expressions/async-generator/early-errors-expression-formals-contains-yield.js b/test/language/expressions/async-generator/early-errors-expression-formals-contains-yield.js
index 1f1986dbcf775c16dfaf4369dce1feb7d783ad19..d914897c64dcce32d4b51e81ecc5987955dd2fa3 100644
--- a/test/language/expressions/async-generator/early-errors-expression-formals-contains-yield.js
+++ b/test/language/expressions/async-generator/early-errors-expression-formals-contains-yield.js
@@ -3,7 +3,7 @@
 
 /*---
 author: Caitlin Potter <caitp@igalia.com>
-esid: 12.1
+esid: sec-identifiers
 description: >
   `yield` is a reserved keyword within async generator function bodies and may
   not be used as the binding identifier of a parameter.
diff --git a/test/language/expressions/async-generator/early-errors-expression-label-name-await.js b/test/language/expressions/async-generator/early-errors-expression-label-name-await.js
index 3036367d08f6abf0f8663920f91d93bd76896d5d..d93b02a7092b1ff5a6fed024de44549b5c7f3dff 100644
--- a/test/language/expressions/async-generator/early-errors-expression-label-name-await.js
+++ b/test/language/expressions/async-generator/early-errors-expression-label-name-await.js
@@ -3,7 +3,7 @@
 
 /*---
 author: Caitlin Potter <caitp@igalia.com>
-esid: 12.1.1
+esid: sec-identifiers
 description: >
   `await` is a reserved keyword within async generator function bodies and may
   not be used as a label.
diff --git a/test/language/expressions/async-generator/early-errors-expression-label-name-yield.js b/test/language/expressions/async-generator/early-errors-expression-label-name-yield.js
index bf32b7846611c6ac89d53f4edea3bba3bd9d8953..b8f990e6f055cc741bd7564c67fe1aa3ca6cfa5b 100644
--- a/test/language/expressions/async-generator/early-errors-expression-label-name-yield.js
+++ b/test/language/expressions/async-generator/early-errors-expression-label-name-yield.js
@@ -3,7 +3,7 @@
 
 /*---
 author: Caitlin Potter <caitp@igalia.com>
-esid: 12.1.1
+esid: sec-identifiers
 description: >
   `yield` is a reserved keyword within async generator function bodies and may
   not be used as a label.