diff --git a/test/built-ins/Atomics/Symbol.toStringTag.js b/test/built-ins/Atomics/Symbol.toStringTag.js
index 647c657e757402350c3493a4fd2b59fd49445067..0d33b33cfcfd90a8ca23840446b21340e6829136 100644
--- a/test/built-ins/Atomics/Symbol.toStringTag.js
+++ b/test/built-ins/Atomics/Symbol.toStringTag.js
@@ -1,6 +1,7 @@
 // Copyright (C) 2017 Mozilla Corporation.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
+esid: sec-atomics-@@tostringtag
 description: >
     `Symbol.toStringTag` property descriptor on Atomics
 info: >
diff --git a/test/built-ins/Atomics/add/bad-range.js b/test/built-ins/Atomics/add/bad-range.js
index e7b061de741373ec91609de6d5f3d1a4df0b25f8..b710e5d75b7c2b8ef4e7ee22d53fd131e6e25300 100644
--- a/test/built-ins/Atomics/add/bad-range.js
+++ b/test/built-ins/Atomics/add/bad-range.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.add
 description: >
   Test range checking of Atomics.add on arrays that allow atomic operations
 includes: [testAtomics.js, testTypedArray.js]
diff --git a/test/built-ins/Atomics/add/descriptor.js b/test/built-ins/Atomics/add/descriptor.js
index 822696affd73d44752ad343699cae0a299a3237c..198d97b849826e5e80c62d8b34466fcd53e51b2d 100644
--- a/test/built-ins/Atomics/add/descriptor.js
+++ b/test/built-ins/Atomics/add/descriptor.js
@@ -3,6 +3,7 @@
 // This code is governed by the license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.add
 description: Testing descriptor property of Atomics.add
 includes: [propertyHelper.js]
 ---*/
diff --git a/test/built-ins/Atomics/add/good-views.js b/test/built-ins/Atomics/add/good-views.js
index 6dda8b488f7da982990622c4d2dc647be89c9f2b..142e4416edb42f7204949a2c29e12049c9e9bc57 100644
--- a/test/built-ins/Atomics/add/good-views.js
+++ b/test/built-ins/Atomics/add/good-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.add
 description: Test Atomics.add on arrays that allow atomic operations.
 includes: [testAtomics.js, testTypedArray.js]
 ---*/
diff --git a/test/built-ins/Atomics/add/length.js b/test/built-ins/Atomics/add/length.js
index 34bf294f5cf83acda72863994ddf5077a8c1b2c8..6cc6534894895ff78154318ac9f20e211503edd5 100644
--- a/test/built-ins/Atomics/add/length.js
+++ b/test/built-ins/Atomics/add/length.js
@@ -3,6 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.add
 description: >
   Atomics.add.length is 3.
 info: >
diff --git a/test/built-ins/Atomics/add/name.js b/test/built-ins/Atomics/add/name.js
index 0280526c6c33a40f83015bebf555f7ddf937312c..f65988d00a10a3a1543dade3f2154ee8ee9cf1cd 100644
--- a/test/built-ins/Atomics/add/name.js
+++ b/test/built-ins/Atomics/add/name.js
@@ -3,6 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.add
 description: >
   Atomics.add.name is "add".
 includes: [propertyHelper.js]
diff --git a/test/built-ins/Atomics/add/non-views.js b/test/built-ins/Atomics/add/non-views.js
index baa6ada0f70028421c224f5f2b69c33734ded095..32eaed2d23a4ad48fd23d3c0e57db27ccf152389 100644
--- a/test/built-ins/Atomics/add/non-views.js
+++ b/test/built-ins/Atomics/add/non-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.add
 description: >
   Test Atomics.add on view values other than TypedArrays
 includes: [testAtomics.js]
diff --git a/test/built-ins/Atomics/add/nonshared-int-views.js b/test/built-ins/Atomics/add/nonshared-int-views.js
index c385fc30491a0c69ed78635a85b592c9dd58a313..2c57fae1f4e2c5ff982438842d26eb90f5e7b378 100644
--- a/test/built-ins/Atomics/add/nonshared-int-views.js
+++ b/test/built-ins/Atomics/add/nonshared-int-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.add
 description: >
   Test Atomics.add on non-shared integer TypedArrays
 includes: [testTypedArray.js]
diff --git a/test/built-ins/Atomics/add/shared-nonint-views.js b/test/built-ins/Atomics/add/shared-nonint-views.js
index b643c14e16aed4b281d5932e38d2bda90d4e3814..4141e35863906a3cbda70b3ca5ddda772127eab7 100644
--- a/test/built-ins/Atomics/add/shared-nonint-views.js
+++ b/test/built-ins/Atomics/add/shared-nonint-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.add
 description: >
   Test Atomics.add on shared non-integer TypedArrays
 includes: [testTypedArray.js]
diff --git a/test/built-ins/Atomics/and/bad-range.js b/test/built-ins/Atomics/and/bad-range.js
index 4e33422318d65c9602e7b9659fbe19405392cc32..fc44f3d584c85768ed38d7f80377980518a57298 100644
--- a/test/built-ins/Atomics/and/bad-range.js
+++ b/test/built-ins/Atomics/and/bad-range.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.and
 description: >
   Test range checking of Atomics.and on arrays that allow atomic operations
 includes: [testAtomics.js, testTypedArray.js]
diff --git a/test/built-ins/Atomics/and/descriptor.js b/test/built-ins/Atomics/and/descriptor.js
index 113970c38a507aaa4391cb801b7ceaaccd8e504c..c5be59fa2962bb29a57e89a08f1e71bdaa4f80f3 100644
--- a/test/built-ins/Atomics/and/descriptor.js
+++ b/test/built-ins/Atomics/and/descriptor.js
@@ -3,6 +3,7 @@
 // This code is governed by the license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.and
 description: Testing descriptor property of Atomics.and
 includes: [propertyHelper.js]
 ---*/
diff --git a/test/built-ins/Atomics/and/good-views.js b/test/built-ins/Atomics/and/good-views.js
index 269c495ae9a1480b3ddb7e403d8558b3ca54f89f..d4546e5bf446284e2cd64d12be6cde690ecd94e6 100644
--- a/test/built-ins/Atomics/and/good-views.js
+++ b/test/built-ins/Atomics/and/good-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.and
 description: Test Atomics.and on arrays that allow atomic operations
 includes: [testAtomics.js, testTypedArray.js]
 ---*/
diff --git a/test/built-ins/Atomics/and/length.js b/test/built-ins/Atomics/and/length.js
index 207f605664d219c798d4973f4d909047dd97aa4f..c1da051cd84aa1a80bf2e74e1598efe54ae28aff 100644
--- a/test/built-ins/Atomics/and/length.js
+++ b/test/built-ins/Atomics/and/length.js
@@ -3,6 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.and
 description: >
   Atomics.and.length is 3.
 info: >
diff --git a/test/built-ins/Atomics/and/name.js b/test/built-ins/Atomics/and/name.js
index f9dd0ead86b5b4b986f3df8cb40d7241a94dca5f..c49fd8aa7732f3c61ab27a8f1367563e61240af1 100644
--- a/test/built-ins/Atomics/and/name.js
+++ b/test/built-ins/Atomics/and/name.js
@@ -3,6 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.and
 description: >
   Atomics.and.name is "and".
 includes: [propertyHelper.js]
