diff --git a/modules/swagger-codegen/src/main/resources/Javascript/es6/.babelrc.mustache b/modules/swagger-codegen/src/main/resources/Javascript/es6/.babelrc.mustache
index bcb6ee8de93..67b369ed370 100644
--- a/modules/swagger-codegen/src/main/resources/Javascript/es6/.babelrc.mustache
+++ b/modules/swagger-codegen/src/main/resources/Javascript/es6/.babelrc.mustache
@@ -1,3 +1,3 @@
 {
-  "presets": ["es2015", "stage-0"]
-}
\ No newline at end of file
+  "presets": ["env", "stage-0"]
+}
diff --git a/modules/swagger-codegen/src/main/resources/Javascript/es6/package.mustache b/modules/swagger-codegen/src/main/resources/Javascript/es6/package.mustache
index 179f5cd3c73..997c5e24055 100644
--- a/modules/swagger-codegen/src/main/resources/Javascript/es6/package.mustache
+++ b/modules/swagger-codegen/src/main/resources/Javascript/es6/package.mustache
@@ -12,12 +12,12 @@
   },
   "dependencies": {
     "babel": "^6.23.0",
-    "babel-cli": "^6.24.1",
+    "babel-cli": "^6.26.0",
     "superagent": "3.5.2"
   },
   "devDependencies": {
-    "babel-core": "6.18.0",
-    "babel-preset-es2015": "^6.24.1",
+    "babel-core": "6.26.0",
+    "babel-preset-env": "^1.6.1",
     "babel-preset-stage-0": "^6.24.1",
     "expect.js": "~0.3.1",
     "mocha": "~2.3.4",
diff --git a/samples/client/petstore/javascript-es6/.babelrc b/samples/client/petstore/javascript-es6/.babelrc
index bcb6ee8de93..67b369ed370 100644
--- a/samples/client/petstore/javascript-es6/.babelrc
+++ b/samples/client/petstore/javascript-es6/.babelrc
@@ -1,3 +1,3 @@
 {
-  "presets": ["es2015", "stage-0"]
-}
\ No newline at end of file
+  "presets": ["env", "stage-0"]
+}
diff --git a/samples/client/petstore/javascript-es6/package.json b/samples/client/petstore/javascript-es6/package.json
index 427e6b3a506..afb99e8a97a 100644
--- a/samples/client/petstore/javascript-es6/package.json
+++ b/samples/client/petstore/javascript-es6/package.json
@@ -12,12 +12,12 @@
   },
   "dependencies": {
     "babel": "^6.23.0",
-    "babel-cli": "^6.24.1",
+    "babel-cli": "^6.26.0",
     "superagent": "3.5.2"
   },
   "devDependencies": {
-    "babel-core": "6.18.0",
-    "babel-preset-es2015": "^6.24.1",
+    "babel-core": "6.26.0",
+    "babel-preset-env": "^1.6.1",
     "babel-preset-stage-0": "^6.24.1",
     "expect.js": "~0.3.1",
     "mocha": "~2.3.4",
diff --git a/samples/client/petstore/javascript-promise-es6/.babelrc b/samples/client/petstore/javascript-promise-es6/.babelrc
index bcb6ee8de93..67b369ed370 100644
--- a/samples/client/petstore/javascript-promise-es6/.babelrc
+++ b/samples/client/petstore/javascript-promise-es6/.babelrc
@@ -1,3 +1,3 @@
 {
-  "presets": ["es2015", "stage-0"]
-}
\ No newline at end of file
+  "presets": ["env", "stage-0"]
+}
diff --git a/samples/client/petstore/javascript-promise-es6/package.json b/samples/client/petstore/javascript-promise-es6/package.json
index 427e6b3a506..afb99e8a97a 100644
--- a/samples/client/petstore/javascript-promise-es6/package.json
+++ b/samples/client/petstore/javascript-promise-es6/package.json
@@ -12,12 +12,12 @@
   },
   "dependencies": {
     "babel": "^6.23.0",
-    "babel-cli": "^6.24.1",
+    "babel-cli": "^6.26.0",
     "superagent": "3.5.2"
   },
   "devDependencies": {
-    "babel-core": "6.18.0",
-    "babel-preset-es2015": "^6.24.1",
+    "babel-core": "6.26.0",
+    "babel-preset-env": "^1.6.1",
     "babel-preset-stage-0": "^6.24.1",
     "expect.js": "~0.3.1",
     "mocha": "~2.3.4",