diff --git a/.travis.yml b/.travis.yml
index 90095b2dd4c..1f7b1c7dfc1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,18 +21,34 @@ notifications:
   slack:
     secure: bDwO2uce5JAZvjrvWj4+/+yEXJAIK4O0RcgUWvZ2IMbi7Q9I89Mw40JmkLWL6x2gWZwxr8+FoLtErJA7RVrsfImjrX+NmMyAB7AydLdrBJtkLozNnuacnhcnBRyp1gGCa1ymxCEXGbgC6onAD3kiJJhggr70T+2lu3IuJYXENhc=
 env:
-  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=lint
-  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=unit
-  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=codecov
-  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=about
-  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=app
-  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=bookmark-components
-  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=bravery-components
-  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=contents
-  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=misc-components
-  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=navbar-components
-  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=tab-components
-  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=performance ARTIFACTS_REGION=us-east-1
+  global:
+    - CXX=g++-4.8
+    - NODE_ENV=test
+  matrix:
+    - TEST_DIR=lint
+    - TEST_DIR=unit
+    - TEST_DIR=codecov
+    - TEST_DIR=about
+    - TEST_DIR=app
+    - TEST_DIR=bookmark-components
+    - TEST_DIR=bravery-components
+    - TEST_DIR=contents
+    - TEST_DIR=misc-components
+    - TEST_DIR=navbar-components
+    - TEST_DIR=tab-components
+    - TEST_DIR=performance ARTIFACTS_REGION=us-east-1
+matrix:
+  fast_finish: true
+  allow_failures:
+    - env: TEST_DIR=about
+    - env: TEST_DIR=app
+    - env: TEST_DIR=bookmark-components
+    - env: TEST_DIR=bravery-components
+    - env: TEST_DIR=contents
+    - env: TEST_DIR=misc-components
+    - env: TEST_DIR=navbar-components
+    - env: TEST_DIR=tab-components
+    - env: TEST_DIR=performance ARTIFACTS_REGION=us-east-1
 addons:
   apt:
     sources:
diff --git a/package.json b/package.json
index df6cc15620c..02e0207ace6 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "test": "cross-env NODE_ENV=test mocha \"test/**/*Test.js\"",
     "testsuite": "node ./tools/test.js",
     "unittest": "cross-env NODE_ENV=test mocha \"test/unit/**/*Test.js\" --globals chrome,DOMParser,XMLSerializer",
-    "unittest-cov": "node --harmony node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha --report lcovonly --report html --report text -x \"test/unit/**/*Test.js\" -- \"test/unit/**/*Test.js\"",
+    "unittest-cov": "node --harmony node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha --globals chrome,DOMParser,XMLSerializer --report lcovonly --report html --report text -x \"test/unit/**/*Test.js\" -- \"test/unit/**/*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",