diff --git a/test/built-ins/Atomics/and/non-views.js b/test/built-ins/Atomics/and/non-views.js
index c7e528ca8bcd09204615eb2749f77e1888f0106b..f52246edeed9e675d1d222e5ea93a3c65f2be98f 100644
--- a/test/built-ins/Atomics/and/non-views.js
+++ b/test/built-ins/Atomics/and/non-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.and
 description: >
   Test Atomics.and on view values other than TypedArrays
 includes: [testAtomics.js]
diff --git a/test/built-ins/Atomics/and/nonshared-int-views.js b/test/built-ins/Atomics/and/nonshared-int-views.js
index 5c7967c0fab73cf27d32ce400544e9fc3df58f25..7f79eb3d19cc1282cb30435391e062ca5ca5c50f 100644
--- a/test/built-ins/Atomics/and/nonshared-int-views.js
+++ b/test/built-ins/Atomics/and/nonshared-int-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.and
 description: >
   Test Atomics.and on non-shared integer TypedArrays
 includes: [testTypedArray.js]
diff --git a/test/built-ins/Atomics/and/shared-nonint-views.js b/test/built-ins/Atomics/and/shared-nonint-views.js
index 317f20333ee2d53bd29782255da55646fe2a8e6d..5e54ff9de137a0a67913883fea92c1276592a698 100644
--- a/test/built-ins/Atomics/and/shared-nonint-views.js
+++ b/test/built-ins/Atomics/and/shared-nonint-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.and
 description: >
   Test Atomics.and on shared non-integer TypedArrays
 includes: [testTypedArray.js]
diff --git a/test/built-ins/Atomics/compareExchange/bad-range.js b/test/built-ins/Atomics/compareExchange/bad-range.js
index 920e90bc3a16b57a1d28ca44a634fb9ec744c396..af8dda84d21f557bccf821aa6dcf9599d20ee5d6 100644
--- a/test/built-ins/Atomics/compareExchange/bad-range.js
+++ b/test/built-ins/Atomics/compareExchange/bad-range.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.compareexchange
 description: >
   Test range checking of Atomics.compareExchange on arrays that allow atomic operations
 includes: [testAtomics.js, testTypedArray.js]
diff --git a/test/built-ins/Atomics/compareExchange/descriptor.js b/test/built-ins/Atomics/compareExchange/descriptor.js
index 4acadc454dfbcce49b770d5caab75180b8ea8493..453ab24567f3891fb86004897aa3009177684f83 100644
--- a/test/built-ins/Atomics/compareExchange/descriptor.js
+++ b/test/built-ins/Atomics/compareExchange/descriptor.js
@@ -3,6 +3,7 @@
 // This code is governed by the license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.compareexchange
 description: Testing descriptor property of Atomics.compareExchange
 includes: [propertyHelper.js]
 ---*/
diff --git a/test/built-ins/Atomics/compareExchange/good-views.js b/test/built-ins/Atomics/compareExchange/good-views.js
index cda3c655e4d296d67f1580430bf4f7f66258aba3..d45793fd6a063426110ac8c392a03340ff3f46bc 100644
--- a/test/built-ins/Atomics/compareExchange/good-views.js
+++ b/test/built-ins/Atomics/compareExchange/good-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.compareexchange
 description: Test Atomics.compareExchange on arrays that allow atomic operations.
 includes: [testAtomics.js, testTypedArray.js]
 ---*/
diff --git a/test/built-ins/Atomics/compareExchange/length.js b/test/built-ins/Atomics/compareExchange/length.js
index fdb318f7f71f050a0dff1881114baec95a820231..c3b253188699f31c160ec8274052071e67ff363e 100644
--- a/test/built-ins/Atomics/compareExchange/length.js
+++ b/test/built-ins/Atomics/compareExchange/length.js
@@ -3,6 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.compareexchange
 description: >
   Atomics.compareExchange.length is 4.
 info: >
diff --git a/test/built-ins/Atomics/compareExchange/name.js b/test/built-ins/Atomics/compareExchange/name.js
index f179b8c499f2256e9bc5a266c1e524f7c2c07f72..b725d1b3d93f101bd43d759d1d6429bfd55b56ee 100644
--- a/test/built-ins/Atomics/compareExchange/name.js
+++ b/test/built-ins/Atomics/compareExchange/name.js
@@ -3,6 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.compareexchange
 description: >
   Atomics.compareExchange.name is "compareExchange".
 includes: [propertyHelper.js]
diff --git a/test/built-ins/Atomics/compareExchange/non-views.js b/test/built-ins/Atomics/compareExchange/non-views.js
index c0e6475dfb4aba4979b14922dd7bf337112a3cb7..6dfe96789409ec134b08f11e1938add7f1e68953 100644
--- a/test/built-ins/Atomics/compareExchange/non-views.js
+++ b/test/built-ins/Atomics/compareExchange/non-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.compareexchange
 description: >
   Test Atomics.compareExchange on view values other than TypedArrays
 includes: [testAtomics.js]
diff --git a/test/built-ins/Atomics/compareExchange/nonshared-int-views.js b/test/built-ins/Atomics/compareExchange/nonshared-int-views.js
index 94d18b6669cded24c2ced789e49c50b0c26711b5..2c45a12a3ba0f583e0374cea7da2cb36cc340db4 100644
--- a/test/built-ins/Atomics/compareExchange/nonshared-int-views.js
+++ b/test/built-ins/Atomics/compareExchange/nonshared-int-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.compareexchange
 description: >
   Test Atomics.compareExchange on non-shared integer TypedArrays
 includes: [testTypedArray.js]
diff --git a/test/built-ins/Atomics/compareExchange/shared-nonint-views.js b/test/built-ins/Atomics/compareExchange/shared-nonint-views.js
index 78e12e34d4bcb6d5fec2569d522a47b89f2d917d..25cbe70542443066a54eb719a15eda092f98a234 100644
--- a/test/built-ins/Atomics/compareExchange/shared-nonint-views.js
+++ b/test/built-ins/Atomics/compareExchange/shared-nonint-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.compareexchange
 description: >
   Test Atomics.compareExchange on shared non-integer TypedArrays
 includes: [testTypedArray.js]
diff --git a/test/built-ins/Atomics/exchange/bad-range.js b/test/built-ins/Atomics/exchange/bad-range.js
index c8be9be25f82a724d4cd2c6945139bb8bee173ab..69296ccdfb731708c0d27fdf91195a0e7f16c9ab 100644
--- a/test/built-ins/Atomics/exchange/bad-range.js
+++ b/test/built-ins/Atomics/exchange/bad-range.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.exchange
 description: >
   Test range checking of Atomics.exchange on arrays that allow atomic operations
 includes: [testAtomics.js, testTypedArray.js]
diff --git a/test/built-ins/Atomics/exchange/descriptor.js b/test/built-ins/Atomics/exchange/descriptor.js
index 395712cf06193c36f04f0587b749f227c2cac579..b12bf1973c391bdff89422a6c7f59e0fe3d45549 100644
--- a/test/built-ins/Atomics/exchange/descriptor.js
+++ b/test/built-ins/Atomics/exchange/descriptor.js
@@ -3,6 +3,7 @@
 // This code is governed by the license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.exchange
 description: Testing descriptor property of Atomics.exchange
 includes: [propertyHelper.js]
 ---*/
