diff --git a/test/built-ins/encodeURI/S15.1.3.3_A1.1_T1.js b/test/built-ins/encodeURI/S15.1.3.3_A1.1_T1.js
index 781519c5eb..b2e05262c2 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A1.1_T1.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A1.1_T1.js
@@ -4,6 +4,8 @@
 /*---
 info: If string.charAt(k) in [0xDC00 - 0xDFFF], throw URIError
 es5id: 15.1.3.3_A1.1_T1
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: Complex tests
 includes: [decimalToHexString.js]
 ---*/
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A1.1_T2.js b/test/built-ins/encodeURI/S15.1.3.3_A1.1_T2.js
index 0d3b4a9700..26fff594e9 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A1.1_T2.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A1.1_T2.js
@@ -4,6 +4,8 @@
 /*---
 info: If string.charAt(k) in [0xDC00 - 0xDFFF], throw URIError
 es5id: 15.1.3.3_A1.1_T2
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: Complex tests
 includes: [decimalToHexString.js]
 ---*/
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A1.2_T1.js b/test/built-ins/encodeURI/S15.1.3.3_A1.2_T1.js
index 26cb4751a0..2697ba1e3a 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A1.2_T1.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A1.2_T1.js
@@ -6,6 +6,8 @@ info: >
     If string.charAt(k) in [0xD800 - 0xDBFF] and string.length = k + 1, throw
     URIError
 es5id: 15.1.3.3_A1.2_T1
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: Complex tests
 includes: [decimalToHexString.js]
 ---*/
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A1.2_T2.js b/test/built-ins/encodeURI/S15.1.3.3_A1.2_T2.js
index d55e3bfaff..1eb56e73ef 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A1.2_T2.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A1.2_T2.js
@@ -6,6 +6,8 @@ info: >
     If string.charAt(k) in [0xD800 - 0xDBFF] and string.length = k + 1, throw
     URIError
 es5id: 15.1.3.3_A1.2_T2
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: Complex tests
 includes: [decimalToHexString.js]
 ---*/
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A1.3_T1.js b/test/built-ins/encodeURI/S15.1.3.3_A1.3_T1.js
index 74acbdace1..314b8f9dca 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A1.3_T1.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A1.3_T1.js
@@ -6,6 +6,8 @@ info: >
     If string.charAt(k) in [0xD800 - 0xDBFF] and string.charAt(k+1) not in
     [0xDC00 - 0xDFFF], throw URIError
 es5id: 15.1.3.3_A1.3_T1
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: >
     Complex tests, string.charAt(k+1) in [0x0000, 0xD7FF, 0xD800,
     0xDBFE, 0xDBFF, 0xE000, 0xFFFF]
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A2.1_T1.js b/test/built-ins/encodeURI/S15.1.3.3_A2.1_T1.js
index 7074472ac5..a5b05515f1 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A2.1_T1.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A2.1_T1.js
@@ -6,6 +6,8 @@ info: >
     If string.charAt(k) in [0x0000 - 0x007F]\[uriReserved, uriUnescaped, #],
     return 1 octet (00000000 0zzzzzzz -> 0zzzzzzz)
 es5id: 15.1.3.3_A2.1_T1
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: Complex tests, use RFC 3629
 includes: [decimalToHexString.js]
 ---*/
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A2.2_T1.js b/test/built-ins/encodeURI/S15.1.3.3_A2.2_T1.js
index e293339abe..98a99b61c2 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A2.2_T1.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A2.2_T1.js
@@ -6,6 +6,8 @@ info: >
     If string.charAt(k) in [0x0080 - 0x07FF], return 2 octets (00000yyy
     yyzzzzzz -> 110yyyyy 10zzzzzz)
 es5id: 15.1.3.3_A2.2_T1
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: Complex tests, use RFC 3629
 includes: [decimalToHexString.js]
 ---*/
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A2.3_T1.js b/test/built-ins/encodeURI/S15.1.3.3_A2.3_T1.js
index c12383a20f..b9a392ec8c 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A2.3_T1.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A2.3_T1.js
@@ -6,6 +6,8 @@ info: >
     If string.charAt(k) in [0x0800 - 0xD7FF], return 3 octets (xxxxyyyy
     yyzzzzzz -> 1110xxxx 10yyyyyy 10zzzzzz)
 es5id: 15.1.3.3_A2.3_T1
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: Complex tests, use RFC 3629
 includes: [decimalToHexString.js]
 ---*/
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A2.4_T1.js b/test/built-ins/encodeURI/S15.1.3.3_A2.4_T1.js
index 838b038bde..a6d04077be 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A2.4_T1.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A2.4_T1.js
@@ -7,6 +7,8 @@ info: >
     [0xDC00 � 0xDFFF], return 4 octets (000wwwxx xxxxyyyy yyzzzzzz ->
     11110www 10xxxxxx 10yyyyyy 10zzzzzz)
 es5id: 15.1.3.3_A2.4_T1
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: >
     Complex tests, use RFC 3629, string.charAt(k+1) in [0xDC00,
     0xDDFF, 0xDFFF]
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A2.4_T2.js b/test/built-ins/encodeURI/S15.1.3.3_A2.4_T2.js
index 9d6643f908..8620e68f4f 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A2.4_T2.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A2.4_T2.js
@@ -7,6 +7,8 @@ info: >
     [0xDC00 � 0xDFFF], return 4 octets (000wwwxx xxxxyyyy yyzzzzzz ->
     11110www 10xxxxxx 10yyyyyy 10zzzzzz)
 es5id: 15.1.3.3_A2.4_T2
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: >
     Complex tests, use RFC 3629, string.charAt(k) in [0xD800, 0xDBFF,
     0xD9FF]
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A2.5_T1.js b/test/built-ins/encodeURI/S15.1.3.3_A2.5_T1.js
index 21bd6e5a55..58d7f2ff79 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A2.5_T1.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A2.5_T1.js
@@ -6,6 +6,8 @@ info: >
     If string.charAt(k) in [0xE000 - 0xFFFF], return 3 octets (xxxxyyyy
     yyzzzzzz -> 1110xxxx 10yyyyyy 10zzzzzz)
 es5id: 15.1.3.3_A2.5_T1
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: Complex tests, use RFC 3629
 includes: [decimalToHexString.js]
 ---*/
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A3.1_T1.js b/test/built-ins/encodeURI/S15.1.3.3_A3.1_T1.js
index 8fff20c381..016dac7943 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A3.1_T1.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A3.1_T1.js
@@ -6,6 +6,8 @@ info: >
     unescapedURISet containing one instance of each character valid in
     uriReserved
 es5id: 15.1.3.3_A3.1_T1
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: Complex tests
 ---*/
 
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A3.2_T1.js b/test/built-ins/encodeURI/S15.1.3.3_A3.2_T1.js
index 0bcc7e425a..574a32585e 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A3.2_T1.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A3.2_T1.js
@@ -6,6 +6,8 @@ info: >
     unescapedURISet containing one instance of each character valid in
     uriUnescaped
 es5id: 15.1.3.3_A3.2_T1
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: "Complex tests, uriUnescaped :: uriAlpha"
 ---*/
 
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A3.2_T2.js b/test/built-ins/encodeURI/S15.1.3.3_A3.2_T2.js
index e48236f2cb..24e25ea2b4 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A3.2_T2.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A3.2_T2.js
@@ -6,6 +6,8 @@ info: >
     unescapedURISet containing one instance of each character valid in
     uriUnescaped
 es5id: 15.1.3.3_A3.2_T2
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: "Complex tests, uriUnescaped :: DecimalDigit"
 ---*/
 
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A3.2_T3.js b/test/built-ins/encodeURI/S15.1.3.3_A3.2_T3.js
index 754e8861e6..980df7b900 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A3.2_T3.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A3.2_T3.js
@@ -6,6 +6,8 @@ info: >
     unescapedURISet containing one instance of each character valid in
     uriUnescaped
 es5id: 15.1.3.3_A3.2_T3
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: "Complex tests, uriUnescaped :: uriMark"
 ---*/
 
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A3.3_T1.js b/test/built-ins/encodeURI/S15.1.3.3_A3.3_T1.js
index 3ca1aeb0c0..33b5626ad4 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A3.3_T1.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A3.3_T1.js
@@ -4,6 +4,8 @@
 /*---
 info: unescapedURISet containing "#"
 es5id: 15.1.3.3_A3.3_T1
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: encodeURI("#") === "#"
 ---*/
 
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A4_T1.js b/test/built-ins/encodeURI/S15.1.3.3_A4_T1.js
index 8d7d500e7d..487d7157d6 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A4_T1.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A4_T1.js
@@ -4,6 +4,8 @@
 /*---
 info: URI tests
 es5id: 15.1.3.3_A4_T1
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: Checking ENGLISH ALPHABET
 ---*/
 
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A4_T2.js b/test/built-ins/encodeURI/S15.1.3.3_A4_T2.js
index 04ebe87df0..74f36f388f 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A4_T2.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A4_T2.js
@@ -4,6 +4,8 @@
 /*---
 info: URI tests
 es5id: 15.1.3.3_A4_T2
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: Checking RUSSIAN ALPHABET
 ---*/
 
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A4_T3.js b/test/built-ins/encodeURI/S15.1.3.3_A4_T3.js
index 0f03bede9a..7f132cb32c 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A4_T3.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A4_T3.js
@@ -4,6 +4,8 @@
 /*---
 info: URI tests
 es5id: 15.1.3.3_A4_T3
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: Checking URL with Line Terminator
 ---*/
 
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A4_T4.js b/test/built-ins/encodeURI/S15.1.3.3_A4_T4.js
index 045bc61e93..9807d73362 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A4_T4.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A4_T4.js
@@ -4,6 +4,8 @@
 /*---
 info: URI tests
 es5id: 15.1.3.3_A4_T4
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: Test some url
 ---*/
 
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A5.1.js b/test/built-ins/encodeURI/S15.1.3.3_A5.1.js
index 80fb021c0d..1cf1e2f068 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A5.1.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A5.1.js
@@ -4,6 +4,8 @@
 /*---
 info: The length property of encodeURI has the attribute DontEnum
 es5id: 15.1.3.3_A5.1
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: Checking use propertyIsEnumerable, for-in
 ---*/
 
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A5.2.js b/test/built-ins/encodeURI/S15.1.3.3_A5.2.js
index 78b74e7ea8..adc662e8b3 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A5.2.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A5.2.js
@@ -4,6 +4,8 @@
 /*---
 info: The length property of encodeURI does not have the attribute DontDelete
 es5id: 15.1.3.3_A5.2
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: Checking use hasOwnProperty, delete
 ---*/
 
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A5.3.js b/test/built-ins/encodeURI/S15.1.3.3_A5.3.js
index ea8846bd77..6338a6dcc0 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A5.3.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A5.3.js
@@ -4,6 +4,8 @@
 /*---
 info: The length property of encodeURI has the attribute ReadOnly
 es5id: 15.1.3.3_A5.3
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: Checking if varying the length property fails
 includes: [propertyHelper.js]
 ---*/
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A5.4.js b/test/built-ins/encodeURI/S15.1.3.3_A5.4.js
index b64dfc3666..03a1595049 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A5.4.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A5.4.js
@@ -4,6 +4,8 @@
 /*---
 info: The length property of encodeURI is 1
 es5id: 15.1.3.3_A5.4
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: encodeURI.length === 1
 ---*/
 
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A5.5.js b/test/built-ins/encodeURI/S15.1.3.3_A5.5.js
index 366a36da72..182a5bbe89 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A5.5.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A5.5.js
@@ -4,6 +4,8 @@
 /*---
 info: The encodeURI property has the attribute DontEnum
 es5id: 15.1.3.3_A5.5
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: Checking use propertyIsEnumerable, for-in
 ---*/
 
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A5.6.js b/test/built-ins/encodeURI/S15.1.3.3_A5.6.js
index bce835cb29..ac30d03271 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A5.6.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A5.6.js
@@ -4,6 +4,8 @@
 /*---
 info: The encodeURI property has not prototype property
 es5id: 15.1.3.3_A5.6
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: Checking encodeURI.prototype
 ---*/
 
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A5.7.js b/test/built-ins/encodeURI/S15.1.3.3_A5.7.js
index 1081f5b5f9..67eabf1e9f 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A5.7.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A5.7.js
@@ -4,6 +4,8 @@
 /*---
 info: The encodeURI property can't be used as constructor
 es5id: 15.1.3.3_A5.7
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: >
     If property does not implement the internal [[Construct]] method,
     throw a TypeError exception
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A6_T1.js b/test/built-ins/encodeURI/S15.1.3.3_A6_T1.js
index bf6c1942b1..c9c4877d92 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A6_T1.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A6_T1.js
@@ -4,6 +4,8 @@
 /*---
 info: Operator use ToString
 es5id: 15.1.3.3_A6_T1
+es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: If Type(value) is Object, evaluate ToPrimitive(value, String)
 ---*/
 
diff --git a/test/built-ins/encodeURI/name.js b/test/built-ins/encodeURI/name.js
index dd8ddca6fa..0891bb81be 100644
--- a/test/built-ins/encodeURI/name.js
+++ b/test/built-ins/encodeURI/name.js
@@ -3,6 +3,7 @@
 
 /*---
 es6id: 18.2.6.4
+esid: sec-encodeuri-uri
 description: >
   encodeURI.name is "encodeURI".
 info: >