diff --git a/test/built-ins/DataView/prototype/Symbol.toStringTag.js b/test/built-ins/DataView/prototype/Symbol.toStringTag.js
index 87fa3275926a3be8cbe0dca7ccf37dd2f7859f83..9e60018ad6e8782cdeb0777ea80cff9257235332 100644
--- a/test/built-ins/DataView/prototype/Symbol.toStringTag.js
+++ b/test/built-ins/DataView/prototype/Symbol.toStringTag.js
@@ -1,6 +1,7 @@
 // Copyright (C) 2015 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
+esid: sec-dataview.prototype-@@tostringtag
 es6id: 24.2.4.21
 description: >
     `Symbol.toStringTag` property descriptor
diff --git a/test/built-ins/DataView/prototype/buffer/length.js b/test/built-ins/DataView/prototype/buffer/length.js
index 6d71e9f6c5fc3189efabb5f8bede28147f48ba5e..2998505dd05afd6681e58b99361ee81a4af5d64a 100644
--- a/test/built-ins/DataView/prototype/buffer/length.js
+++ b/test/built-ins/DataView/prototype/buffer/length.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-get-dataview.prototype.buffer
 es6id: 24.2.4.1
 description: >
   get DataView.prototype.buffer.length is 0.
diff --git a/test/built-ins/DataView/prototype/buffer/name.js b/test/built-ins/DataView/prototype/buffer/name.js
index 50f4adccb272d18365ef0bec783680aa17d4a930..b096d728a348fbad465a48fa5fed95a918419b80 100644
--- a/test/built-ins/DataView/prototype/buffer/name.js
+++ b/test/built-ins/DataView/prototype/buffer/name.js
@@ -1,6 +1,7 @@
 // Copyright (C) 2015 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
+esid: sec-get-dataview.prototype.buffer
 es6id: 24.2.4.2
 description: >
   get DataView.prototype.buffer
diff --git a/test/built-ins/DataView/prototype/byteLength/length.js b/test/built-ins/DataView/prototype/byteLength/length.js
index da9e6af88e0d70707df690ae5483e8ca03f3acb2..80bab4355547e2a361ab1b16b6e20b927dce5ce6 100644
--- a/test/built-ins/DataView/prototype/byteLength/length.js
+++ b/test/built-ins/DataView/prototype/byteLength/length.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-get-dataview.prototype.bytelength
 es6id: 24.2.4.2
 description: >
   get DataView.prototype.byteLength.length is 0.
diff --git a/test/built-ins/DataView/prototype/byteLength/name.js b/test/built-ins/DataView/prototype/byteLength/name.js
index ca4456f684ad5550ac842bcffe84dd10fca58661..8f403077a37dca27877ca8b609602288dd796b56 100644
--- a/test/built-ins/DataView/prototype/byteLength/name.js
+++ b/test/built-ins/DataView/prototype/byteLength/name.js
@@ -1,6 +1,7 @@
 // Copyright (C) 2015 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
+esid: sec-get-dataview.prototype.bytelength
 es6id: 24.2.4.2
 description: >
   get DataView.prototype.byteLength
diff --git a/test/built-ins/DataView/prototype/byteOffset/length.js b/test/built-ins/DataView/prototype/byteOffset/length.js
index d6290c82bf0099f5e654b24a34bd44dc57a869e4..c1cf0576962769a730372e6b8f17046b88e4d5c3 100644
--- a/test/built-ins/DataView/prototype/byteOffset/length.js
+++ b/test/built-ins/DataView/prototype/byteOffset/length.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-get-dataview.prototype.byteoffset
 es6id: 24.2.4.3
 description: >
   get DataView.prototype.byteOffset.length is 0.