diff --git a/test/built-ins/Atomics/exchange/good-views.js b/test/built-ins/Atomics/exchange/good-views.js
index 2961133d80becc3fd47a5347a8bdb6a50c1c8867..abeb3fb0169c3e4e104ad581120dbf65d59a8507 100644
--- a/test/built-ins/Atomics/exchange/good-views.js
+++ b/test/built-ins/Atomics/exchange/good-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.exchange
 description: Test Atomics.exchange on arrays that allow atomic operations.
 includes: [testAtomics.js, testTypedArray.js]
 ---*/
diff --git a/test/built-ins/Atomics/exchange/length.js b/test/built-ins/Atomics/exchange/length.js
index 92b424ad65ad1de4bd8f6572721dedca3f76c990..1a687d98382c5637a76319dfdf27e9a8cb52f1aa 100644
--- a/test/built-ins/Atomics/exchange/length.js
+++ b/test/built-ins/Atomics/exchange/length.js
@@ -3,6 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.exchange
 description: >
   Atomics.exchange.length is 3.
 info: >
diff --git a/test/built-ins/Atomics/exchange/name.js b/test/built-ins/Atomics/exchange/name.js
index f1b29161668a3b03824b9020e178296bf897ba27..8966fefad090dd5bd756122d2df868ee2f145c3b 100644
--- a/test/built-ins/Atomics/exchange/name.js
+++ b/test/built-ins/Atomics/exchange/name.js
@@ -3,6 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.exchange
 description: >
   Atomics.exchange.name is "exchange".
 includes: [propertyHelper.js]
diff --git a/test/built-ins/Atomics/exchange/non-views.js b/test/built-ins/Atomics/exchange/non-views.js
index 57010262551ca79eb68b13b36a92b3e430d44512..223ed82c1c6e9a7708bc9f44ff7b799ed9d87870 100644
--- a/test/built-ins/Atomics/exchange/non-views.js
+++ b/test/built-ins/Atomics/exchange/non-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.exchange
 description: >
   Test Atomics.exchange on view values other than TypedArrays
 includes: [testAtomics.js]
diff --git a/test/built-ins/Atomics/exchange/nonshared-int-views.js b/test/built-ins/Atomics/exchange/nonshared-int-views.js
index fa07e5fea6401a806b14927d5aa406aa5432b30f..1fcb7ebea9278f7bb2603ba58721ad994219a108 100644
--- a/test/built-ins/Atomics/exchange/nonshared-int-views.js
+++ b/test/built-ins/Atomics/exchange/nonshared-int-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.exchange
 description: >
   Test Atomics.exchange on non-shared integer TypedArrays
 includes: [testTypedArray.js]
diff --git a/test/built-ins/Atomics/exchange/shared-nonint-views.js b/test/built-ins/Atomics/exchange/shared-nonint-views.js
index 68f70e2041d7f04c6ac17fa36c4bd6c81baffe10..fdcf116b22bf5ddb091ab6b85e79e091e0f3ccad 100644
--- a/test/built-ins/Atomics/exchange/shared-nonint-views.js
+++ b/test/built-ins/Atomics/exchange/shared-nonint-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.exchange
 description: >
   Test Atomics.exchange on shared non-integer TypedArrays
 includes: [testTypedArray.js]
diff --git a/test/built-ins/Atomics/isLockFree/corner-cases.js b/test/built-ins/Atomics/isLockFree/corner-cases.js
index 283338ba57817e8a463d455ea75f5d48c0285c69..fb364030c44ad3ea436da1072543609a072139ac 100644
--- a/test/built-ins/Atomics/isLockFree/corner-cases.js
+++ b/test/built-ins/Atomics/isLockFree/corner-cases.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.islockfree
 description: >
   Test isLockFree on various non-intuitive arguments
 ---*/
diff --git a/test/built-ins/Atomics/isLockFree/descriptor.js b/test/built-ins/Atomics/isLockFree/descriptor.js
index 822696affd73d44752ad343699cae0a299a3237c..f8a9354c8e8869f76fb71dafc2510c3dd69c9aa1 100644
--- a/test/built-ins/Atomics/isLockFree/descriptor.js
+++ b/test/built-ins/Atomics/isLockFree/descriptor.js
@@ -3,6 +3,7 @@
 // This code is governed by the license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.islockfree
 description: Testing descriptor property of Atomics.add
 includes: [propertyHelper.js]
 ---*/
diff --git a/test/built-ins/Atomics/isLockFree/length.js b/test/built-ins/Atomics/isLockFree/length.js
index 4dc1e6de6239b61c78f26dd3b6d32e1fb75fa97b..345ed34446002ed3328b47c7423fc7532ed7867a 100644
--- a/test/built-ins/Atomics/isLockFree/length.js
+++ b/test/built-ins/Atomics/isLockFree/length.js
@@ -3,6 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.islockfree
 description: >
   Atomics.isLockFree.length is 1.
 info: >
diff --git a/test/built-ins/Atomics/isLockFree/name.js b/test/built-ins/Atomics/isLockFree/name.js
index e7926b4508a5c03ca428d18c2057e42d4872f57b..ad84cd81a109c4586aae1b17193b617c93890e59 100644
--- a/test/built-ins/Atomics/isLockFree/name.js
+++ b/test/built-ins/Atomics/isLockFree/name.js
@@ -3,6 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.islockfree
 description: >
   Atomics.isLockFree.name is "isLockFree".
 includes: [propertyHelper.js]
diff --git a/test/built-ins/Atomics/isLockFree/value.js b/test/built-ins/Atomics/isLockFree/value.js
index 93b6bee2b929176d3c10ae9eb36cc2edde838bb9..4b8164716f5df6d2df5eb9f9036d2cb5d6239838 100644
--- a/test/built-ins/Atomics/isLockFree/value.js
+++ b/test/built-ins/Atomics/isLockFree/value.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.islockfree
 description: >
   Test isLockFree on nonnegative integer arguments
 ---*/
diff --git a/test/built-ins/Atomics/load/bad-range.js b/test/built-ins/Atomics/load/bad-range.js
index 9f5071780c2f505982c4b39564f405ccbd9793be..3600885d26e1cc02e6d63077dabcef43cc522b26 100644
--- a/test/built-ins/Atomics/load/bad-range.js
+++ b/test/built-ins/Atomics/load/bad-range.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.load
 description: >
   Test range checking of Atomics.load on arrays that allow atomic operations
 includes: [testAtomics.js, testTypedArray.js]
diff --git a/test/built-ins/Atomics/load/descriptor.js b/test/built-ins/Atomics/load/descriptor.js
index 033a2e89306060250132c5cb85ca4e33830b649b..031d33504a5603817c5b80e95dc2101032d95333 100644
--- a/test/built-ins/Atomics/load/descriptor.js
+++ b/test/built-ins/Atomics/load/descriptor.js
@@ -3,6 +3,7 @@
 // This code is governed by the license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.load
 description: Testing descriptor property of Atomics.load
 includes: [propertyHelper.js]
 ---*/
