diff --git a/experimental/babel-preset-env/data/builtInFeatures.js b/experimental/babel-preset-env/data/builtInFeatures.js
index f1153e268c..9d794954ea 100644
--- a/experimental/babel-preset-env/data/builtInFeatures.js
+++ b/experimental/babel-preset-env/data/builtInFeatures.js
@@ -1,9 +1,6 @@
 // https://github.com/zloirock/core-js
 
-module.exports = {
-  // es2015
-  // core-js/fn/map
-
+const es2015 = {
   // "es6.typed/array-buffer": "typed arrays / ",
   "es6.typed.data-view": "typed arrays / DataView",
   "es6.typed.int8-array": "typed arrays / Int8Array",
@@ -111,7 +108,18 @@ module.exports = {
   "es6.math.sinh": "Math methods / Math.sinh",
   "es6.math.tanh": "Math methods / Math.tanh",
   "es6.math.trunc": "Math methods / Math.trunc",
-
-  "es7.string.pad-start": "String padding / String.prototype.padStart",
-  "es7.string.pad-end": "String padding / String.prototype.padEnd"
 };
+
+const es2016 = {
+  "es7.array.includes.js": "Array.prototype.includes",
+};
+
+const es2017 = {
+  "es7.object.values": "Object.values",
+  "es7.object.entries": "Object.entries",
+  "es7.object.get-own-property-descriptors": "Object.getOwnPropertyDescriptors",
+  "es7.string.pad-start": "String padding / String.prototype.padStart",
+  "es7.string.pad-end": "String padding / String.prototype.padEnd",
+};
+
+module.exports = Object.assign({}, es2015, es2016, es2017);
diff --git a/experimental/babel-preset-env/test/fixtures/preset-options/use-builtins-import/expected.js b/experimental/babel-preset-env/test/fixtures/preset-options/use-builtins-import/expected.js
index 2a549c9084..9204db70e8 100644
--- a/experimental/babel-preset-env/test/fixtures/preset-options/use-builtins-import/expected.js
+++ b/experimental/babel-preset-env/test/fixtures/preset-options/use-builtins-import/expected.js
@@ -4,5 +4,7 @@ import "core-js/modules/es6.reflect.own-keys";
 import "core-js/modules/es6.symbol.iterator";
 import "core-js/modules/es6.symbol.species";
 import "core-js/modules/es6.array.from";
+import "core-js/modules/es7.string.pad-start";
+import "core-js/modules/es7.string.pad-end";
 
 1 ** 2;
diff --git a/experimental/babel-preset-env/test/fixtures/preset-options/use-builtins-multiple-imports/expected.js b/experimental/babel-preset-env/test/fixtures/preset-options/use-builtins-multiple-imports/expected.js
index 63154103bd..9204db70e8 100644
--- a/experimental/babel-preset-env/test/fixtures/preset-options/use-builtins-multiple-imports/expected.js
+++ b/experimental/babel-preset-env/test/fixtures/preset-options/use-builtins-multiple-imports/expected.js
@@ -4,5 +4,7 @@ import "core-js/modules/es6.reflect.own-keys";
 import "core-js/modules/es6.symbol.iterator";
 import "core-js/modules/es6.symbol.species";
 import "core-js/modules/es6.array.from";
+import "core-js/modules/es7.string.pad-start";
+import "core-js/modules/es7.string.pad-end";
 
-1 ** 2;
\ No newline at end of file
+1 ** 2;
diff --git a/experimental/babel-preset-env/test/fixtures/preset-options/use-builtins-require/expected.js b/experimental/babel-preset-env/test/fixtures/preset-options/use-builtins-require/expected.js
index 68b7a9e2db..a55b23b8b6 100644
--- a/experimental/babel-preset-env/test/fixtures/preset-options/use-builtins-require/expected.js
+++ b/experimental/babel-preset-env/test/fixtures/preset-options/use-builtins-require/expected.js
@@ -10,4 +10,8 @@ require("core-js/modules/es6.symbol.species");
 
 require("core-js/modules/es6.array.from");
 
+require("core-js/modules/es7.string.pad-start");
+
+require("core-js/modules/es7.string.pad-end");
+
 1 ** 2;