diff --git a/test/built-ins/DataView/prototype/byteOffset/name.js b/test/built-ins/DataView/prototype/byteOffset/name.js
index 0f34382f8e12b15e05cc5866118f75fa19d6d96a..8ea782d41e997271fd5e62bc81866843014918d8 100644
--- a/test/built-ins/DataView/prototype/byteOffset/name.js
+++ b/test/built-ins/DataView/prototype/byteOffset/name.js
@@ -1,6 +1,7 @@
 // Copyright (C) 2015 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
+esid: sec-get-dataview.prototype.byteoffset
 es6id: 24.2.4.2
 description: >
   get DataView.prototype.byteOffset
diff --git a/test/built-ins/DataView/prototype/getFloat32/name.js b/test/built-ins/DataView/prototype/getFloat32/name.js
index b0afb76fba4be4910672b7fff3470bc1d5d60e2b..d55f631cd6736c2885753256448780d692af0131 100644
--- a/test/built-ins/DataView/prototype/getFloat32/name.js
+++ b/test/built-ins/DataView/prototype/getFloat32/name.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-dataview.prototype.getfloat32
 es6id: 24.2.4.5
 description: >
   DataView.prototype.getFloat32.name is "getFloat32".
diff --git a/test/built-ins/DataView/prototype/getFloat64/name.js b/test/built-ins/DataView/prototype/getFloat64/name.js
index 7d7301c4fdbb088ba35bf0485871cdeced915c0f..a4713824cffad0f430e3b3bf3d61bafa5da51ffa 100644
--- a/test/built-ins/DataView/prototype/getFloat64/name.js
+++ b/test/built-ins/DataView/prototype/getFloat64/name.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-dataview.prototype.getfloat64
 es6id: 24.2.4.6
 description: >
   DataView.prototype.getFloat64.name is "getFloat64".
diff --git a/test/built-ins/DataView/prototype/getInt16/name.js b/test/built-ins/DataView/prototype/getInt16/name.js
index b61bb435e9f3ac7d8a143a43c1ab83d14c38177e..33b0bd61a2881c0936be7e484431eba3b1768c60 100644
--- a/test/built-ins/DataView/prototype/getInt16/name.js
+++ b/test/built-ins/DataView/prototype/getInt16/name.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-dataview.prototype.getint16
 es6id: 24.2.4.8
 description: >
   DataView.prototype.getInt16.name is "getInt16".
diff --git a/test/built-ins/DataView/prototype/getInt32/name.js b/test/built-ins/DataView/prototype/getInt32/name.js
index 1e1e408c047dd1c1fbedc6d2d545da324c9d924f..d824b65684a7ff62839a0bcd34a00604082eb0f1 100644
--- a/test/built-ins/DataView/prototype/getInt32/name.js
+++ b/test/built-ins/DataView/prototype/getInt32/name.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-dataview.prototype.getint32
 es6id: 24.2.4.9
 description: >
   DataView.prototype.getInt32.name is "getInt32".
diff --git a/test/built-ins/DataView/prototype/getInt8/length.js b/test/built-ins/DataView/prototype/getInt8/length.js
index c1ca98b45539802cff6ad9f5181000bce83e1108..926adf1864c4fecddfc759627f0f3da9f794de7c 100644
--- a/test/built-ins/DataView/prototype/getInt8/length.js
+++ b/test/built-ins/DataView/prototype/getInt8/length.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-dataview.prototype.getint8
 es6id: 24.2.4.7
 description: >
   DataView.prototype.getInt8.length is 1.
diff --git a/test/built-ins/DataView/prototype/getInt8/name.js b/test/built-ins/DataView/prototype/getInt8/name.js
index 8fb9493a549f402347365a4b151ec21087c9418f..eabf608c1a8faea9166fe55579003e6c0170f3aa 100644
--- a/test/built-ins/DataView/prototype/getInt8/name.js
+++ b/test/built-ins/DataView/prototype/getInt8/name.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-dataview.prototype.getint8
 es6id: 24.2.4.7
 description: >
   DataView.prototype.getInt8.name is "getInt8".