diff --git a/test/built-ins/Atomics/load/good-views.js b/test/built-ins/Atomics/load/good-views.js
index cc8e0a15a4a068aaf2d233e5169e72d44a3f57f6..43f007d7d1d927358ea3c4342776e05284247cbd 100644
--- a/test/built-ins/Atomics/load/good-views.js
+++ b/test/built-ins/Atomics/load/good-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.load
 description: Test Atomics.load on arrays that allow atomic operations.
 includes: [testAtomics.js, testTypedArray.js]
 ---*/
diff --git a/test/built-ins/Atomics/load/length.js b/test/built-ins/Atomics/load/length.js
index f85c87818231d5d41bc851bfb9fdeaae1ff74fa9..86be94a4500c721da41a95251d7f7f8328f5927b 100644
--- a/test/built-ins/Atomics/load/length.js
+++ b/test/built-ins/Atomics/load/length.js
@@ -3,6 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.load
 description: >
   Atomics.load.length is 2.
 info: >
diff --git a/test/built-ins/Atomics/load/name.js b/test/built-ins/Atomics/load/name.js
index ab212ff121fbec366ad0b61a5e3deca994b5ac21..40cd2a6d1faaa85afd4ce36802f615c25f8de8bf 100644
--- a/test/built-ins/Atomics/load/name.js
+++ b/test/built-ins/Atomics/load/name.js
@@ -3,6 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.load
 description: >
   Atomics.load.name is "load".
 includes: [propertyHelper.js]
diff --git a/test/built-ins/Atomics/load/non-views.js b/test/built-ins/Atomics/load/non-views.js
index 96dcb156265f46562d5a3d55f6788ac5316aaa68..93e6f729f2bf768e8f3814156643366b4c719a45 100644
--- a/test/built-ins/Atomics/load/non-views.js
+++ b/test/built-ins/Atomics/load/non-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.load
 description: >
   Test Atomics.load on view values other than TypedArrays
 includes: [testAtomics.js]
diff --git a/test/built-ins/Atomics/load/nonshared-int-views.js b/test/built-ins/Atomics/load/nonshared-int-views.js
index 1d722c4147dae1799fb102593e750c6d0fe6746c..0eda4bbecbb5e0b1be0683109f567cf56924a387 100644
--- a/test/built-ins/Atomics/load/nonshared-int-views.js
+++ b/test/built-ins/Atomics/load/nonshared-int-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.load
 description: >
   Test Atomics.load on non-shared integer TypedArrays
 includes: [testTypedArray.js]
diff --git a/test/built-ins/Atomics/load/shared-nonint-views.js b/test/built-ins/Atomics/load/shared-nonint-views.js
index 4384170dd26b62867bb649587910aa7f6f7889fc..3067f4f3d1f052d608b62cd57e5a1497065aa535 100644
--- a/test/built-ins/Atomics/load/shared-nonint-views.js
+++ b/test/built-ins/Atomics/load/shared-nonint-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.load
 description: >
   Test Atomics.load on shared non-integer TypedArrays
 includes: [testTypedArray.js]
diff --git a/test/built-ins/Atomics/or/bad-range.js b/test/built-ins/Atomics/or/bad-range.js
index f4b1feb5a0d994ae6e76dad6ec55ef53d0dfd3ac..2921dd9adee568a73b6f5f191c85e38ea5d77f69 100644
--- a/test/built-ins/Atomics/or/bad-range.js
+++ b/test/built-ins/Atomics/or/bad-range.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.or
 description: >
   Test range checking of Atomics.or on arrays that allow atomic operations
 includes: [testAtomics.js, testTypedArray.js]
diff --git a/test/built-ins/Atomics/or/descriptor.js b/test/built-ins/Atomics/or/descriptor.js
index 9e8db569f0167929c3bbbd3f279325498b3c2655..72d9beefadc73d33acb02e77ca2e12155bfd2e26 100644
--- a/test/built-ins/Atomics/or/descriptor.js
+++ b/test/built-ins/Atomics/or/descriptor.js
@@ -3,6 +3,7 @@
 // This code is governed by the license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.or
 description: Testing descriptor property of Atomics.or
 includes: [propertyHelper.js]
 ---*/
diff --git a/test/built-ins/Atomics/or/good-views.js b/test/built-ins/Atomics/or/good-views.js
index 9e5da28ec6e2977dbdc3f45aebfa1651b69ef9fd..49c1d1da671ab4b0756ecac823e471474cde718c 100644
--- a/test/built-ins/Atomics/or/good-views.js
+++ b/test/built-ins/Atomics/or/good-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.or
 description: Test Atomics.or on arrays that allow atomic operations
 includes: [testAtomics.js, testTypedArray.js]
 ---*/
diff --git a/test/built-ins/Atomics/or/length.js b/test/built-ins/Atomics/or/length.js
index 4dce3049c5c4e3212e242a21a8ad0892e62bd33a..4e98cc7043d719b1a65c1612e0321f6e9bad9165 100644
--- a/test/built-ins/Atomics/or/length.js
+++ b/test/built-ins/Atomics/or/length.js
@@ -3,6 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.or
 description: >
   Atomics.or.length is 3.
 info: >
diff --git a/test/built-ins/Atomics/or/name.js b/test/built-ins/Atomics/or/name.js
index 5881777052bde975111894931282fc25d6c30f9d..ca004416af478106cddd695522004f4585a7d55f 100644
--- a/test/built-ins/Atomics/or/name.js
+++ b/test/built-ins/Atomics/or/name.js
@@ -3,6 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.or
 description: >
   Atomics.or.name is "or".
 includes: [propertyHelper.js]
diff --git a/test/built-ins/Atomics/or/non-views.js b/test/built-ins/Atomics/or/non-views.js
index ad0b820428dde1be5714773e9a7fd694a31d252a..48b781b1a385426b0359e5331b0211b022a5a46f 100644
--- a/test/built-ins/Atomics/or/non-views.js
+++ b/test/built-ins/Atomics/or/non-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.or
 description: >
   Test Atomics.or on view values other than TypedArrays
 includes: [testAtomics.js]
diff --git a/test/built-ins/Atomics/or/nonshared-int-views.js b/test/built-ins/Atomics/or/nonshared-int-views.js
index ae11cf4aaa5c949ac4076ef2b5df5c3fe5f88f6f..50816c78bbbcc85f98df9b504de0f105e66e5d77 100644
--- a/test/built-ins/Atomics/or/nonshared-int-views.js
+++ b/test/built-ins/Atomics/or/nonshared-int-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.or
 description: >
   Test Atomics.or on non-shared integer TypedArrays
 includes: [testTypedArray.js]
diff --git a/test/built-ins/Atomics/or/shared-nonint-views.js b/test/built-ins/Atomics/or/shared-nonint-views.js
index 2b7fdb1b07f3aba7b00c0dab600e94fbc52d183d..d968f31c34167fcbe27d9fba7eed0e11bc8f7e1d 100644
--- a/test/built-ins/Atomics/or/shared-nonint-views.js
+++ b/test/built-ins/Atomics/or/shared-nonint-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.or
 description: >
   Test Atomics.or on shared non-integer TypedArrays
 includes: [testTypedArray.js]
