diff --git a/package.json b/package.json
index a5291e0439..fe05d2efd9 100644
--- a/package.json
+++ b/package.json
@@ -32,9 +32,10 @@
     "start": "node ./tools/start.js --user-data-dir=brave-development --debug=5858 --enable-logging --v=0 --enable-extension-activity-logging --enable-sandbox-logging --enable-dcheck",
     "start2": "node ./tools/start.js --user-data-dir=brave-development-2 --debug=5859 --enable-logging --v=0 --enable-extension-activity-logging --enable-sandbox-logging --enable-dcheck",
     "start-brk": "node ./tools/start.js --debug-brk=5858 -enable-logging --v=0 --enable-dcheck",
-    "test": "cross-env NODE_ENV=test mocha --require babel-register --require babel-polyfill --recursive \"test/**/*Test.js\"",
-    "unittest": "cross-env NODE_ENV=test mocha --require babel-register --require babel-polyfill --recursive \"test/unit/**/*Test.js\"",
-    "uitest": "cross-env NODE_ENV=test mocha --require babel-register --require babel-polyfill --recursive \"test/about/**/*Test.js\" \"test/app/**/*Test.js\" \"test/components/**/*Test.js\" \"test/lib/**/*Test.js\"",
+    "test": "cross-env NODE_ENV=test mocha \"test/**/*Test.js\"",
+    "unittest": "cross-env NODE_ENV=test mocha \"test/unit/**/*Test.js\"",
+    "unittest-cov": "node --harmony node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha --report html --report text -x \"test/unit/**/*Test.js\" -- \"test/unit/**/*Test.js\"",
+    "uitest": "cross-env NODE_ENV=test mocha \"test/about/**/*Test.js\" \"test/app/**/*Test.js\" \"test/components/**/*Test.js\" \"test/lib/**/*Test.js\"",
     "update-pdfjs": "rm -r app/extensions/pdfjs/; cp -r ../pdf.js/build/chromium/ app/extensions/pdfjs/",
     "update-psl": "./tools/updatepsl.sh",
     "vagrant-destroy-linux": "VAGRANT_CWD=./test/vms/vagrant/ubuntu-14.04 vagrant destroy",
@@ -149,6 +150,7 @@
     "git-rev-sync": "^1.8.0",
     "gulp": "^3.9.0",
     "joi": "^10.2.2",
+    "istanbul": "^1.1.0-alpha.1",
     "jsdom": "9.4.1",
     "jsdom-global": "2.0.0",
     "jsdox": "^0.4.9",
diff --git a/test/app/renderer/components/messageBoxTest.js b/test/app/renderer/components/messageBoxTest.js
index 4824bdc9dc..3b02a91be8 100644
--- a/test/app/renderer/components/messageBoxTest.js
+++ b/test/app/renderer/components/messageBoxTest.js
@@ -185,14 +185,16 @@ describe('MessageBox component tests', function () {
         yield this.app.client
           .ipcSend(messages.SHORTCUT_NEW_FRAME, page1)
           .waitForTabCount(2)
-          .waitForVisible('#thelink[href="page2.html"]', 1000)
+
+        yield this.app.client
+          .waitForVisible('#thelink[href="page2.html"]', 5000)
 
         // load a basic history for this tab
         yield this.app.client
-          .loadUrl(page2)
-          .waitForVisible('#thelink[href="page1.html"]', 1000)
-          .loadUrl(page1)
-          .waitForVisible('#thelink[href="page2.html"]', 1000)
+          .url(page2)
+          .waitForVisible('#thelink[href="page1.html"]', 5000)
+          .url(page1)
+          .waitForVisible('#thelink[href="page2.html"]', 5000)
       })
 
       it('lets you follow links in the tab', function * () {
diff --git a/test/mocha.opts b/test/mocha.opts
index f482d780dc..cdab9ed320 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -2,3 +2,6 @@
 --timeout 600s
 --reporter spec
 --check-leaks
+--require babel-register
+--require babel-polyfill
+--recursive