diff --git a/package.json b/package.json
index 248af5cc..75c4e653 100644
--- a/package.json
+++ b/package.json
@@ -44,9 +44,9 @@
     "chai-as-promised": "^5.3.0",
     "cross-env": "^3.1.2",
     "devtron": "^1.3.0",
+    "electron": "1.4.2",
     "electron-builder": "^7.11.2",
     "electron-connect": "~0.6.0",
-    "electron-prebuilt": "1.4.2",
     "eslint": "^3.4.0",
     "eslint-plugin-react": "^6.2.0",
     "gulp": "^3.9.1",
@@ -69,13 +69,16 @@
         "tar.gz"
       ],
       "synopsis": "Mattermost",
-      "extraFiles": [{
-        "from": "resources",
-        "filter": "icon.png"
-      }, {
-        "from": "resources/linux",
-        "filter": "create_desktop_file.sh"
-      }]
+      "extraFiles": [
+        {
+          "from": "resources",
+          "filter": "icon.png"
+        },
+        {
+          "from": "resources/linux",
+          "filter": "create_desktop_file.sh"
+        }
+      ]
     },
     "mac": {
       "category": "public.app-category.productivity",
diff --git a/test/modules/environment.js b/test/modules/environment.js
index 42162b84..4b3c645c 100644
--- a/test/modules/environment.js
+++ b/test/modules/environment.js
@@ -12,10 +12,10 @@ const Application = require('spectron').Application;
 const sourceRootDir = path.join(__dirname, '../..');
 const electronBinaryPath = (() => {
   if (process.platform === 'darwin') {
-    return path.join(sourceRootDir, 'node_modules/electron-prebuilt/dist/Electron.app/Contents/MacOS/Electron');
+    return path.join(sourceRootDir, 'node_modules/electron/dist/Electron.app/Contents/MacOS/Electron');
   }
   const exeExtension = (process.platform === 'win32') ? '.exe' : '';
-  return path.join(sourceRootDir, 'node_modules/electron-prebuilt/dist/electron' + exeExtension);
+  return path.join(sourceRootDir, 'node_modules/electron/dist/electron' + exeExtension);
 })();
 const configFilePath = path.join(sourceRootDir, 'test/test_config.json');
 const mattermostURL = 'http://example.com/team';