diff --git a/test/built-ins/DataView/prototype/getUint16/name.js b/test/built-ins/DataView/prototype/getUint16/name.js
index 754db7d7930e61917aa844b502cb93d43e414c3f..5e33f756236a8539fb075683b9fafb1d294e9f1d 100644
--- a/test/built-ins/DataView/prototype/getUint16/name.js
+++ b/test/built-ins/DataView/prototype/getUint16/name.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-dataview.prototype.getuint16
 es6id: 24.2.4.11
 description: >
   DataView.prototype.getUint16.name is "getUint16".
diff --git a/test/built-ins/DataView/prototype/getUint32/name.js b/test/built-ins/DataView/prototype/getUint32/name.js
index fc022c26da433817ca502b69e6237b37a8be2479..6dfcc244843e9f78321f8ada387aa9f6220a68a2 100644
--- a/test/built-ins/DataView/prototype/getUint32/name.js
+++ b/test/built-ins/DataView/prototype/getUint32/name.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-dataview.prototype.getuint32
 es6id: 24.2.4.12
 description: >
   DataView.prototype.getUint32.name is "getUint32".
diff --git a/test/built-ins/DataView/prototype/getUint8/length.js b/test/built-ins/DataView/prototype/getUint8/length.js
index cce0cd844afca25ce385708f0a884423c6d211a9..4de94e5282bf7a8ea67294d794da2332c260cc07 100644
--- a/test/built-ins/DataView/prototype/getUint8/length.js
+++ b/test/built-ins/DataView/prototype/getUint8/length.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-dataview.prototype.getuint8
 es6id: 24.2.4.10
 description: >
   DataView.prototype.getUint8.length is 1.
diff --git a/test/built-ins/DataView/prototype/getUint8/name.js b/test/built-ins/DataView/prototype/getUint8/name.js
index 269197af46da2cfaf520654649fbb62d45e0390f..10c9bda7f6da5d329d454d805590afb1636b7563 100644
--- a/test/built-ins/DataView/prototype/getUint8/name.js
+++ b/test/built-ins/DataView/prototype/getUint8/name.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-dataview.prototype.getuint8
 es6id: 24.2.4.10
 description: >
   DataView.prototype.getUint8.name is "getUint8".
diff --git a/test/built-ins/DataView/prototype/setFloat32/name.js b/test/built-ins/DataView/prototype/setFloat32/name.js
index 6435989ebd527fed6ac2866ac87fb09d74762393..618f491c045c459001a401108555945342059dce 100644
--- a/test/built-ins/DataView/prototype/setFloat32/name.js
+++ b/test/built-ins/DataView/prototype/setFloat32/name.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-dataview.prototype.setfloat32
 es6id: 24.2.4.13
 description: >
   DataView.prototype.setFloat32.name is "setFloat32".
diff --git a/test/built-ins/DataView/prototype/setFloat64/name.js b/test/built-ins/DataView/prototype/setFloat64/name.js
index ffacf4048cd51e8dac1c28bb9a554a3c4a3cb25b..b6ea69a1db5920050fbf2436f3dfe2fe4519f404 100644
--- a/test/built-ins/DataView/prototype/setFloat64/name.js
+++ b/test/built-ins/DataView/prototype/setFloat64/name.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-dataview.prototype.setfloat64
 es6id: 24.2.4.14
 description: >
   DataView.prototype.setFloat64.name is "setFloat64".
diff --git a/test/built-ins/DataView/prototype/setInt16/name.js b/test/built-ins/DataView/prototype/setInt16/name.js
index 44591dd4a217bec46205bba1ec01955128f4beed..0ff027edc9c0874fbbb2e612e589d3a8590fa575 100644
--- a/test/built-ins/DataView/prototype/setInt16/name.js
+++ b/test/built-ins/DataView/prototype/setInt16/name.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-dataview.prototype.setint16
 es6id: 24.2.4.16
 description: >
   DataView.prototype.setInt16.name is "setInt16".