diff --git a/test/built-ins/Atomics/prop-desc.js b/test/built-ins/Atomics/prop-desc.js
index 220433d02e16467b84835f27955f11d1b278758b..67eff07a07f3a66aea443349e6549659f49a27c9 100644
--- a/test/built-ins/Atomics/prop-desc.js
+++ b/test/built-ins/Atomics/prop-desc.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics-object
 description: >
   Property descriptor of Atomics
 info: |
diff --git a/test/built-ins/Atomics/proto.js b/test/built-ins/Atomics/proto.js
index 47e96ec28a380dc657b85f8d1187484ca65f18cf..ce8649ba47f8ccc262793ba94b5e69e84283f9a1 100644
--- a/test/built-ins/Atomics/proto.js
+++ b/test/built-ins/Atomics/proto.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics-object
 description: >
   The prototype of Atomics is Object.prototype
 info: |
diff --git a/test/built-ins/Atomics/store/bad-range.js b/test/built-ins/Atomics/store/bad-range.js
index 90cd3d2cdf5a1046d8e6c08d7da213c3020002c6..0d3caf8c65ed3caee1102146c7a568b4da92b458 100644
--- a/test/built-ins/Atomics/store/bad-range.js
+++ b/test/built-ins/Atomics/store/bad-range.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.store
 description: >
   Test range checking of Atomics.store on arrays that allow atomic operations
 includes: [testAtomics.js, testTypedArray.js]
diff --git a/test/built-ins/Atomics/store/descriptor.js b/test/built-ins/Atomics/store/descriptor.js
index df883fa8cbbe4fb9aa922e0336223f62ee8c72e8..c8192dbfc2eecfb2cb9d4a9ce35208c0ef6f4ee4 100644
--- a/test/built-ins/Atomics/store/descriptor.js
+++ b/test/built-ins/Atomics/store/descriptor.js
@@ -3,6 +3,7 @@
 // This code is governed by the license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.store
 description: Testing descriptor property of Atomics.store
 includes: [propertyHelper.js]
 ---*/
diff --git a/test/built-ins/Atomics/store/good-views.js b/test/built-ins/Atomics/store/good-views.js
index 511493e170d5362d80a8a6f211e7a113582beaf7..9073bea1ed6e5ec6d77f050af67197ad1c15b384 100644
--- a/test/built-ins/Atomics/store/good-views.js
+++ b/test/built-ins/Atomics/store/good-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.store
 description: Test Atomics.store on arrays that allow atomic operations.
 includes: [testAtomics.js, testTypedArray.js]
 ---*/
diff --git a/test/built-ins/Atomics/store/length.js b/test/built-ins/Atomics/store/length.js
index 871ef0a2b9cf45ea9cb19ad9ff54747bc81bd275..4d81abb16caac2448f477ac8053d90bcb491ea10 100644
--- a/test/built-ins/Atomics/store/length.js
+++ b/test/built-ins/Atomics/store/length.js
@@ -3,6 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.store
 description: >
   Atomics.store.length is 3.
 info: >
diff --git a/test/built-ins/Atomics/store/name.js b/test/built-ins/Atomics/store/name.js
index 442ecc58af486f0539e2a91eac1f73c210ba8d2c..8d0ee81f0167dcb41bf5e4c2cc761136d3e99c57 100644
--- a/test/built-ins/Atomics/store/name.js
+++ b/test/built-ins/Atomics/store/name.js
@@ -3,6 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.store
 description: >
   Atomics.store.name is "store".
 includes: [propertyHelper.js]
diff --git a/test/built-ins/Atomics/store/non-views.js b/test/built-ins/Atomics/store/non-views.js
index ec1fd7b393aad21fe15fbcf3099219a208e3d273..752b7652a63b13e28008332e569215a8c2217ba9 100644
--- a/test/built-ins/Atomics/store/non-views.js
+++ b/test/built-ins/Atomics/store/non-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.store
 description: >
   Test Atomics.store on view values other than TypedArrays
 includes: [testAtomics.js]
diff --git a/test/built-ins/Atomics/store/nonshared-int-views.js b/test/built-ins/Atomics/store/nonshared-int-views.js
index a71b57dde79827d1fee1d557f5851c2fb4a74e82..5d9646ab9c9cab824ea20c3748641919e332da13 100644
--- a/test/built-ins/Atomics/store/nonshared-int-views.js
+++ b/test/built-ins/Atomics/store/nonshared-int-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.store
 description: >
   Test Atomics.store on non-shared integer TypedArrays
 includes: [testTypedArray.js]
diff --git a/test/built-ins/Atomics/store/shared-nonint-views.js b/test/built-ins/Atomics/store/shared-nonint-views.js
index 81a4c7ae46a5e9d02fd58e8a591c3788de498baa..19eccf3a4ade9487e93c2fee0bb4d7a866797346 100644
--- a/test/built-ins/Atomics/store/shared-nonint-views.js
+++ b/test/built-ins/Atomics/store/shared-nonint-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.store
 description: >
   Test Atomics.store on shared non-integer TypedArrays
 includes: [testTypedArray.js]
diff --git a/test/built-ins/Atomics/sub/bad-range.js b/test/built-ins/Atomics/sub/bad-range.js
index 902bb21740919c06435284f781a9ad1ab9edcb18..355716ad638a4b828ed164cab4e16360460ffe11 100644
--- a/test/built-ins/Atomics/sub/bad-range.js
+++ b/test/built-ins/Atomics/sub/bad-range.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.sub
 description: >
   Test range checking of Atomics.sub on arrays that allow atomic operations
 includes: [testAtomics.js, testTypedArray.js]
diff --git a/test/built-ins/Atomics/sub/descriptor.js b/test/built-ins/Atomics/sub/descriptor.js
index e9ca6f92765d8372c36f140383dd0181a2da5fef..d7aa2cc86f07b5e5d64b977afdeeafe818400248 100644
--- a/test/built-ins/Atomics/sub/descriptor.js
+++ b/test/built-ins/Atomics/sub/descriptor.js
@@ -3,6 +3,7 @@
 // This code is governed by the license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.sub
 description: Testing descriptor property of Atomics.sub
 includes: [propertyHelper.js]
 ---*/
diff --git a/test/built-ins/Atomics/sub/good-views.js b/test/built-ins/Atomics/sub/good-views.js
index cdbe4b22c2be4b0d99eb140f350f019820e1ccfa..e9d60cd780abeb73f49825ed33076d0b410e8ddf 100644
--- a/test/built-ins/Atomics/sub/good-views.js
+++ b/test/built-ins/Atomics/sub/good-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.sub
 description: Test Atomics.sub on arrays that allow atomic operations
 includes: [testAtomics.js, testTypedArray.js]
 ---*/
diff --git a/test/built-ins/Atomics/sub/length.js b/test/built-ins/Atomics/sub/length.js
index 12e070c1399f757543d45c511bb9357356267595..067a328cd2917506900347981635e133181acb8d 100644
--- a/test/built-ins/Atomics/sub/length.js
+++ b/test/built-ins/Atomics/sub/length.js
@@ -3,6 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.sub
 description: >
   Atomics.sub.length is 3.
 info: >
diff --git a/test/built-ins/Atomics/sub/name.js b/test/built-ins/Atomics/sub/name.js
index 665a6e0ae0afffb1071bfe03ebe0e7a695ea0a7c..47dd0400eab6bfbef808091d5d31a5b5b8074f07 100644
--- a/test/built-ins/Atomics/sub/name.js
+++ b/test/built-ins/Atomics/sub/name.js
@@ -3,6 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.sub
 description: >
   Atomics.sub.name is "sub".
 includes: [propertyHelper.js]
