diff --git a/webpack.config.js b/webpack.config.js
index 5647e19e..190db37f 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -25,12 +25,9 @@ module.exports = {
   module: {
     loaders: [
       {
-        test: /\.jsx*$/,
+        test: /\.jsx?$/,
         exclude: [/node_modules/, /.+\.config.js/],
-        loader: 'babel',
-        query: {
-          presets: ['react-hmre'],
-        },
+        loaders: ['babel?presets[]=react-hmre', 'eslint-loader']
       },
       {
         test: /\.scss$/,