diff --git a/test/built-ins/DataView/prototype/setInt32/name.js b/test/built-ins/DataView/prototype/setInt32/name.js
index e62e1bf463e95d07996813e785bc1d475adc6dce..9492ba4e1e5a738f6e5974938127041c0d4c7a1f 100644
--- a/test/built-ins/DataView/prototype/setInt32/name.js
+++ b/test/built-ins/DataView/prototype/setInt32/name.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-dataview.prototype.setint32
 es6id: 24.2.4.17
 description: >
   DataView.prototype.setInt32.name is "setInt32".
diff --git a/test/built-ins/DataView/prototype/setInt8/length.js b/test/built-ins/DataView/prototype/setInt8/length.js
index 8120cd2117b828cb1af086d764494463c7df584e..b98b8491de80b8012ee02273d39dd7519619682c 100644
--- a/test/built-ins/DataView/prototype/setInt8/length.js
+++ b/test/built-ins/DataView/prototype/setInt8/length.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-dataview.prototype.setint8
 es6id: 24.2.4.15
 description: >
   DataView.prototype.setInt8.length is 2.
diff --git a/test/built-ins/DataView/prototype/setInt8/name.js b/test/built-ins/DataView/prototype/setInt8/name.js
index e0c1eafec33ee210de82cb3781eaf9a997847076..c154fcae2d83feb575b464cabcebf76d12343a8c 100644
--- a/test/built-ins/DataView/prototype/setInt8/name.js
+++ b/test/built-ins/DataView/prototype/setInt8/name.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-dataview.prototype.setint8
 es6id: 24.2.4.15
 description: >
   DataView.prototype.setInt8.name is "setInt8".
diff --git a/test/built-ins/DataView/prototype/setUint16/name.js b/test/built-ins/DataView/prototype/setUint16/name.js
index 957241547be83880be9f7412a57425163cf38efb..ab83359adafa560ef0db57097828f6b9804acf95 100644
--- a/test/built-ins/DataView/prototype/setUint16/name.js
+++ b/test/built-ins/DataView/prototype/setUint16/name.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-dataview.prototype.setuint16
 es6id: 24.2.4.19
 description: >
   DataView.prototype.setUint16.name is "setUint16".
diff --git a/test/built-ins/DataView/prototype/setUint32/name.js b/test/built-ins/DataView/prototype/setUint32/name.js
index dda373f1f01d8bcc3f1aa140d6fb1fb66ed1b4fa..e1e10408cb5c4ea15538b88ce5080eb20c246cf6 100644
--- a/test/built-ins/DataView/prototype/setUint32/name.js
+++ b/test/built-ins/DataView/prototype/setUint32/name.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-dataview.prototype.setuint32
 es6id: 24.2.4.20
 description: >
   DataView.prototype.setUint32.name is "setUint32".
diff --git a/test/built-ins/DataView/prototype/setUint8/length.js b/test/built-ins/DataView/prototype/setUint8/length.js
index 6c868a7da73f7b633f77f2bcafbb8702c1f61cd5..c97f79378c4968e0e6fe39fc219de0a72b31b329 100644
--- a/test/built-ins/DataView/prototype/setUint8/length.js
+++ b/test/built-ins/DataView/prototype/setUint8/length.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-dataview.prototype.setuint8
 es6id: 24.2.4.18
 description: >
   DataView.prototype.setUint8.length is 2.
diff --git a/test/built-ins/DataView/prototype/setUint8/name.js b/test/built-ins/DataView/prototype/setUint8/name.js
index 8333822b1109df6aaa444c0aa793723587e47c7e..b4394fb472d62fb46d97c8d97c5e2dab1c475141 100644
--- a/test/built-ins/DataView/prototype/setUint8/name.js
+++ b/test/built-ins/DataView/prototype/setUint8/name.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
+esid: sec-dataview.prototype.setuint8
 es6id: 24.2.4.18
 description: >
   DataView.prototype.setUint8.name is "setUint8".