diff --git a/test/built-ins/Atomics/sub/non-views.js b/test/built-ins/Atomics/sub/non-views.js
index 700074f9cd86e0a745c3955a6650f1b86b7d9196..55f0e7509ceadf7fd8999af164442c8657f2ff9b 100644
--- a/test/built-ins/Atomics/sub/non-views.js
+++ b/test/built-ins/Atomics/sub/non-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.sub
 description: >
   Test Atomics.sub on view values other than TypedArrays
 includes: [testAtomics.js]
diff --git a/test/built-ins/Atomics/sub/nonshared-int-views.js b/test/built-ins/Atomics/sub/nonshared-int-views.js
index f73d0469df995ecf3a75287ae8960251d4586b0d..fa4b0dbbbc6b989d935294bb2a10d6e526c6f480 100644
--- a/test/built-ins/Atomics/sub/nonshared-int-views.js
+++ b/test/built-ins/Atomics/sub/nonshared-int-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.sub
 description: >
   Test Atomics.sub on non-shared integer TypedArrays
 includes: [testTypedArray.js]
diff --git a/test/built-ins/Atomics/sub/shared-nonint-views.js b/test/built-ins/Atomics/sub/shared-nonint-views.js
index da38d5bfdce969c9cee2e592d75d3a3735af25de..c67eff719e0be3e7eaa794b44c8f62fd4028dd07 100644
--- a/test/built-ins/Atomics/sub/shared-nonint-views.js
+++ b/test/built-ins/Atomics/sub/shared-nonint-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.sub
 description: >
   Test Atomics.sub on shared non-integer TypedArrays
 includes: [testTypedArray.js]
diff --git a/test/built-ins/Atomics/wait/bad-range.js b/test/built-ins/Atomics/wait/bad-range.js
index cd75b283619243bcf8ee2eeb0a5052704df0edec..12a41809dea9db913a95f0fff26736e001426edc 100644
--- a/test/built-ins/Atomics/wait/bad-range.js
+++ b/test/built-ins/Atomics/wait/bad-range.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wait
 description: >
   Test range checking of Atomics.wait on arrays that allow atomic operations
 includes: [testAtomics.js]
diff --git a/test/built-ins/Atomics/wait/descriptor.js b/test/built-ins/Atomics/wait/descriptor.js
index c01712cbe8d9df42cdd6c5c0b405929e9d43d312..6ede71ded26e118704830e7cdf23e7215a2bd2f9 100644
--- a/test/built-ins/Atomics/wait/descriptor.js
+++ b/test/built-ins/Atomics/wait/descriptor.js
@@ -3,6 +3,7 @@
 // This code is governed by the license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wait
 description: Testing descriptor property of Atomics.wait
 includes: [propertyHelper.js]
 ---*/
diff --git a/test/built-ins/Atomics/wait/did-timeout.js b/test/built-ins/Atomics/wait/did-timeout.js
index 3e904a78a0d0fbfbd87048907d7739c759f70c8e..5a8f612118f18eaef64d9987972f5e20e68233e4 100644
--- a/test/built-ins/Atomics/wait/did-timeout.js
+++ b/test/built-ins/Atomics/wait/did-timeout.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wait
 description: >
   Test that Atomics.wait returns the right result when it timed out and that
   the time to time out is reasonable.
diff --git a/test/built-ins/Atomics/wait/good-views.js b/test/built-ins/Atomics/wait/good-views.js
index 72bd26b3ecf098e9b04fc349a24af6898385233d..ff6dcf3a8c526f75f9538b0f6f4411802a375d4c 100644
--- a/test/built-ins/Atomics/wait/good-views.js
+++ b/test/built-ins/Atomics/wait/good-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wait
 description: >
   Test Atomics.wait on arrays that allow atomic operations,
   in an Agent that is allowed to wait.
diff --git a/test/built-ins/Atomics/wait/length.js b/test/built-ins/Atomics/wait/length.js
index 00a26d53d6aece23081a305d334f06dc245883de..f86342073daaf95be137f1a6a3311262445130d6 100644
--- a/test/built-ins/Atomics/wait/length.js
+++ b/test/built-ins/Atomics/wait/length.js
@@ -3,6 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wait
 description: >
   Atomics.wait.length is 4.
 info: >
diff --git a/test/built-ins/Atomics/wait/name.js b/test/built-ins/Atomics/wait/name.js
index 0fd9d30c9188d7c20d93ebdd3991ce047016748f..95cf0af36c2e4a56558b250cfa5033a272e9263c 100644
--- a/test/built-ins/Atomics/wait/name.js
+++ b/test/built-ins/Atomics/wait/name.js
@@ -3,6 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wait
 description: >
   Atomics.wait.name is "wait".
 includes: [propertyHelper.js]
diff --git a/test/built-ins/Atomics/wait/nan-timeout.js b/test/built-ins/Atomics/wait/nan-timeout.js
index 4060346d99878856cf2ab1229af665ec032d2783..c3e773ef32d7a97444ceb0f3a644fbce0e441885 100644
--- a/test/built-ins/Atomics/wait/nan-timeout.js
+++ b/test/built-ins/Atomics/wait/nan-timeout.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wait
 description: >
   Test that Atomics.wait does not time out with a NaN timeout
 ---*/
diff --git a/test/built-ins/Atomics/wait/negative-timeout.js b/test/built-ins/Atomics/wait/negative-timeout.js
index 388d3a96e2276aa64d8650d2f2cc3f44cb3588bf..26c32fd20d2252de25d4df7bcbcf0f8c9af32117 100644
--- a/test/built-ins/Atomics/wait/negative-timeout.js
+++ b/test/built-ins/Atomics/wait/negative-timeout.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wait
 description: >
   Test that Atomics.wait times out with a negative timeout
 ---*/
diff --git a/test/built-ins/Atomics/wait/no-spurious-wakeup.js b/test/built-ins/Atomics/wait/no-spurious-wakeup.js
index 011d2604f7a813d8eb943ddfdac95f8fa1abcd6d..8d5f696ac48e032706a281820b7dfd7f31a04cb3 100644
--- a/test/built-ins/Atomics/wait/no-spurious-wakeup.js
+++ b/test/built-ins/Atomics/wait/no-spurious-wakeup.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wait
 description: >
   Test that Atomics.wait actually waits and does not spuriously wake
   up when the memory value is changed.
diff --git a/test/built-ins/Atomics/wait/non-views.js b/test/built-ins/Atomics/wait/non-views.js
index 22504528ac840b096cd322b9d811ca52f5086fe1..925a51711d561dff0838da97f5b88222572761b2 100644
--- a/test/built-ins/Atomics/wait/non-views.js
+++ b/test/built-ins/Atomics/wait/non-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wait
 description: >
   Test Atomics.wait on view values other than TypedArrays
 includes: [testAtomics.js]
