diff --git a/.circleci/config.yml b/.circleci/config.yml
index c14909783..8ebf569a5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,6 +12,9 @@ workflows:
       - test-lint:
           requires:
             - prep-deps-npm
+      - test-e2e:
+          requires:
+            - prep-deps-npm
       - test-unit:
           requires:
             - prep-deps-npm
@@ -96,6 +99,20 @@ jobs:
           name: Test
           command: npm run lint
 
+  test-e2e:
+    docker:
+      - image: circleci/node:8-browsers
+    steps:
+      - checkout
+      - restore_cache:
+          key: dependency-cache-{{ checksum "package-lock.json" }}
+      - run:
+          name: Build
+          command: npm run dist
+      - run:
+          name: Test
+          command: npm run test:e2e
+
   test-unit:
     docker:
       - image: circleci/node:8-browsers
diff --git a/package.json b/package.json
index 09e90ec59..0e5456b1f 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "test:single": "cross-env METAMASK_ENV=test mocha --require test/helper.js",
     "test:integration": "npm run test:integration:build && npm run test:flat && npm run test:mascara",
     "test:integration:build": "gulp build:scss",
-    "test:e2e": "METAMASK_ENV=test mocha test/e2e/metamask.spec --recursive || true",
+    "test:e2e": "METAMASK_ENV=test mocha test/e2e/metamask.spec --recursive",
     "test:coverage": "nyc npm run test:unit && npm run test:coveralls-upload",
     "test:coveralls-upload": "if [ $COVERALLS_REPO_TOKEN ]; then nyc report --reporter=text-lcov | coveralls; fi",
     "test:flat": "npm run test:flat:build && karma start test/flat.conf.js",