diff --git a/package.json b/package.json
index bd8f95c75..68ba32b2d 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "extract-text-webpack-plugin": "^1.0.1",
     "file-loader": "^0.9.0",
     "html-webpack-plugin": "^2.7.1",
-    "isparta-loader": "^2.0.0",
+    "istanbul-instrumenter-loader": "^1.0.0",
     "jasmine-core": "^2.3.4",
     "karma": "^1.1.0",
     "karma-coverage": "^1.0.0",
diff --git a/webpack.config.js b/webpack.config.js
index 519c3bb30..7fbeb57ac 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -119,10 +119,10 @@ module.exports = function makeWebpackConfig () {
     }]
   };
 
-  // ISPARTA LOADER
-  // Reference: https://github.com/ColCh/isparta-instrumenter-loader
-  // Instrument JS files with Isparta for subsequent code coverage reporting
-  // Skips node_modules and files that end with .test.js
+  // ISTANBUL LOADER
+  // https://github.com/deepsweet/istanbul-instrumenter-loader
+  // Instrument JS files with istanbul-lib-instrument for subsequent code coverage reporting
+  // Skips node_modules and files that end with .test
   if (isTest) {
     config.module.preLoaders.push({
       test: /\.js$/,
@@ -130,7 +130,10 @@ module.exports = function makeWebpackConfig () {
         /node_modules/,
         /\.spec\.js$/
       ],
-      loader: 'isparta-loader'
+      loader: 'istanbul-instrumenter',
+      query: {
+        esModules: true
+      }
     })
   }