diff --git a/test/built-ins/Atomics/wait/nonshared-int-views.js b/test/built-ins/Atomics/wait/nonshared-int-views.js
index e058d9efc07ec11121649e5b73195549e6ce64d4..14d110e4c78f3fefc5161c6f4b98c3030483fd0e 100644
--- a/test/built-ins/Atomics/wait/nonshared-int-views.js
+++ b/test/built-ins/Atomics/wait/nonshared-int-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wait
 description: >
   Test Atomics.wait on non-shared integer TypedArrays
 includes: [testTypedArray.js]
diff --git a/test/built-ins/Atomics/wait/shared-nonint-views.js b/test/built-ins/Atomics/wait/shared-nonint-views.js
index bfc9b34a00b0bfee6b4f987db53c2512b584dcdc..9987c33d26c191aa237a954ca3bc2738381911d7 100644
--- a/test/built-ins/Atomics/wait/shared-nonint-views.js
+++ b/test/built-ins/Atomics/wait/shared-nonint-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wait
 description: >
   Test Atomics.wait on shared non-integer TypedArrays
 includes: [testTypedArray.js]
diff --git a/test/built-ins/Atomics/wait/was-woken.js b/test/built-ins/Atomics/wait/was-woken.js
index 84850b1f35cd1a5f2a8261dc21e32769668a0b9b..c2e11cb0edce89875b454adecb8344f646f4816c 100644
--- a/test/built-ins/Atomics/wait/was-woken.js
+++ b/test/built-ins/Atomics/wait/was-woken.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wait
 description: >
   Test that Atomics.wait returns the right result when it was awoken.
 ---*/
diff --git a/test/built-ins/Atomics/wake/bad-range.js b/test/built-ins/Atomics/wake/bad-range.js
index a8085f29ed55fec79a4b7ff2655a96ab66f7c36a..fb640b6c5d49315dc26cf4a6cbcfacfed35af3c8 100644
--- a/test/built-ins/Atomics/wake/bad-range.js
+++ b/test/built-ins/Atomics/wake/bad-range.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wake
 description: >
   Test range checking of Atomics.wake on arrays that allow atomic operations
 includes: [testAtomics.js]
diff --git a/test/built-ins/Atomics/wake/counts.js b/test/built-ins/Atomics/wake/counts.js
index 732fa92d90ec399b7beb3c97011264c9f66606ed..d2ee14e0c37a36fc21894a4e65e34a3e67dd1b4c 100644
--- a/test/built-ins/Atomics/wake/counts.js
+++ b/test/built-ins/Atomics/wake/counts.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wake
 description: >
   Allowed boundary cases of the third 'count' argument to Atomics.wake
 ---*/
diff --git a/test/built-ins/Atomics/wake/descriptor.js b/test/built-ins/Atomics/wake/descriptor.js
index 006433b09172acf3e94ffec334e9cfac338ab107..eaf13a7b76831bcbf880889544db888a03661d6b 100644
--- a/test/built-ins/Atomics/wake/descriptor.js
+++ b/test/built-ins/Atomics/wake/descriptor.js
@@ -3,6 +3,7 @@
 // This code is governed by the license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wake
 description: Testing descriptor property of Atomics.wake
 includes: [propertyHelper.js]
 ---*/
diff --git a/test/built-ins/Atomics/wake/good-views.js b/test/built-ins/Atomics/wake/good-views.js
index cb051c4eeb6adcebc094a24f0910e2fd2f01e5d0..33fdc1b74bf56d3a0355a1d17e79f088cdeddd42 100644
--- a/test/built-ins/Atomics/wake/good-views.js
+++ b/test/built-ins/Atomics/wake/good-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wake
 description: >
   Test Atomics.wait on arrays that allow atomic operations,
   in an Agent that is allowed to wait.  There is only the one Agent.
diff --git a/test/built-ins/Atomics/wake/length.js b/test/built-ins/Atomics/wake/length.js
index 9706bec1a2c1c2e7c5a7b3c207867319e1f1ef36..ed1792f3eb11feab32ed55f8e68c25106acf6df7 100644
--- a/test/built-ins/Atomics/wake/length.js
+++ b/test/built-ins/Atomics/wake/length.js
@@ -3,6 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wake
 description: >
   Atomics.wake.length is 3.
 info: >
diff --git a/test/built-ins/Atomics/wake/name.js b/test/built-ins/Atomics/wake/name.js
index 8a875a5fa14b72f92c9d0738fcc4a89da125664c..3ddae8d322d2a7dd56ec1cabee761089961d6185 100644
--- a/test/built-ins/Atomics/wake/name.js
+++ b/test/built-ins/Atomics/wake/name.js
@@ -3,6 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wake
 description: >
   Atomics.wake.name is "wake".
 includes: [propertyHelper.js]
diff --git a/test/built-ins/Atomics/wake/non-views.js b/test/built-ins/Atomics/wake/non-views.js
index be17dda2662351d79206448f895968e6742d6192..bcbd089d8292db5f5c273826bf02a951c1c654b5 100644
--- a/test/built-ins/Atomics/wake/non-views.js
+++ b/test/built-ins/Atomics/wake/non-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wake
 description: >
   Test Atomics.wake on view values other than TypedArrays
 includes: [testAtomics.js]
diff --git a/test/built-ins/Atomics/wake/nonshared-int-views.js b/test/built-ins/Atomics/wake/nonshared-int-views.js
index 51fea5db4ed5bbd34743812e6723e6835fb4f070..6488e9cd59a9ec6cc36d79c83602bde970acee2f 100644
--- a/test/built-ins/Atomics/wake/nonshared-int-views.js
+++ b/test/built-ins/Atomics/wake/nonshared-int-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wake
 description: >
   Test Atomics.wake on non-shared integer TypedArrays
 includes: [testTypedArray.js]
diff --git a/test/built-ins/Atomics/wake/shared-nonint-views.js b/test/built-ins/Atomics/wake/shared-nonint-views.js
index 02b2074c58a3972367a890f58abbee41cd66c6c2..86b721dce8fc205c4ba0da9c3271bc86221a9ff8 100644
--- a/test/built-ins/Atomics/wake/shared-nonint-views.js
+++ b/test/built-ins/Atomics/wake/shared-nonint-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wake
 description: >
   Test Atomics.wake on shared non-integer TypedArrays
 includes: [testTypedArray.js]
diff --git a/test/built-ins/Atomics/wake/wake-all-on-loc.js b/test/built-ins/Atomics/wake/wake-all-on-loc.js
index dbb4a151e7d7400bc5e6f450ec9e3955c998cb00..6ca470b3690ac70dfee83d4b96145605f87642f6 100644
--- a/test/built-ins/Atomics/wake/wake-all-on-loc.js
+++ b/test/built-ins/Atomics/wake/wake-all-on-loc.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wake
 description: >
   Test that Atomics.wake wakes all waiters on a location, but does not
   wake waiters on other locations.
diff --git a/test/built-ins/Atomics/wake/wake-all.js b/test/built-ins/Atomics/wake/wake-all.js
index 141e35cb4afa36feacaf0cb6482d3df13d6268ad..1ce6f249cc62331901cf2ad75f07724fd16210e2 100644
--- a/test/built-ins/Atomics/wake/wake-all.js
+++ b/test/built-ins/Atomics/wake/wake-all.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wake
 description: >
   Test that Atomics.wake wakes all waiters if that's what the count is.
 ---*/
