Features.txt: Add string-trimming; replace "#" in feature tags (#1247)

52 files changed, 54 insertions, 28 deletions

diff --git a/test/built-ins/String/prototype/endsWith/String.prototype.endsWith_Fail.js b/test/built-ins/String/prototype/endsWith/String.prototype.endsWith_Fail.js
index 6a9ee8585..6e53352e0 100644
--- a/test/built-ins/String/prototype/endsWith/String.prototype.endsWith_Fail.js
+++ b/test/built-ins/String/prototype/endsWith/String.prototype.endsWith_Fail.js
@@ -4,7 +4,7 @@
 /*---
 author: Ryan Lewis
 description: endsWith should return false when called on 'word' and passed 'r'.
-features: [String#endsWith]
+features: [String.prototype.endsWith]
 ---*/
 
 assert.sameValue('word'.endsWith('r'), false, '"word".endsWith("r")');
diff --git a/test/built-ins/String/prototype/endsWith/String.prototype.endsWith_Fail_2.js b/test/built-ins/String/prototype/endsWith/String.prototype.endsWith_Fail_2.js
index 0b34a7b41..ebaf927ab 100644
--- a/test/built-ins/String/prototype/endsWith/String.prototype.endsWith_Fail_2.js
+++ b/test/built-ins/String/prototype/endsWith/String.prototype.endsWith_Fail_2.js
@@ -6,7 +6,7 @@ author: Ryan Lewis
 description: >
     endsWith should return false when called on 'word' and passed 'd',
     with an endPosition of 3.
-features: [String#endsWith]
+features: [String.prototype.endsWith]
 ---*/
 
 assert.sameValue('word'.endsWith('d', 3), false, '"word".endsWith("d", 3)');
diff --git a/test/built-ins/String/prototype/endsWith/String.prototype.endsWith_Success.js b/test/built-ins/String/prototype/endsWith/String.prototype.endsWith_Success.js
index 854bc56ee..723a31b24 100644
--- a/test/built-ins/String/prototype/endsWith/String.prototype.endsWith_Success.js
+++ b/test/built-ins/String/prototype/endsWith/String.prototype.endsWith_Success.js
@@ -6,7 +6,7 @@ author: Ryan Lewis
 description: >
     endsWith should return true when called on 'word' and passed 'd'
     and with no endPosition (defaults to 4).
-features: [String#endsWith]
+features: [String.prototype.endsWith]
 ---*/
 
 assert.sameValue('word'.endsWith('d'), true, '"word".endsWith("d")');
diff --git a/test/built-ins/String/prototype/endsWith/String.prototype.endsWith_Success_2.js b/test/built-ins/String/prototype/endsWith/String.prototype.endsWith_Success_2.js
index 23aba85a2..1be5a3d03 100644
--- a/test/built-ins/String/prototype/endsWith/String.prototype.endsWith_Success_2.js
+++ b/test/built-ins/String/prototype/endsWith/String.prototype.endsWith_Success_2.js
@@ -6,7 +6,7 @@ author: Ryan Lewis
 description: >
     endsWith should return true when called on 'word' and passed 'd'
     and with an endPosition of 4.
-features: [String#endsWith]
+features: [String.prototype.endsWith]
 ---*/
 
 assert.sameValue('word'.endsWith('d', 4), true, '"word".endsWith("d", 4)');
diff --git a/test/built-ins/String/prototype/endsWith/String.prototype.endsWith_Success_3.js b/test/built-ins/String/prototype/endsWith/String.prototype.endsWith_Success_3.js
index 0b8ceae78..d75db6457 100644
--- a/test/built-ins/String/prototype/endsWith/String.prototype.endsWith_Success_3.js
+++ b/test/built-ins/String/prototype/endsWith/String.prototype.endsWith_Success_3.js
@@ -6,7 +6,7 @@ author: Ryan Lewis
 description: >
     endsWith should return true when called on 'word' and passed 'd'
     and with an endPosition of 25.
-features: [String#endsWith]
+features: [String.prototype.endsWith]
 ---*/
 
 assert.sameValue('word'.endsWith('d', 25), true, '"word".endsWith("d", 25)');
diff --git a/test/built-ins/String/prototype/endsWith/String.prototype.endsWith_Success_4.js b/test/built-ins/String/prototype/endsWith/String.prototype.endsWith_Success_4.js
index 5318ce43f..a4d741dbc 100644
--- a/test/built-ins/String/prototype/endsWith/String.prototype.endsWith_Success_4.js
+++ b/test/built-ins/String/prototype/endsWith/String.prototype.endsWith_Success_4.js
@@ -6,7 +6,7 @@ author: Ryan Lewis
 description: >
     endsWith should return true when called on 'word' and passed 'r',
     with an endPosition of 3.
-features: [String#endsWith]
+features: [String.prototype.endsWith]
 ---*/
 
 assert.sameValue('word'.endsWith('r', 3), true, '"word".endsWith("r", 3)');
diff --git a/test/built-ins/String/prototype/endsWith/coerced-values-of-position.js b/test/built-ins/String/prototype/endsWith/coerced-values-of-position.js
index 59f53ebb8..ac73c7683 100644
--- a/test/built-ins/String/prototype/endsWith/coerced-values-of-position.js
+++ b/test/built-ins/String/prototype/endsWith/coerced-values-of-position.js
@@ -19,6 +19,7 @@ info: >
   is the same as the full element sequence of searchStr, return true.
   17. Otherwise, return false.
   ...
+features: [String.prototype.endsWith]
 ---*/
 
 var str = 'The future is cool!';
diff --git a/test/built-ins/String/prototype/endsWith/endsWith.js b/test/built-ins/String/prototype/endsWith/endsWith.js
index 323b4df1c..1a20d2e2b 100644
--- a/test/built-ins/String/prototype/endsWith/endsWith.js
+++ b/test/built-ins/String/prototype/endsWith/endsWith.js
@@ -9,6 +9,7 @@ info: >
 
   17 ECMAScript Standard Built-in Objects
 includes: [propertyHelper.js]
+features: [String.prototype.endsWith]
 ---*/
 
 assert.sameValue(
diff --git a/test/built-ins/String/prototype/endsWith/length.js b/test/built-ins/String/prototype/endsWith/length.js
index 94d1bacdb..5f6f07809 100644
--- a/test/built-ins/String/prototype/endsWith/length.js
+++ b/test/built-ins/String/prototype/endsWith/length.js
@@ -10,6 +10,7 @@ info: >
   The length property of the endsWith method is 1.
 
 includes: [propertyHelper.js]
+features: [String.prototype.endsWith]
 ---*/
 
 assert.sameValue(
diff --git a/test/built-ins/String/prototype/endsWith/name.js b/test/built-ins/String/prototype/endsWith/name.js
index 6dd674f0d..a98cace09 100644
--- a/test/built-ins/String/prototype/endsWith/name.js
+++ b/test/built-ins/String/prototype/endsWith/name.js
@@ -10,6 +10,7 @@ info: >
   17 ECMAScript Standard Built-in Objects
 
 includes: [propertyHelper.js]
+features: [String.prototype.endsWith]
 ---*/
 
 assert.sameValue(
diff --git a/test/built-ins/String/prototype/endsWith/return-abrupt-from-position-as-symbol.js b/test/built-ins/String/prototype/endsWith/return-abrupt-from-position-as-symbol.js
index 6c0ad476a..8aaea6eec 100644
--- a/test/built-ins/String/prototype/endsWith/return-abrupt-from-position-as-symbol.js
+++ b/test/built-ins/String/prototype/endsWith/return-abrupt-from-position-as-symbol.js
@@ -12,7 +12,7 @@ info: >
   ToInteger(endPosition).
   11. ReturnIfAbrupt(pos).
   ...
-features: [Symbol]
+features: [Symbol, String.prototype.endsWith]
 ---*/
 
 var position = Symbol();
diff --git a/test/built-ins/String/prototype/endsWith/return-abrupt-from-position.js b/test/built-ins/String/prototype/endsWith/return-abrupt-from-position.js
index e7916d924..36926de67 100644
--- a/test/built-ins/String/prototype/endsWith/return-abrupt-from-position.js
+++ b/test/built-ins/String/prototype/endsWith/return-abrupt-from-position.js
@@ -12,6 +12,7 @@ info: >
   ToInteger(endPosition).
   11. ReturnIfAbrupt(pos).
   ...
+features: [String.prototype.endsWith]
 ---*/
 
 var position = {
diff --git a/test/built-ins/String/prototype/endsWith/return-abrupt-from-searchstring-as-symbol.js b/test/built-ins/String/prototype/endsWith/return-abrupt-from-searchstring-as-symbol.js
index 568316cd8..1bdfd5539 100644
--- a/test/built-ins/String/prototype/endsWith/return-abrupt-from-searchstring-as-symbol.js
+++ b/test/built-ins/String/prototype/endsWith/return-abrupt-from-searchstring-as-symbol.js
@@ -11,7 +11,7 @@ info: >
   7. Let searchStr be ToString(searchString).
   8. ReturnIfAbrupt(searchStr).
   ...
-features: [Symbol]
+features: [Symbol, String.prototype.endsWith]
 ---*/
 
 var s = Symbol();
diff --git a/test/built-ins/String/prototype/endsWith/return-abrupt-from-searchstring-regexp-test.js b/test/built-ins/String/prototype/endsWith/return-abrupt-from-searchstring-regexp-test.js
index ea46e0404..43b9c893d 100644
--- a/test/built-ins/String/prototype/endsWith/return-abrupt-from-searchstring-regexp-test.js
+++ b/test/built-ins/String/prototype/endsWith/return-abrupt-from-searchstring-regexp-test.js
@@ -16,7 +16,7 @@ info: >
 
   2. Let isRegExp be Get(argument, @@match).
   3. ReturnIfAbrupt(isRegExp).
-features: [Symbol.match]
+features: [Symbol.match, String.prototype.endsWith]
 ---*/
 
 var obj = {};
diff --git a/test/built-ins/String/prototype/endsWith/return-abrupt-from-searchstring.js b/test/built-ins/String/prototype/endsWith/return-abrupt-from-searchstring.js
index 9497b73de..c5b50d730 100644
--- a/test/built-ins/String/prototype/endsWith/return-abrupt-from-searchstring.js
+++ b/test/built-ins/String/prototype/endsWith/return-abrupt-from-searchstring.js
@@ -11,6 +11,7 @@ info: >
   7. Let searchStr be ToString(searchString).
   8. ReturnIfAbrupt(searchStr).
   ...
+features: [String.prototype.endsWith]
 ---*/
 
 var obj = {
diff --git a/test/built-ins/String/prototype/endsWith/return-abrupt-from-this-as-symbol.js b/test/built-ins/String/prototype/endsWith/return-abrupt-from-this-as-symbol.js
index 8e17dc66a..b2fe3ba6a 100644
--- a/test/built-ins/String/prototype/endsWith/return-abrupt-from-this-as-symbol.js
+++ b/test/built-ins/String/prototype/endsWith/return-abrupt-from-this-as-symbol.js
@@ -11,7 +11,7 @@ info: >
   2. Let S be ToString(O).
   3. ReturnIfAbrupt(S).
   ...
-features: [Symbol]
+features: [Symbol, String.prototype.endsWith]
 ---*/
 
 var s = Symbol('');
diff --git a/test/built-ins/String/prototype/endsWith/return-abrupt-from-this.js b/test/built-ins/String/prototype/endsWith/return-abrupt-from-this.js
index 4e1d6aa8d..692f696ff 100644
--- a/test/built-ins/String/prototype/endsWith/return-abrupt-from-this.js
+++ b/test/built-ins/String/prototype/endsWith/return-abrupt-from-this.js
@@ -10,6 +10,7 @@ info: >
   1. Let O be RequireObjectCoercible(this value).
   2. Let S be ToString(O).
   3. ReturnIfAbrupt(S).
+features: [String.prototype.endsWith]
 ---*/
 
 var o = {
diff --git a/test/built-ins/String/prototype/endsWith/return-false-if-search-start-is-less-than-zero.js b/test/built-ins/String/prototype/endsWith/return-false-if-search-start-is-less-than-zero.js
index c3c139ec1..aa2651179 100644
--- a/test/built-ins/String/prototype/endsWith/return-false-if-search-start-is-less-than-zero.js
+++ b/test/built-ins/String/prototype/endsWith/return-false-if-search-start-is-less-than-zero.js
@@ -19,6 +19,7 @@ info: >
   ...
 
   Note: (min(max(pos, 0), len) - searchString.length) < 0;
+features: [String.prototype.endsWith]
 ---*/
 
 assert.sameValue(
diff --git a/test/built-ins/String/prototype/endsWith/return-true-if-searchstring-is-empty.js b/test/built-ins/String/prototype/endsWith/return-true-if-searchstring-is-empty.js
index 2188726e2..39f4b00ee 100644
--- a/test/built-ins/String/prototype/endsWith/return-true-if-searchstring-is-empty.js
+++ b/test/built-ins/String/prototype/endsWith/return-true-if-searchstring-is-empty.js
@@ -18,6 +18,7 @@ info: >
   16. If the sequence of elements of S starting at start of length searchLength
   is the same as the full element sequence of searchStr, return true.
   ...
+features: [String.prototype.endsWith]
 ---*/
 
 var str = 'The future is cool!';
@@ -45,4 +46,4 @@ assert(
 assert(
   str.endsWith('', -Infinity),
   'str.endsWith("", -Infinity) returns true'
-);
\ No newline at end of file
+);
diff --git a/test/built-ins/String/prototype/endsWith/searchstring-found-with-position.js b/test/built-ins/String/prototype/endsWith/searchstring-found-with-position.js
index cae2e6f01..99c3b76df 100644
--- a/test/built-ins/String/prototype/endsWith/searchstring-found-with-position.js
+++ b/test/built-ins/String/prototype/endsWith/searchstring-found-with-position.js
@@ -19,6 +19,7 @@ info: >
   16. If the sequence of elements of S starting at start of length searchLength
   is the same as the full element sequence of searchStr, return true.
   ...
+features: [String.prototype.endsWith]
 ---*/
 
 var str = 'The future is cool!';
diff --git a/test/built-ins/String/prototype/endsWith/searchstring-found-without-position.js b/test/built-ins/String/prototype/endsWith/searchstring-found-without-position.js
index 731a01b1c..0e38063e2 100644
--- a/test/built-ins/String/prototype/endsWith/searchstring-found-without-position.js
+++ b/test/built-ins/String/prototype/endsWith/searchstring-found-without-position.js
@@ -18,6 +18,7 @@ info: >
   16. If the sequence of elements of S starting at start of length searchLength
   is the same as the full element sequence of searchStr, return true.
   ...
+features: [String.prototype.endsWith]
 ---*/
 
 var str = 'The future is cool!';
diff --git a/test/built-ins/String/prototype/endsWith/searchstring-is-regexp-throws.js b/test/built-ins/String/prototype/endsWith/searchstring-is-regexp-throws.js
index 4079b99f7..94998d419 100644
--- a/test/built-ins/String/prototype/endsWith/searchstring-is-regexp-throws.js
+++ b/test/built-ins/String/prototype/endsWith/searchstring-is-regexp-throws.js
@@ -12,6 +12,7 @@ info: >
   5. ReturnIfAbrupt(isRegExp).
   6. If isRegExp is true, throw a TypeError exception.
   ...
+features: [String.prototype.endsWith]
 ---*/
 
 var searchString = /./;
diff --git a/test/built-ins/String/prototype/endsWith/searchstring-not-found-with-position.js b/test/built-ins/String/prototype/endsWith/searchstring-not-found-with-position.js
index 60a6cc076..598c4244b 100644
--- a/test/built-ins/String/prototype/endsWith/searchstring-not-found-with-position.js
+++ b/test/built-ins/String/prototype/endsWith/searchstring-not-found-with-position.js
@@ -19,6 +19,7 @@ info: >
   is the same as the full element sequence of searchStr, return true.
   17. Otherwise, return false.
   ...
+features: [String.prototype.endsWith]
 ---*/
 
 var str = 'The future is cool!';
diff --git a/test/built-ins/String/prototype/endsWith/searchstring-not-found-without-position.js b/test/built-ins/String/prototype/endsWith/searchstring-not-found-without-position.js
index ad0a93c19..97d2343cb 100644
--- a/test/built-ins/String/prototype/endsWith/searchstring-not-found-without-position.js
+++ b/test/built-ins/String/prototype/endsWith/searchstring-not-found-without-position.js
@@ -19,6 +19,7 @@ info: >
   is the same as the full element sequence of searchStr, return true.
   17. Otherwise, return false.
   ...
+features: [String.prototype.endsWith]
 ---*/
 
 var str = 'The future is cool!';
diff --git a/test/built-ins/String/prototype/endsWith/this-is-null-throws.js b/test/built-ins/String/prototype/endsWith/this-is-null-throws.js
index 71449e967..45711b57f 100644
--- a/test/built-ins/String/prototype/endsWith/this-is-null-throws.js
+++ b/test/built-ins/String/prototype/endsWith/this-is-null-throws.js
@@ -9,6 +9,7 @@ info: >
 
   1. Let O be RequireObjectCoercible(this value).
   2. Let S be ToString(O).
+features: [String.prototype.endsWith]
 ---*/
 
 assert.throws(TypeError, function() {
diff --git a/test/built-ins/String/prototype/endsWith/this-is-undefined-throws.js b/test/built-ins/String/prototype/endsWith/this-is-undefined-throws.js
index 3e174b05b..57dbabe7d 100644
--- a/test/built-ins/String/prototype/endsWith/this-is-undefined-throws.js
+++ b/test/built-ins/String/prototype/endsWith/this-is-undefined-throws.js
@@ -9,6 +9,7 @@ info: >
 
   1. Let O be RequireObjectCoercible(this value).
   2. Let S be ToString(O).
+features: [String.prototype.endsWith]
 ---*/
 
 assert.throws(TypeError, function() {
diff --git a/test/built-ins/String/prototype/includes/String.prototype.includes_FailBadLocation.js b/test/built-ins/String/prototype/includes/String.prototype.includes_FailBadLocation.js
index b98ebe9f5..9eada7bdc 100644
--- a/test/built-ins/String/prototype/includes/String.prototype.includes_FailBadLocation.js
+++ b/test/built-ins/String/prototype/includes/String.prototype.includes_FailBadLocation.js
@@ -6,7 +6,7 @@ author: Ryan Lewis
 description: >
     String should return false if a location is passed that is
     greather than the length of the string.
-features: [String#includes]
+features: [String.prototype.includes]
 ---*/
 
 assert.sameValue('word'.includes('w', 5), false, '"word".includes("w", 5)');
diff --git a/test/built-ins/String/prototype/includes/String.prototype.includes_FailLocation.js b/test/built-ins/String/prototype/includes/String.prototype.includes_FailLocation.js
index c787bb81a..1b8a9fadf 100644
--- a/test/built-ins/String/prototype/includes/String.prototype.includes_FailLocation.js
+++ b/test/built-ins/String/prototype/includes/String.prototype.includes_FailLocation.js
@@ -6,7 +6,7 @@ author: Ryan Lewis
 description: >
     String should return false if a letter is not found in the word
     starting from the passed location.
-features: [String#includes]
+features: [String.prototype.includes]
 ---*/
 
 assert.sameValue('word'.includes('o', 3), false, '"word".includes("o", 3)');
diff --git a/test/built-ins/String/prototype/includes/String.prototype.includes_FailMissingLetter.js b/test/built-ins/String/prototype/includes/String.prototype.includes_FailMissingLetter.js
index 5e468b27f..601bd60ff 100644
--- a/test/built-ins/String/prototype/includes/String.prototype.includes_FailMissingLetter.js
+++ b/test/built-ins/String/prototype/includes/String.prototype.includes_FailMissingLetter.js
@@ -4,7 +4,7 @@
 /*---
 author: Ryan Lewis
 description: String should return false if a letter is not found in the word.
-features: [String#includes]
+features: [String.prototype.includes]
 ---*/
 
 assert.sameValue('word'.includes('a', 0), false, '"word".includes("a", 0)');
diff --git a/test/built-ins/String/prototype/includes/String.prototype.includes_Success.js b/test/built-ins/String/prototype/includes/String.prototype.includes_Success.js
index cf71285b5..4f8d79d44 100644
--- a/test/built-ins/String/prototype/includes/String.prototype.includes_Success.js
+++ b/test/built-ins/String/prototype/includes/String.prototype.includes_Success.js
@@ -6,7 +6,7 @@ author: Ryan Lewis
 description: >
     String should return true when called on 'word' and passed 'w' and
     the location 0.
-features: [String#includes]
+features: [String.prototype.includes]
 ---*/
 
 assert.sameValue('word'.includes('w', 0), true, '"word".includes("w", 0)');
diff --git a/test/built-ins/String/prototype/includes/String.prototype.includes_SuccessNoLocation.js b/test/built-ins/String/prototype/includes/String.prototype.includes_SuccessNoLocation.js
index 3128b0100..465398c1f 100644
--- a/test/built-ins/String/prototype/includes/String.prototype.includes_SuccessNoLocation.js
+++ b/test/built-ins/String/prototype/includes/String.prototype.includes_SuccessNoLocation.js
@@ -6,7 +6,7 @@ author: Ryan Lewis
 description: >
     String should return true when called on 'word' and passed 'w' and
     with no location (defaults to 0).
-features: [String#includes]
+features: [String.prototype.includes]
 ---*/
 
 assert.sameValue('word'.includes('w'), true, '"word".includes("w")');
diff --git a/test/built-ins/String/prototype/includes/String.prototype.includes_lengthProp.js b/test/built-ins/String/prototype/includes/String.prototype.includes_lengthProp.js
index 999c8fc88..6ee93b480 100644
--- a/test/built-ins/String/prototype/includes/String.prototype.includes_lengthProp.js
+++ b/test/built-ins/String/prototype/includes/String.prototype.includes_lengthProp.js
@@ -4,7 +4,6 @@
 /*---
 author: Ryan Lewis
 description: String should have the property length with size of 1.
-features: [String#includes]
+features: [String.prototype.includes]
 ---*/
-
 assert.sameValue('word'.includes.length, 1, '"word".includes.length');
diff --git a/test/built-ins/String/prototype/includes/coerced-values-of-position.js b/test/built-ins/String/prototype/includes/coerced-values-of-position.js
index 90f6a19aa..65f49f731 100644
--- a/test/built-ins/String/prototype/includes/coerced-values-of-position.js
+++ b/test/built-ins/String/prototype/includes/coerced-values-of-position.js
@@ -20,6 +20,7 @@ info: >
   at index j of searchStr, return true; but if there is no such integer k,
   return false.
   ...
+features: [String.prototype.includes]
 ---*/
 
 var str = 'The future is cool!';
diff --git a/test/built-ins/String/prototype/includes/includes.js b/test/built-ins/String/prototype/includes/includes.js
index 54315a919..a392f960e 100644
--- a/test/built-ins/String/prototype/includes/includes.js
+++ b/test/built-ins/String/prototype/includes/includes.js
@@ -9,6 +9,7 @@ info: >
 
   17 ECMAScript Standard Built-in Objects
 includes: [propertyHelper.js]
+features: [String.prototype.includes]
 ---*/
 
 assert.sameValue(
diff --git a/test/built-ins/String/prototype/includes/length.js b/test/built-ins/String/prototype/includes/length.js
index 7b627a78c..747b1d9fc 100644
--- a/test/built-ins/String/prototype/includes/length.js
+++ b/test/built-ins/String/prototype/includes/length.js
@@ -10,6 +10,7 @@ info: >
   17 ECMAScript Standard Built-in Objects
 
 includes: [propertyHelper.js]
+features: [String.prototype.includes]
 ---*/
 
 assert.sameValue(
diff --git a/test/built-ins/String/prototype/includes/name.js b/test/built-ins/String/prototype/includes/name.js
index 58e815d0a..6c8c978ec 100644
--- a/test/built-ins/String/prototype/includes/name.js
+++ b/test/built-ins/String/prototype/includes/name.js
@@ -10,6 +10,7 @@ info: >
   17 ECMAScript Standard Built-in Objects
 
 includes: [propertyHelper.js]
+features: [String.prototype.includes]
 ---*/
 
 assert.sameValue(
diff --git a/test/built-ins/String/prototype/includes/return-abrupt-from-position-as-symbol.js b/test/built-ins/String/prototype/includes/return-abrupt-from-position-as-symbol.js
index fc60a16e3..e6bde3b8d 100644
--- a/test/built-ins/String/prototype/includes/return-abrupt-from-position-as-symbol.js
+++ b/test/built-ins/String/prototype/includes/return-abrupt-from-position-as-symbol.js
@@ -13,6 +13,7 @@ info: >
   10. ReturnIfAbrupt(pos).
   ...
 features: [Symbol]
+features: [String.prototype.includes]
 ---*/
 
 var position = Symbol();
diff --git a/test/built-ins/String/prototype/includes/return-abrupt-from-position.js b/test/built-ins/String/prototype/includes/return-abrupt-from-position.js
index 33f497000..3aab3fee5 100644
--- a/test/built-ins/String/prototype/includes/return-abrupt-from-position.js
+++ b/test/built-ins/String/prototype/includes/return-abrupt-from-position.js
@@ -12,6 +12,7 @@ info: >
   produces the value 0).
   10. ReturnIfAbrupt(pos).
   ...
+features: [String.prototype.includes]
 ---*/
 
 var position = {
diff --git a/test/built-ins/String/prototype/includes/return-abrupt-from-searchstring-as-symbol.js b/test/built-ins/String/prototype/includes/return-abrupt-from-searchstring-as-symbol.js
index 2b21ffda4..c84347b2b 100644
--- a/test/built-ins/String/prototype/includes/return-abrupt-from-searchstring-as-symbol.js
+++ b/test/built-ins/String/prototype/includes/return-abrupt-from-searchstring-as-symbol.js
@@ -11,7 +11,7 @@ info: >
   7. Let searchStr be ToString(searchString).
   8. ReturnIfAbrupt(searchStr).
   ...
-features: [Symbol]
+features: [Symbol, String.prototype.includes]
 ---*/
 
 var s = Symbol();
diff --git a/test/built-ins/String/prototype/includes/return-abrupt-from-searchstring-regexp-test.js b/test/built-ins/String/prototype/includes/return-abrupt-from-searchstring-regexp-test.js
index 0df2c2d0a..89097ccc8 100644
--- a/test/built-ins/String/prototype/includes/return-abrupt-from-searchstring-regexp-test.js
+++ b/test/built-ins/String/prototype/includes/return-abrupt-from-searchstring-regexp-test.js
@@ -16,7 +16,7 @@ info: >
 
   2. Let isRegExp be Get(argument, @@match).
   3. ReturnIfAbrupt(isRegExp).
-features: [Symbol.match]
+features: [Symbol.match, String.prototype.includes]
 ---*/
 
 var obj = {};
diff --git a/test/built-ins/String/prototype/includes/return-abrupt-from-searchstring.js b/test/built-ins/String/prototype/includes/return-abrupt-from-searchstring.js
index 3ac10db28..9816b9237 100644
--- a/test/built-ins/String/prototype/includes/return-abrupt-from-searchstring.js
+++ b/test/built-ins/String/prototype/includes/return-abrupt-from-searchstring.js
@@ -11,6 +11,7 @@ info: >
   7. Let searchStr be ToString(searchString).
   8. ReturnIfAbrupt(searchStr).
   ...
+features: [String.prototype.includes]
 ---*/
 
 var obj = {
diff --git a/test/built-ins/String/prototype/includes/return-abrupt-from-this-as-symbol.js b/test/built-ins/String/prototype/includes/return-abrupt-from-this-as-symbol.js
index b77380876..e2f16f6e7 100644
--- a/test/built-ins/String/prototype/includes/return-abrupt-from-this-as-symbol.js
+++ b/test/built-ins/String/prototype/includes/return-abrupt-from-this-as-symbol.js
@@ -10,7 +10,7 @@ info: >
   1. Let O be RequireObjectCoercible(this value).
   2. Let S be ToString(O).
   3. ReturnIfAbrupt(S).
-features: [Symbol]
+features: [Symbol, String.prototype.includes]
 ---*/
 
 var s = Symbol('');
diff --git a/test/built-ins/String/prototype/includes/return-abrupt-from-this.js b/test/built-ins/String/prototype/includes/return-abrupt-from-this.js
index 612dd799c..dfb0487da 100644
--- a/test/built-ins/String/prototype/includes/return-abrupt-from-this.js
+++ b/test/built-ins/String/prototype/includes/return-abrupt-from-this.js
@@ -10,8 +10,8 @@ info: >
   1. Let O be RequireObjectCoercible(this value).
   2. Let S be ToString(O).
   3. ReturnIfAbrupt(S).
+features: [String.prototype.includes]
 ---*/
-
 var o = {
   toString: function() {
     throw new Test262Error();
diff --git a/test/built-ins/String/prototype/includes/return-false-with-out-of-bounds-position.js b/test/built-ins/String/prototype/includes/return-false-with-out-of-bounds-position.js
index f3405807c..ed1d49fe8 100644
--- a/test/built-ins/String/prototype/includes/return-false-with-out-of-bounds-position.js
+++ b/test/built-ins/String/prototype/includes/return-false-with-out-of-bounds-position.js
@@ -17,6 +17,7 @@ info: >
   at index j of searchStr, return true; but if there is no such integer k,
   return false.
   ...
+features: [String.prototype.includes]
 ---*/
 
 var str = 'The future is cool!';
diff --git a/test/built-ins/String/prototype/includes/return-true-if-searchstring-is-empty.js b/test/built-ins/String/prototype/includes/return-true-if-searchstring-is-empty.js
index d8b56e9dd..be37d4b5f 100644
--- a/test/built-ins/String/prototype/includes/return-true-if-searchstring-is-empty.js
+++ b/test/built-ins/String/prototype/includes/return-true-if-searchstring-is-empty.js
@@ -17,6 +17,7 @@ info: >
   at index j of searchStr, return true; but if there is no such integer k,
   return false.
   ...
+features: [String.prototype.includes]
 ---*/
 
 var str = 'The future is cool!';
@@ -34,4 +35,4 @@ assert(
 assert(
   str.includes('', Infinity),
   'str.includes("", Infinity) returns true'
-);
\ No newline at end of file
+);
diff --git a/test/built-ins/String/prototype/includes/searchstring-found-with-position.js b/test/built-ins/String/prototype/includes/searchstring-found-with-position.js
index 979e1407b..39a7ee4d8 100644
--- a/test/built-ins/String/prototype/includes/searchstring-found-with-position.js
+++ b/test/built-ins/String/prototype/includes/searchstring-found-with-position.js
@@ -18,6 +18,7 @@ info: >
   at index j of searchStr, return true; but if there is no such integer k,
   return false.
   ...
+features: [String.prototype.includes]
 ---*/
 
 var str = 'The future is cool!';
diff --git a/test/built-ins/String/prototype/includes/searchstring-found-without-position.js b/test/built-ins/String/prototype/includes/searchstring-found-without-position.js
index f12e6f465..8a5fc3f11 100644
--- a/test/built-ins/String/prototype/includes/searchstring-found-without-position.js
+++ b/test/built-ins/String/prototype/includes/searchstring-found-without-position.js
@@ -17,6 +17,7 @@ info: >
   at index j of searchStr, return true; but if there is no such integer k,
   return false.
   ...
+features: [String.prototype.includes]
 ---*/
 
 var str = 'The future is cool!';
diff --git a/test/built-ins/String/prototype/includes/searchstring-is-regexp-throws.js b/test/built-ins/String/prototype/includes/searchstring-is-regexp-throws.js
index dc4db6d8f..568fdfc63 100644
--- a/test/built-ins/String/prototype/includes/searchstring-is-regexp-throws.js
+++ b/test/built-ins/String/prototype/includes/searchstring-is-regexp-throws.js
@@ -12,8 +12,8 @@ info: >
   5. ReturnIfAbrupt(isRegExp).
   6. If isRegExp is true, throw a TypeError exception.
   ...
+features: [String.prototype.includes]
 ---*/
-
 var searchString = /./;
 
 assert.throws(TypeError, function() {
diff --git a/test/built-ins/String/prototype/includes/searchstring-not-found-with-position.js b/test/built-ins/String/prototype/includes/searchstring-not-found-with-position.js
index 6df6e5379..e2f37ed89 100644
--- a/test/built-ins/String/prototype/includes/searchstring-not-found-with-position.js
+++ b/test/built-ins/String/prototype/includes/searchstring-not-found-with-position.js
@@ -17,8 +17,8 @@ info: >
   at index j of searchStr, return true; but if there is no such integer k,
   return false.
   ...
+features: [String.prototype.includes]
 ---*/
-
 var str = 'The future is cool!';
 
 assert.sameValue(
diff --git a/test/built-ins/String/prototype/includes/searchstring-not-found-without-position.js b/test/built-ins/String/prototype/includes/searchstring-not-found-without-position.js
index f6286a6c0..1d067b6d9 100644
--- a/test/built-ins/String/prototype/includes/searchstring-not-found-without-position.js
+++ b/test/built-ins/String/prototype/includes/searchstring-not-found-without-position.js
@@ -17,8 +17,8 @@ info: >
   at index j of searchStr, return true; but if there is no such integer k,
   return false.
   ...
+features: [String.prototype.includes]
 ---*/
-
 var str = 'The future is cool!';
 
 assert.sameValue(
diff --git a/test/built-ins/String/prototype/includes/this-is-null-throws.js b/test/built-ins/String/prototype/includes/this-is-null-throws.js
index 5a1bd93c8..22750487f 100644
--- a/test/built-ins/String/prototype/includes/this-is-null-throws.js
+++ b/test/built-ins/String/prototype/includes/this-is-null-throws.js
@@ -9,8 +9,8 @@ info: >
 
   1. Let O be RequireObjectCoercible(this value).
   2. Let S be ToString(O).
+features: [String.prototype.includes]
 ---*/
-
 assert.throws(TypeError, function() {
   String.prototype.includes.call(null, '');
 });
diff --git a/test/built-ins/String/prototype/includes/this-is-undefined-throws.js b/test/built-ins/String/prototype/includes/this-is-undefined-throws.js
index 5ec1e02dc..325c3904c 100644
--- a/test/built-ins/String/prototype/includes/this-is-undefined-throws.js
+++ b/test/built-ins/String/prototype/includes/this-is-undefined-throws.js
@@ -9,8 +9,8 @@ info: >
 
   1. Let O be RequireObjectCoercible(this value).
   2. Let S be ToString(O).
+features: [String.prototype.includes]
 ---*/
-
 assert.throws(TypeError, function() {
   String.prototype.includes.call(undefined, '');
 });