diff --git a/.travis.yml b/.travis.yml
index fcc667a..3df8b22 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,8 +25,8 @@
   - Xvfb :99 -screen 0 1024x768x24 -extension RANDR &
 
 script:
+  - npm run build
   - xvfb-maybe npm run coverage
-  - npm run bundle
   - npm run docs
 
 deploy:

diff --git a/.travis.yml b/.travis.yml
index fcc667a..3df8b22 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,8 +25,8 @@
   - Xvfb :99 -screen 0 1024x768x24 -extension RANDR &
 
 script:
+  - npm run build
   - xvfb-maybe npm run coverage
-  - npm run bundle
   - npm run docs
 
 deploy:
diff --git a/package.json b/package.json
index d95fe44..a9e3f35 100644
--- a/package.json
+++ b/package.json
@@ -20,26 +20,27 @@
   "scripts": {
     "clean": "rimraf dist lib && mkdirp dist && mkdir lib",
     "prestart": "npm run clean",
-    "start": "parallelshell \"npm run watch:lint\" \"npm run watch\"",
-    "watch": "npm run build -- --watch",
+    "start": "parallelshell \"npm run watch\" \"npm run watch:lint\" \"npm run watch:lib\"",
+    "watch": "npm run dist -- --watch",
+    "watch:lib": "npm run lib -- --watch",
     "watch:lint": "watch \"eslint scripts src test || exit 0\" src",
-    "watch:bundle": "npm run bundle -- -w",
     "test": "floss --path test/index.js",
     "test:debug": "npm test -- --debug",
     "prerenders": "npm --prefix scripts/renders i scripts/renders",
     "renders": "electron scripts/renders",
-    "precoverage": "rimraf coverage && npm run build",
+    "precoverage": "rimraf coverage",
     "coverage": "npm test -- -c dist/pixi.js -s -h",
     "lint": "eslint scripts src test --max-warnings 0",
     "lintfix": "npm run lint --fix",
     "prebuild": "npm run lint",
-    "build": "babel src --out-dir lib -s",
-    "bundle": "pixify -d dist -n PIXI -o pixi",
+    "build": "npm run dist",
+    "dist": "pixify -d dist -n PIXI -o pixi",
+    "lib": "babel src --out-dir lib -s",
     "docs": "jsdoc -c scripts/jsdoc.conf.json -R README.md",
     "publish:patch": "npm version patch --no-git-tag-version && npm publish",
     "publish:minor": "npm version minor --no-git-tag-version && npm publish",
     "publish:major": "npm version major --no-git-tag-version && npm publish",
-    "postversion": "npm run clean && npm run build && npm run bundle && npm test",
+    "postversion": "npm run clean && npm run build && npm run lib && npm test",
     "postpublish": "node scripts/release.js"
   },
   "files": [

diff --git a/.travis.yml b/.travis.yml
index fcc667a..3df8b22 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,8 +25,8 @@
   - Xvfb :99 -screen 0 1024x768x24 -extension RANDR &
 
 script:
+  - npm run build
   - xvfb-maybe npm run coverage
-  - npm run bundle
   - npm run docs
 
 deploy:
diff --git a/package.json b/package.json
index d95fe44..a9e3f35 100644
--- a/package.json
+++ b/package.json
@@ -20,26 +20,27 @@
   "scripts": {
     "clean": "rimraf dist lib && mkdirp dist && mkdir lib",
     "prestart": "npm run clean",
-    "start": "parallelshell \"npm run watch:lint\" \"npm run watch\"",
-    "watch": "npm run build -- --watch",
+    "start": "parallelshell \"npm run watch\" \"npm run watch:lint\" \"npm run watch:lib\"",
+    "watch": "npm run dist -- --watch",
+    "watch:lib": "npm run lib -- --watch",
     "watch:lint": "watch \"eslint scripts src test || exit 0\" src",
-    "watch:bundle": "npm run bundle -- -w",
     "test": "floss --path test/index.js",
     "test:debug": "npm test -- --debug",
     "prerenders": "npm --prefix scripts/renders i scripts/renders",
     "renders": "electron scripts/renders",
-    "precoverage": "rimraf coverage && npm run build",
+    "precoverage": "rimraf coverage",
     "coverage": "npm test -- -c dist/pixi.js -s -h",
     "lint": "eslint scripts src test --max-warnings 0",
     "lintfix": "npm run lint --fix",
     "prebuild": "npm run lint",
-    "build": "babel src --out-dir lib -s",
-    "bundle": "pixify -d dist -n PIXI -o pixi",
+    "build": "npm run dist",
+    "dist": "pixify -d dist -n PIXI -o pixi",
+    "lib": "babel src --out-dir lib -s",
     "docs": "jsdoc -c scripts/jsdoc.conf.json -R README.md",
     "publish:patch": "npm version patch --no-git-tag-version && npm publish",
     "publish:minor": "npm version minor --no-git-tag-version && npm publish",
     "publish:major": "npm version major --no-git-tag-version && npm publish",
-    "postversion": "npm run clean && npm run build && npm run bundle && npm test",
+    "postversion": "npm run clean && npm run build && npm run lib && npm test",
     "postpublish": "node scripts/release.js"
   },
   "files": [
diff --git a/test/index.js b/test/index.js
index 7e93d64..50a85da 100755
--- a/test/index.js
+++ b/test/index.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /* eslint-disable global-require */
-require('../lib/');
+require('../dist/pixi');
 
 PIXI.utils.skipHello(); // hide banner