diff --git a/.eslintignore b/.eslintignore
index 4a002ec5..66d14433 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,4 +1,4 @@
-dist/
+**/*_bundle.js
 node_modules/
 release/
 src/node_modules/
diff --git a/src/main.js b/src/main.js
index 6e00cf99..880b3861 100644
--- a/src/main.js
+++ b/src/main.js
@@ -481,7 +481,7 @@ app.on('ready', () => {
   }
 
   // and load the index.html of the app.
-  if (isDev) {
+  if (isDev && !argv.testMode) {
     mainWindow.loadURL('http://localhost:8080/browser/index.html');
   } else {
     mainWindow.loadURL('file://' + __dirname + '/browser/index.html');
diff --git a/test/modules/environment.js b/test/modules/environment.js
index f45e8d3b..46b3b963 100644
--- a/test/modules/environment.js
+++ b/test/modules/environment.js
@@ -44,7 +44,7 @@ module.exports = {
   getSpectronApp() {
     const app = new Application({
       path: electronBinaryPath,
-      args: [`${path.join(sourceRootDir, 'dist')}`, `--data-dir=${userDataDir}`]
+      args: [`${path.join(sourceRootDir, 'src')}`, `--data-dir=${userDataDir}`, '--test-mode']
     });
     chaiAsPromised.transferPromiseness = app.transferPromiseness;
     return app;
@@ -52,7 +52,7 @@ module.exports = {
 
   addClientCommands(client) {
     client.addCommand('loadSettingsPage', function async() {
-      return this.url('file://' + path.join(sourceRootDir, 'dist/browser/settings.html')).waitUntilWindowLoaded();
+      return this.url('file://' + path.join(sourceRootDir, 'src/browser/settings.html')).waitUntilWindowLoaded();
     });
     client.addCommand('isNodeEnabled', function async() {
       return this.execute(() => {