diff --git a/test/built-ins/Atomics/wake/wake-in-order.js b/test/built-ins/Atomics/wake/wake-in-order.js
index fb42dd98a0bf0578700c2fc2d034e4253db08a9d..4c10261e38650cfbdac16542f4cf142648d12fa6 100644
--- a/test/built-ins/Atomics/wake/wake-in-order.js
+++ b/test/built-ins/Atomics/wake/wake-in-order.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wake
 description: >
   Test that Atomics.wake wakes agents in the order they are waiting.
 ---*/
diff --git a/test/built-ins/Atomics/wake/wake-nan.js b/test/built-ins/Atomics/wake/wake-nan.js
index 343614fb0a4f738fc78e66471f63ee38d962c6a3..a4e8868ade4ad2f11d0e45d4b82d8128bc667acb 100644
--- a/test/built-ins/Atomics/wake/wake-nan.js
+++ b/test/built-ins/Atomics/wake/wake-nan.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wake
 description: >
   Test that Atomics.wake wakes zero waiters if the count is NaN
 ---*/
diff --git a/test/built-ins/Atomics/wake/wake-negative.js b/test/built-ins/Atomics/wake/wake-negative.js
index 4b6ad7baa0584eda4a8044e54db46eb67a4429b1..49cb0609270bf8c31bd67b7a5340e13746f313ae 100644
--- a/test/built-ins/Atomics/wake/wake-negative.js
+++ b/test/built-ins/Atomics/wake/wake-negative.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wake
 description: >
   Test that Atomics.wake wakes zero waiters if the count is negative
 ---*/
diff --git a/test/built-ins/Atomics/wake/wake-one.js b/test/built-ins/Atomics/wake/wake-one.js
index 30348640ba70000b38f7c063485ce0575d6a933a..f17d39c9db79a77a0fcf43504d1ee3e35bcbc1a3 100644
--- a/test/built-ins/Atomics/wake/wake-one.js
+++ b/test/built-ins/Atomics/wake/wake-one.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wake
 description: >
   Test that Atomics.wake wakes one waiter if that's what the count is.
 ---*/
diff --git a/test/built-ins/Atomics/wake/wake-two.js b/test/built-ins/Atomics/wake/wake-two.js
index 29cc7bd037910723f1e4bba307d0a8134e1b9da8..ff3dc1679acf2142357c9190b27dbffef2e8e6ae 100644
--- a/test/built-ins/Atomics/wake/wake-two.js
+++ b/test/built-ins/Atomics/wake/wake-two.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wake
 description: >
   Test that Atomics.wake wakes two waiters if that's what the count is.
 ---*/
diff --git a/test/built-ins/Atomics/wake/wake-zero.js b/test/built-ins/Atomics/wake/wake-zero.js
index c4b17ebc3e4cccdbc57ae197bd210f272c24cbf1..c7bf3b62be2ff625035abeeac7ae147d66f79257 100644
--- a/test/built-ins/Atomics/wake/wake-zero.js
+++ b/test/built-ins/Atomics/wake/wake-zero.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.wake
 description: >
   Test that Atomics.wake wakes zero waiters if that's what the count is.
 ---*/
diff --git a/test/built-ins/Atomics/xor/bad-range.js b/test/built-ins/Atomics/xor/bad-range.js
index ed19315b955047aa79bd10770521eb95bb6a242b..71515fcf878954d92d3535045ed9060cc023a0ba 100644
--- a/test/built-ins/Atomics/xor/bad-range.js
+++ b/test/built-ins/Atomics/xor/bad-range.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.xor
 description: >
   Test range checking of Atomics.xor on arrays that allow atomic operations
 includes: [testAtomics.js, testTypedArray.js]
diff --git a/test/built-ins/Atomics/xor/descriptor.js b/test/built-ins/Atomics/xor/descriptor.js
index 8bd1aaa8b3b9bfcb8d8df4ab81fcaf134da7e8a6..e5c8daa724cfe9136754782ff7c9e1cf08d274bb 100644
--- a/test/built-ins/Atomics/xor/descriptor.js
+++ b/test/built-ins/Atomics/xor/descriptor.js
@@ -3,6 +3,7 @@
 // This code is governed by the license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.xor
 description: Testing descriptor property of Atomics.xor
 includes: [propertyHelper.js]
 ---*/
diff --git a/test/built-ins/Atomics/xor/good-views.js b/test/built-ins/Atomics/xor/good-views.js
index 3e10d25a8d3e3493513a372ab1e7d6519254a3a7..665a065ef62c0e08ddb602b10814501138edc5af 100644
--- a/test/built-ins/Atomics/xor/good-views.js
+++ b/test/built-ins/Atomics/xor/good-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.xor
 description: Test Atomics.xor on arrays that allow atomic operations
 includes: [testAtomics.js, testTypedArray.js]
 ---*/
diff --git a/test/built-ins/Atomics/xor/length.js b/test/built-ins/Atomics/xor/length.js
index 65bf3df885a1be5ed44f0466b2bb28a57a5e7407..7b8c8979dc575fec76448c46284b77637477296e 100644
--- a/test/built-ins/Atomics/xor/length.js
+++ b/test/built-ins/Atomics/xor/length.js
@@ -3,6 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.xor
 description: >
   Atomics.xor.length is 3.
 info: >
diff --git a/test/built-ins/Atomics/xor/name.js b/test/built-ins/Atomics/xor/name.js
index 720f5ac7d1e7a7766322716af4a7662da01a19f5..8ef8895581aac1fef1be87bfd4b2e5c6d8505387 100644
--- a/test/built-ins/Atomics/xor/name.js
+++ b/test/built-ins/Atomics/xor/name.js
@@ -3,6 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.xor
 description: >
   Atomics.xor.name is "xor".
 includes: [propertyHelper.js]
diff --git a/test/built-ins/Atomics/xor/non-views.js b/test/built-ins/Atomics/xor/non-views.js
index 59293b75be0c3f7b038aa375cbd9a31772e01ab1..17bba178f1eb3ced0c7497f718b6f0f9e9c154a4 100644
--- a/test/built-ins/Atomics/xor/non-views.js
+++ b/test/built-ins/Atomics/xor/non-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.xor
 description: >
   Test Atomics.xor on view values other than TypedArrays
 includes: [testAtomics.js]
diff --git a/test/built-ins/Atomics/xor/nonshared-int-views.js b/test/built-ins/Atomics/xor/nonshared-int-views.js
index a3652b229f9553557318d9555795e535be048a2d..e7f4a8390f742dd3e060b8fbb09938cef5c064b1 100644
--- a/test/built-ins/Atomics/xor/nonshared-int-views.js
+++ b/test/built-ins/Atomics/xor/nonshared-int-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.xor
 description: >
   Test Atomics.xor on non-shared integer TypedArrays
 includes: [testTypedArray.js]
diff --git a/test/built-ins/Atomics/xor/shared-nonint-views.js b/test/built-ins/Atomics/xor/shared-nonint-views.js
index af5d8910aa862a641c8eb25776902f2548d554d7..29841d79f00f862956bd4ac94e442ec29f120e8a 100644
--- a/test/built-ins/Atomics/xor/shared-nonint-views.js
+++ b/test/built-ins/Atomics/xor/shared-nonint-views.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-atomics.xor
 description: >
   Test Atomics.xor on shared non-integer TypedArrays
 includes: [testTypedArray.js]