diff --git a/features.txt b/features.txt
index 4c146761d0549834c3e6b573b0683cf2a839741f..e8928baa9226bab944acc1b45de22da3e448e841 100644
--- a/features.txt
+++ b/features.txt
@@ -137,6 +137,7 @@ Reflect.construct
 Reflect.set
 Reflect.setPrototypeOf
 Set
+String.fromCodePoint
 String.prototype.endsWith
 String.prototype.includes
 super
diff --git a/test/built-ins/String/fromCodePoint/argument-is-Symbol.js b/test/built-ins/String/fromCodePoint/argument-is-Symbol.js
index 6b192d02b1319ea92c4434773382b87d26285669..266c0c523921b1e718b8e97060796c68001337bd 100644
--- a/test/built-ins/String/fromCodePoint/argument-is-Symbol.js
+++ b/test/built-ins/String/fromCodePoint/argument-is-Symbol.js
@@ -15,7 +15,7 @@ info: |
     a. Let next be codePoints[nextIndex].
     b. Let nextCP be ToNumber(next).
     c. ReturnIfAbrupt(nextCP).
-features: [Symbol]
+features: [Symbol, String.fromCodePoint]
 ---*/
 
 assert.throws(TypeError, function() {
diff --git a/test/built-ins/String/fromCodePoint/argument-is-not-integer.js b/test/built-ins/String/fromCodePoint/argument-is-not-integer.js
index 1546579805c983d820fe1dcdcef8aa6db374bc5c..72d63b4e67740babd381ba8b365cc91faad7b2fe 100644
--- a/test/built-ins/String/fromCodePoint/argument-is-not-integer.js
+++ b/test/built-ins/String/fromCodePoint/argument-is-not-integer.js
@@ -18,6 +18,7 @@ info: |
     d. If SameValue(nextCP, ToInteger(nextCP)) is false, throw a RangeError
     exception.
   ...
+features: [String.fromCodePoint]
 ---*/
 
 assert.throws(RangeError, function() {
diff --git a/test/built-ins/String/fromCodePoint/argument-not-coercible.js b/test/built-ins/String/fromCodePoint/argument-not-coercible.js
index c7f6ab8f94de7189c3cc0b8c27b9ab04fa392d67..d6533927388e4bf708daa8b3b509ffc96c2fa26e 100644
--- a/test/built-ins/String/fromCodePoint/argument-not-coercible.js
+++ b/test/built-ins/String/fromCodePoint/argument-not-coercible.js
@@ -15,6 +15,7 @@ info: |
     a. Let next be codePoints[nextIndex].
     b. Let nextCP be ToNumber(next).
     c. ReturnIfAbrupt(nextCP).
+features: [String.fromCodePoint]
 ---*/
 
 var obj = {};
diff --git a/test/built-ins/String/fromCodePoint/arguments-is-empty.js b/test/built-ins/String/fromCodePoint/arguments-is-empty.js
index 686ac1327684161cc2296f1e677db202f8805e7c..252ed951d5cca38d947331ff1b2294c8bf2509d5 100644
--- a/test/built-ins/String/fromCodePoint/arguments-is-empty.js
+++ b/test/built-ins/String/fromCodePoint/arguments-is-empty.js
@@ -17,6 +17,7 @@ info: |
   6. Return the String value whose elements are, in order, the elements in the
   List elements. If length is 0, the empty string is returned.
 
+features: [String.fromCodePoint]
 ---*/
 
 assert.sameValue(String.fromCodePoint(), '');
diff --git a/test/built-ins/String/fromCodePoint/fromCodePoint.js b/test/built-ins/String/fromCodePoint/fromCodePoint.js
index 34f4291d9f229319569141df6c7856dcf21940bc..3861f0f1fd799c525e09257f3f5e3013c909c7d2 100644
--- a/test/built-ins/String/fromCodePoint/fromCodePoint.js
+++ b/test/built-ins/String/fromCodePoint/fromCodePoint.js
@@ -9,6 +9,7 @@ info: |
 
   17 ECMAScript Standard Built-in Objects
 includes: [propertyHelper.js]
+features: [String.fromCodePoint]
 ---*/
 
 verifyNotEnumerable(String, 'fromCodePoint');
diff --git a/test/built-ins/String/fromCodePoint/length.js b/test/built-ins/String/fromCodePoint/length.js
index c2f8cc15eb0866b771a05215966f9b76eca6ea36..28a154c4d67cf811faa5621f8609d0c3b98b6c3a 100644
--- a/test/built-ins/String/fromCodePoint/length.js
+++ b/test/built-ins/String/fromCodePoint/length.js
@@ -5,6 +5,7 @@ es6id: 21.1.2.2
 description: >
   The length property of the String.fromCodePoint constructor is 1.
 includes: [propertyHelper.js]
+features: [String.fromCodePoint]
 ---*/
 
 assert.sameValue(
diff --git a/test/built-ins/String/fromCodePoint/name.js b/test/built-ins/String/fromCodePoint/name.js
index 09d35854239414c5f48b5858ac1b1ee5b97820e2..be0f98a800dfd295fdcb68195fde59941310c2ff 100644
--- a/test/built-ins/String/fromCodePoint/name.js
+++ b/test/built-ins/String/fromCodePoint/name.js
@@ -9,6 +9,7 @@ info: |
 
   17 ECMAScript Standard Built-in Objects
 includes: [propertyHelper.js]
+features: [String.fromCodePoint]
 ---*/
 
 assert.sameValue(
diff --git a/test/built-ins/String/fromCodePoint/number-is-out-of-range.js b/test/built-ins/String/fromCodePoint/number-is-out-of-range.js
index 0c54b46d2998cb13175fe5bc54a2b7091d70bd0e..5319d471156e90156b967f313e9ec19bd40bddf2 100644
--- a/test/built-ins/String/fromCodePoint/number-is-out-of-range.js
+++ b/test/built-ins/String/fromCodePoint/number-is-out-of-range.js
@@ -19,6 +19,7 @@ info: |
     exception.
     e. If nextCP < 0 or nextCP > 0x10FFFF, throw a RangeError exception.
   ...
+features: [String.fromCodePoint]
 ---*/
 
 assert.throws(RangeError, function() {
diff --git a/test/built-ins/String/fromCodePoint/return-string-value.js b/test/built-ins/String/fromCodePoint/return-string-value.js
index 9099af779c230dfe2554cc9bef73b4b931d6d777..0c21f1860be227de639c09589d54fc7b0db583b2 100644
--- a/test/built-ins/String/fromCodePoint/return-string-value.js
+++ b/test/built-ins/String/fromCodePoint/return-string-value.js
@@ -17,6 +17,7 @@ info: |
     g. Let nextIndex be nextIndex + 1.
   6. Return the String value whose elements are, in order, the elements in the
   List elements. If length is 0, the empty string is returned.
+features: [String.fromCodePoint]
 ---*/
 
 assert.sameValue(String.fromCodePoint(0), '\x00');
diff --git a/test/built-ins/String/fromCodePoint/to-number-conversions.js b/test/built-ins/String/fromCodePoint/to-number-conversions.js
index 84dac44c2a60726ce13a552f219e7d79087a7e1b..6dca1ebee722d24bf1acac63110ea6cf4be9b5cf 100644
--- a/test/built-ins/String/fromCodePoint/to-number-conversions.js
+++ b/test/built-ins/String/fromCodePoint/to-number-conversions.js
@@ -17,6 +17,7 @@ info: |
   List elements. If length is 0, the empty string is returned.
 
   Ref: 7.1.3 ToNumber ( argument )
+features: [String.fromCodePoint]
 ---*/
 
 assert.sameValue(String.fromCodePoint(null), '\x00');