diff --git a/.circleci/config.yml b/.circleci/config.yml
index 061f802..c84ca19 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,14 +8,10 @@ jobs:
 
     steps:
       - checkout
-  #    - run:
-  #        name: update-npm
-  #        command: 'sudo npm install -g npm@latest'
 
       - restore_cache:
           keys:
           - v1-dependencies-{{ checksum "package.json" }}
-          # fallback to using the latest cache if no exact match is found
           - v1-dependencies-
 
       - run:
@@ -23,20 +19,9 @@ jobs:
           command: npm install
 
       - run:
-          name: 'globals'
+          name: globals
           command: sudo npm install karma -g
 
-      - save_cache:
-          paths:
-            - node_modules
-          key: v1-dependencies-{{ checksum "package.json" }}
-  test:
-    docker:
-      - image: circleci/node:7.10
-
-    steps:
-      - checkout
-
       - run:
           name: test
           command: npm run unit
@@ -45,14 +30,7 @@ jobs:
           path: test-results.xml
           prefix: tests
 
-workflows:
-  version: 2
-  build_and_test:
-    jobs:
-      - build
-      - test:
-          requires:
-            - build
-          filters:
-            branches:
-              only: master
+      - save_cache:
+          paths:
+            - node_modules
+          key: v1-dependencies-{{ checksum "package.json" }}
diff --git a/package.json b/package.json
index d660615..72f4189 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "build:client": "webpack --config ./build/webpack.client.config.js --progress --hide-modules",
     "build:server": "webpack --config ./build/webpack.server.config.js --progress --hide-modules",
     "lint": "eslint --ext .js,.vue src test/unit/specs",
-    "unit": "karma start test/unit/karma.conf.js",
+    "unit": "./node_modules/karma/bin/karma start test/unit/karma.conf.js",
     "build": "npm run lint && npm run unit && npm run build:client && npm run build:server"
   },
   "license": "MIT",
@@ -32,6 +32,13 @@
     "chai": "^3.5.0",
     "cross-env": "^3.0.0",
     "css-loader": "^0.25.0",
+    "eslint": "^3.19.0",
+    "eslint-config-standard": "^6.2.1",
+    "eslint-friendly-formatter": "^2.0.7",
+    "eslint-loader": "^1.7.1",
+    "eslint-plugin-html": "^2.0.0",
+    "eslint-plugin-promise": "^3.4.0",
+    "eslint-plugin-standard": "^2.0.1",
     "file-loader": "^0.9.0",
     "jasmine-core": "^2.7.0",
     "karma": "^1.4.1",
@@ -44,13 +51,6 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.31",
     "karma-webpack": "^2.0.2",
-    "eslint": "^3.19.0",
-    "eslint-config-standard": "^6.2.1",
-    "eslint-friendly-formatter": "^2.0.7",
-    "eslint-loader": "^1.7.1",
-    "eslint-plugin-html": "^2.0.0",
-    "eslint-plugin-promise": "^3.4.0",
-    "eslint-plugin-standard": "^2.0.1",
     "lolex": "^1.5.2",
     "mocha": "^3.2.0",
     "node-sass": "^4.5.0",
diff --git a/test/unit/karma.conf.js b/test/unit/karma.conf.js
index b57deca..1b1167d 100644
--- a/test/unit/karma.conf.js
+++ b/test/unit/karma.conf.js
@@ -10,7 +10,8 @@ module.exports = function(config) {
       './tests.webpack.js'
     ],
     browsers: [
-      'Chrome'
+      // 'Chrome',
+      'PhantomJS'
     ],
     preprocessors: {
       './tests.webpack.js': ['webpack', 'sourcemap']
@@ -18,7 +19,8 @@ module.exports = function(config) {
     reporters: ['spec'],
     plugins: [
       // Launchers
-      'karma-chrome-launcher',
+      // 'karma-chrome-launcher',
+      'karma-phantomjs-launcher',
 
       // Test Libraries
       'karma-mocha',