diff --git a/.babelrc b/.babelrc
new file mode 100644
index 000000000..af0f0c3d3
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["es2015"]
+}
\ No newline at end of file
diff --git a/client/lib/batch-results.js b/client/lib/batch-results.js
index 0e5fec8f8..f1d7a2942 100644
--- a/client/lib/batch-results.js
+++ b/client/lib/batch-results.js
@@ -1,3 +1,5 @@
+"use strict";
+
 var FixtureLibrary = require('./fixtures/fixture-library');
 var Specification = require('./model/specification');
 var ResultCache = require('./stores/result-cache');
diff --git a/client/lib/fixtures/fixture-library.js b/client/lib/fixtures/fixture-library.js
index 502995213..475ed7165 100644
--- a/client/lib/fixtures/fixture-library.js
+++ b/client/lib/fixtures/fixture-library.js
@@ -1,3 +1,5 @@
+"use strict";
+
 var Fixture = require('./fixture');
 var Comment = require('./../model/comment');
 var _ = require('lodash');
diff --git a/client/lib/fixtures/fixture.js b/client/lib/fixtures/fixture.js
index ec75be668..749388c38 100644
--- a/client/lib/fixtures/fixture.js
+++ b/client/lib/fixtures/fixture.js
@@ -1,3 +1,5 @@
+"use strict";
+
 var MissingGrammar = require('./../grammars/missing-grammar');
 var Section = require('./../model/section');
 var _ = require('lodash');
diff --git a/client/lib/grammars/missing-grammar.js b/client/lib/grammars/missing-grammar.js
index 2efe49295..6ec08dc02 100644
--- a/client/lib/grammars/missing-grammar.js
+++ b/client/lib/grammars/missing-grammar.js
@@ -1,3 +1,5 @@
+"use strict";
+
 var Step = require('./../model/step');
 
 class MissingGrammar{
diff --git a/client/lib/model/arg-collection.js b/client/lib/model/arg-collection.js
index e75eb9012..66fde7985 100644
--- a/client/lib/model/arg-collection.js
+++ b/client/lib/model/arg-collection.js
@@ -1,3 +1,5 @@
+"use strict";
+
 var Arg = require('./arg');
 var _ = require('lodash');
 
diff --git a/client/lib/model/arg.js b/client/lib/model/arg.js
index 7adeae216..72994e07f 100644
--- a/client/lib/model/arg.js
+++ b/client/lib/model/arg.js
@@ -1,3 +1,5 @@
+"use strict";
+
 var uuid = require('node-uuid');
 
 class Arg{
diff --git a/client/lib/model/comment.js b/client/lib/model/comment.js
index b456cc25f..071d73983 100644
--- a/client/lib/model/comment.js
+++ b/client/lib/model/comment.js
@@ -1,3 +1,4 @@
+"use strict";
 
 var uuid = require('node-uuid');
 var Arg = require('./../model/arg');
diff --git a/client/lib/model/section.js b/client/lib/model/section.js
index 2759bce97..eb4200e5c 100644
--- a/client/lib/model/section.js
+++ b/client/lib/model/section.js
@@ -1,3 +1,5 @@
+"use strict";
+
 var uuid = require('node-uuid');
 var StepHolder = require('./step-holder');
 var _ = require('lodash');
diff --git a/client/lib/model/specification.js b/client/lib/model/specification.js
index 464a7216c..faaf925e6 100644
--- a/client/lib/model/specification.js
+++ b/client/lib/model/specification.js
@@ -1,3 +1,5 @@
+"use strict";
+
 var StepHolder = require('./step-holder');
 var _ = require('lodash');
 var uuid = require('node-uuid');
diff --git a/client/lib/model/step.js b/client/lib/model/step.js
index 77dc7c811..69ab79242 100644
--- a/client/lib/model/step.js
+++ b/client/lib/model/step.js
@@ -1,3 +1,4 @@
+"use strict";
 
 var uuid = require('node-uuid');
 var ArgCollection = require('./arg-collection');
diff --git a/client/lib/model/suite.js b/client/lib/model/suite.js
index 3766a8c65..dbb9e2138 100644
--- a/client/lib/model/suite.js
+++ b/client/lib/model/suite.js
@@ -1,3 +1,5 @@
+"use strict";
+
 var Spec = require('./specification');
 var _ = require('lodash');
 
diff --git a/client/lib/presentation/adder.js b/client/lib/presentation/adder.js
index 895465d1c..e4b77b75c 100644
--- a/client/lib/presentation/adder.js
+++ b/client/lib/presentation/adder.js
@@ -1,3 +1,4 @@
+"use strict";
 
 class Adder {
 	constructor(holder, text){
diff --git a/package.json b/package.json
index 410b5b578..6923dfbc9 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "tdd-mocha": "mocha -w -G",
     "test": "npm run test-mocha && npm run test-karma && npm run smoke-test",
     "test-karma": "karma start --single-run",
-    "test-mocha": "mocha",
+    "test-mocha": "mocha --compilers js:babel-core/register",
     "build-server": "paket install && node build/buildServer.js"
   },
   "devDependencies": {
@@ -23,6 +23,7 @@
     "babel-polyfill": "^6.3.14",
     "babel-preset-es2015": "^6.3.13",
     "babel-preset-react": "^6.3.13",
+    "babel-register": "^6.3.13",
     "chai": "^3.4.1",
     "history": "^1.13.1",
     "jquery": "^2.1.4",
diff --git a/test/mocha.opts b/test/mocha.opts
index eb37f08ea..e446e1ec1 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1,5 +1,5 @@
 client/lib-tests/**/test-*.js
---compilers js:babel/register
+--compilers js:babel-core/register
 --recursive
 --reporter spec
 --bail
diff --git a/webpack.config.js b/webpack.config.js
index 0ea6b5e77..9e14af4ad 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -28,6 +28,13 @@ module.exports = {
         query: {
           presets: ['react', 'es2015']
         }
+      },
+      {
+        test: /\.js$/,
+        loader: 'babel', // 'babel-loader' is also a legal name to reference 
+        query: {
+          presets: ['es2015']
+        }
       }
     ]
   },