diff --git a/test/built-ins/isFinite/S15.1.2.5_A2.6.js b/test/built-ins/isFinite/S15.1.2.5_A2.6.js
index 5a0e9406d9f1aff31da2ae85699250fe9de7c7ff..1e4d28a7d34cd22b25565c3f4f33cddc1281c060 100644
--- a/test/built-ins/isFinite/S15.1.2.5_A2.6.js
+++ b/test/built-ins/isFinite/S15.1.2.5_A2.6.js
@@ -4,6 +4,8 @@
 /*---
 info: The isFinite property has not prototype property
 es5id: 15.1.2.5_A2.6
+es6id: 18.2.2
+esid: sec-isfinite-number
 description: Checking isFinite.prototype
 ---*/
 
diff --git a/test/built-ins/isFinite/S15.1.2.5_A2.7.js b/test/built-ins/isFinite/S15.1.2.5_A2.7.js
index 266d958898601bfde6dc75ff3889e842544c1766..594dc15d7feb0295588ebc548d4683c15bbd2681 100644
--- a/test/built-ins/isFinite/S15.1.2.5_A2.7.js
+++ b/test/built-ins/isFinite/S15.1.2.5_A2.7.js
@@ -4,6 +4,8 @@
 /*---
 info: The isFinite property can't be used as constructor
 es5id: 15.1.2.5_A2.7
+es6id: 18.2.2
+esid: sec-isfinite-number
 description: >
     If property does not implement the internal [[Construct]] method,
     throw a TypeError exception
diff --git a/test/built-ins/isFinite/length.js b/test/built-ins/isFinite/length.js
index 136fdb19f9aae393a391a6c83ee8878fc9af9dc9..da34f236b5e41d64de82770fc3b44fc09ea3ae42 100644
--- a/test/built-ins/isFinite/length.js
+++ b/test/built-ins/isFinite/length.js
@@ -2,8 +2,8 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-isfinite-number
 es6id: 18.2.2
+esid: sec-isfinite-number
 description: >
   The length property of isFinite is 1
 includes: [propertyHelper.js]
diff --git a/test/built-ins/isFinite/name.js b/test/built-ins/isFinite/name.js
index d9775c23e419645d42bf0a8771f65bbaed426d24..562c5e21522d31f5b3cc21c2e1a8a3a533af468d 100644
--- a/test/built-ins/isFinite/name.js
+++ b/test/built-ins/isFinite/name.js
@@ -3,6 +3,7 @@
 
 /*---
 es6id: 18.2.2
+esid: sec-isfinite-number
 description: >
   isFinite.name is "isFinite".
 info: >
diff --git a/test/built-ins/isFinite/prop-desc.js b/test/built-ins/isFinite/prop-desc.js
index 0147bcddc44d55774227339c4dfe447e8f22d2ad..dcc90c1eba1a19b003c2af56b89efa7d90fd8d68 100644
--- a/test/built-ins/isFinite/prop-desc.js
+++ b/test/built-ins/isFinite/prop-desc.js
@@ -2,8 +2,8 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-isfinite-number
 es6id: 18.2.2
+esid: sec-isfinite-number
 description: >
   Property descriptor for isFinite
 includes: [propertyHelper.js]
diff --git a/test/built-ins/isFinite/return-abrupt-from-tonumber-number-symbol.js b/test/built-ins/isFinite/return-abrupt-from-tonumber-number-symbol.js
index 1dd19b2bb1dc40b5f928a028e5adb078c4da76bc..375b3478058ef718dba68350dad21df424af480b 100644
--- a/test/built-ins/isFinite/return-abrupt-from-tonumber-number-symbol.js
+++ b/test/built-ins/isFinite/return-abrupt-from-tonumber-number-symbol.js
@@ -2,8 +2,8 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-isfinite-number
 es6id: 18.2.2
+esid: sec-isfinite-number
 description: >
   Throws a TypeError if number is a Symbol
 info: |
diff --git a/test/built-ins/isFinite/return-abrupt-from-tonumber-number.js b/test/built-ins/isFinite/return-abrupt-from-tonumber-number.js
index afeba7d311d1ebe6b36efc040bd9a0633f8af7ce..8c851347333438130295d529208c07117246de75 100644
--- a/test/built-ins/isFinite/return-abrupt-from-tonumber-number.js
+++ b/test/built-ins/isFinite/return-abrupt-from-tonumber-number.js
@@ -2,8 +2,8 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-isfinite-number
 es6id: 18.2.2
+esid: sec-isfinite-number
 description: >
   Return abrupt completion from ToNumber(number)
 info: |
diff --git a/test/built-ins/isFinite/return-false-on-nan-or-infinities.js b/test/built-ins/isFinite/return-false-on-nan-or-infinities.js
index c07cf19dff3dac6a2b28dd0d530cb68ee29f814e..5b26ff0cbf4bb736c740f6e57f82d70884c90725 100644
--- a/test/built-ins/isFinite/return-false-on-nan-or-infinities.js
+++ b/test/built-ins/isFinite/return-false-on-nan-or-infinities.js
@@ -2,8 +2,8 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-isfinite-number
 es6id: 18.2.2
+esid: sec-isfinite-number
 description: >
   Return false if number is NaN, Infinity or -Infinity
 info: |
diff --git a/test/built-ins/isFinite/return-true-for-valid-finite-numbers.js b/test/built-ins/isFinite/return-true-for-valid-finite-numbers.js
index 9e7eb8165c5e9972d83651dd1b88ef425e51f3d7..7fbd2edb040a933656c7f1357ee476a602f832c7 100644
--- a/test/built-ins/isFinite/return-true-for-valid-finite-numbers.js
+++ b/test/built-ins/isFinite/return-true-for-valid-finite-numbers.js
@@ -2,8 +2,8 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-isfinite-number
 es6id: 18.2.2
+esid: sec-isfinite-number
 description: >
   Return true if number is not NaN, Infinity or -Infinity
 info: |
diff --git a/test/built-ins/isFinite/tonumber-operations.js b/test/built-ins/isFinite/tonumber-operations.js
index 0048b65e7e520e621f87a7350bf9331858f86fc2..f4c7c32f529752c637085e2057e1ca7ea9d3cd75 100644
--- a/test/built-ins/isFinite/tonumber-operations.js
+++ b/test/built-ins/isFinite/tonumber-operations.js
@@ -2,8 +2,8 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-isfinite-number
 es6id: 18.2.2
+esid: sec-isfinite-number
 description: >
   number argument is converted by ToNumber
 info: |
diff --git a/test/built-ins/isFinite/toprimitive-call-abrupt.js b/test/built-ins/isFinite/toprimitive-call-abrupt.js
index 9a4242c343be64afe4fc31cf95ec3cfd5ffd3773..f5e6252686375cff0a5023051b588df15a00249c 100644
--- a/test/built-ins/isFinite/toprimitive-call-abrupt.js
+++ b/test/built-ins/isFinite/toprimitive-call-abrupt.js
@@ -2,8 +2,8 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-isfinite-number
 es6id: 18.2.2
+esid: sec-isfinite-number
 description: >
   Return abrupt completion calling number.@@toPrimitive
 info: |
diff --git a/test/built-ins/isFinite/toprimitive-get-abrupt.js b/test/built-ins/isFinite/toprimitive-get-abrupt.js
index bc6d05700f558a80d989ad807bd3883f71d5f5c6..729eb01e9e3fb8164b67eae36f66d3627def20f1 100644
--- a/test/built-ins/isFinite/toprimitive-get-abrupt.js
+++ b/test/built-ins/isFinite/toprimitive-get-abrupt.js
@@ -2,8 +2,8 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-isfinite-number
 es6id: 18.2.2
+esid: sec-isfinite-number
 description: >
   Return abrupt completion getting number.@@toPrimitive
 info: |
diff --git a/test/built-ins/isFinite/toprimitive-not-callable-throws.js b/test/built-ins/isFinite/toprimitive-not-callable-throws.js
index 8ce8703ce83051eea1d7b2b06f48432c5a4bc11c..6106ceb8951120dc0d9a93ec20f3be86183f3b17 100644
--- a/test/built-ins/isFinite/toprimitive-not-callable-throws.js
+++ b/test/built-ins/isFinite/toprimitive-not-callable-throws.js
@@ -2,8 +2,8 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-isfinite-number
 es6id: 18.2.2
+esid: sec-isfinite-number
 description: >
   Throws a TypeError if number.@@toPrimitive is not null, undefined, or callable
 info: |
diff --git a/test/built-ins/isFinite/toprimitive-result-is-object-throws.js b/test/built-ins/isFinite/toprimitive-result-is-object-throws.js
index 017089d9e4eb5c51472f67d69ab2b99a5a3da40d..bd97608d58a5e0af4828baa4b0117182aa449c02 100644
--- a/test/built-ins/isFinite/toprimitive-result-is-object-throws.js
+++ b/test/built-ins/isFinite/toprimitive-result-is-object-throws.js
@@ -2,8 +2,8 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-isfinite-number
 es6id: 18.2.2
+esid: sec-isfinite-number
 description: >
   Throws a TypeError if the result of calling number.@@toPrimitive is an Object
 info: |
diff --git a/test/built-ins/isFinite/toprimitive-result-is-symbol-throws.js b/test/built-ins/isFinite/toprimitive-result-is-symbol-throws.js
index 0dfa8275df8fdbd44a54096d20f3b3d53486d2e4..825fa0be9907428fbd19f2f90922008d7d5723e7 100644
--- a/test/built-ins/isFinite/toprimitive-result-is-symbol-throws.js
+++ b/test/built-ins/isFinite/toprimitive-result-is-symbol-throws.js
@@ -2,8 +2,8 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-isfinite-number
 es6id: 18.2.2
+esid: sec-isfinite-number
 description: >
   Throws a TypeError if the result of calling number.@@toPrimitive is a symbol
 info: |
diff --git a/test/built-ins/isFinite/toprimitive-valid-result.js b/test/built-ins/isFinite/toprimitive-valid-result.js
index 6af51b57012615a1a652bf82b17f0dc31e65d07e..29d167443185926b06134a2680121cc1c62ca2b1 100644
--- a/test/built-ins/isFinite/toprimitive-valid-result.js
+++ b/test/built-ins/isFinite/toprimitive-valid-result.js
@@ -2,8 +2,8 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-isfinite-number
 es6id: 18.2.2
+esid: sec-isfinite-number
 description: >
   Use non-object value returned from @@toPrimitive method
 info: |