diff --git a/src/cli/index.js b/src/cli/index.js
index 8e859819d7263..39f2bb94f16a5 100644
--- a/src/cli/index.js
+++ b/src/cli/index.js
@@ -1,2 +1,2 @@
-require('babel/register');
+require('babel/register')(require('../optimize/babelOptions'));
 require('./cli');
diff --git a/src/optimize/BaseOptimizer.js b/src/optimize/BaseOptimizer.js
index 722e2be1dc490..f93ad6fc901e8 100644
--- a/src/optimize/BaseOptimizer.js
+++ b/src/optimize/BaseOptimizer.js
@@ -11,6 +11,7 @@ let utils = require('requirefrom')('src/utils');
 let fromRoot = utils('fromRoot');
 let OptmzBundles = require('./OptmzBundles');
 let OptmzUiModules = require('./OptmzUiModules');
+let babelOptions = require('./babelOptions');
 
 let kbnTag = `Kibana ${ utils('packageJson').version }`;
 
@@ -75,22 +76,16 @@ class BaseOptimizer extends EventEmitter {
             test: /\.js$/,
             exclude: /(node_modules|bower_components)/,
             loader: 'babel',
-            query: {
-              optional: ['runtime'],
-              stage: 1,
-              nonStandard: false
-            }
+            query: babelOptions
           },
           {
             // explicitly require .jsx extension to support jsx
             test: /\.jsx$/,
             exclude: /(node_modules|bower_components)/,
             loader: 'babel',
-            query: {
-              optional: ['runtime'],
-              stage: 1,
+            query: _.defaults({
               nonStandard: true
-            }
+            }, babelOptions)
           }
         ].concat(this.modules.loaders),
         noParse: this.modules.noParse,
diff --git a/src/optimize/babelOptions.js b/src/optimize/babelOptions.js
new file mode 100644
index 0000000000000..48698b7cbb8fe
--- /dev/null
+++ b/src/optimize/babelOptions.js
@@ -0,0 +1,5 @@
+module.exports = {
+  optional: ['runtime'],
+  stage: 1,
+  nonStandard: false
+};