diff --git a/karma.conf.js b/karma.conf.js
index 7a866d902d..4604e1355a 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -1,16 +1,20 @@
-// karma.conf.js
+// karma.conf.js - the config file for karma, which runs our tests.
+
 var webpack = require('webpack');
 var path = require('path');
 
 /*
- * It's a pain to have to wait for webpack to build everything; however it's
- * the easiest way to load our dependencies from node_modules.
+ * We use webpack to build our tests. It's a pain to have to wait for webpack
+ * to build everything; however it's the easiest way to load our dependencies
+ * from node_modules.
  *
  * TODO:
  * - can we run one test at a time
- * - can we can we run under phantomjs/jsdom?
  * - write junit out
  */
+
+process.env.PHANTOMJS_BIN = 'node_modules/.bin/phantomjs';
+
 module.exports = function (config) {
     config.set({
         // frameworks to use
diff --git a/package.json b/package.json
index 60ff7f7b05..186ed6681e 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "start": "babel src -w -d lib --source-maps",
     "clean": "rimraf lib",
     "prepublish": "npm run build; git rev-parse HEAD > git-revision.txt",
-    "test": "karma start",
+    "test": "karma start --browsers PhantomJS",
     "test-multi": "karma start --single-run=false"
   },
   "dependencies": {
@@ -44,18 +44,19 @@
   "//depsbuglink": "https://github.com/webpack/webpack/issues/1472",
   "devDependencies": {
     "babel": "^5.8.23",
+    "expect": "^1.16.0",
     "json-loader": "^0.5.3",
+    "karma": "^0.13.22",
+    "karma-chrome-launcher": "^0.2.3",
+    "karma-cli": "^0.1.2",
+    "karma-mocha": "^0.2.2",
+    "karma-phantomjs-launcher": "^1.0.0",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-webpack": "^1.7.0",
+    "mocha": "^2.4.5",
+    "phantomjs-prebuilt": "^2.1.7",
     "require-json": "0.0.1",
     "rimraf": "^2.4.3",
-    "source-map-loader": "^0.1.5",
-
-    "karma": "^0.0.0",
-    "karma-cli": "^0.0.0",
-    "karma-mocha": "^0.0.0",
-    "karma-webpack": "^0.0.0",
-    "karma-sourcemap-loader": "^0.0.0",
-    "karma-chrome-launcher": "^0.0.0",
-    "mocha": "^0.0.0",
-    "expect": "^0.0.0"
+    "source-map-loader": "^0.1.5"
   }
 }