diff --git a/package.json b/package.json
index 3628608bde..ab6b4d9281 100644
--- a/package.json
+++ b/package.json
@@ -10,18 +10,21 @@
     "exchange"
   ],
   "scripts": {
+    "build": "npm run clean && run-p build:*",
+    "lint": "tslint src/**/*.ts",
+    "test": "run-s build test:commonjs test:umd",
+    "test:coverage": "nyc npm run test --all",
+    "update_contracts": "for i in ${npm_package_config_artifacts}; do copyfiles -u 4 ../contracts/build/contracts/$i.json ../0x.js/src/artifacts; done;",
+    "testrpc": "testrpc -p 8545 --networkId 50",
+
     "clean": "shx rm -rf _bundles lib",
     "build:umd": "webpack",
     "build:commonjs": "tsc; copyfiles -u 2 ./src/artifacts/*.json ../0x.js/lib/src/artifacts;",
-    "build": "npm run clean && run-p build:*",
-    "lint": "tslint src/**/*.ts",
-    "test": "run-s clean build:commonjs && mocha lib/test/**/*_test.js",
-    "test:coverage": "nyc npm run test --all",
+    "test:commonjs": "mocha lib/test/**/*_test.js",
+    "test:umd": "shx rm -rf lib/src/* && mv _bundles/* lib/src && npm run test:commonjs",
     "docs:json": "typedoc --json docs/index.json .",
     "docs:generate": "typedoc --out docs .",
-    "docs:open": "opn docs/index.html",
-    "update_contracts": "for i in ${npm_package_config_artifacts}; do copyfiles -u 4 ../contracts/build/contracts/$i.json ../0x.js/src/artifacts; done;",
-    "testrpc": "testrpc -p 8545 --networkId 50"
+    "docs:open": "opn docs/index.html"
   },
   "config": {
     "artifacts": "Proxy Exchange TokenRegistry Token Mintable EtherToken"