diff --git a/.travis.yml b/.travis.yml
index 7cb1cf47c..958bd9d5e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
 before_script:
+  - "make"
   - "npm install -g mocha-phantomjs"
-script: mocha-phantomjs test/index.html
+script: mocha-phantomjs test/index.html && mocha-phantomjs test/index_packaged.html
diff --git a/Makefile b/Makefile
index 71128143f..15158dcbe 100644
--- a/Makefile
+++ b/Makefile
@@ -12,16 +12,22 @@ all: \
 
 .INTERMEDIATE iD.js: \
 	js/lib/d3.v3.js \
+	js/lib/d3.geo.tile.js \
+	js/lib/d3.one.js \
+	js/lib/d3.size.js \
+	js/lib/d3.typeahead.js \
+	js/lib/jxon.js \
 	js/lib/lodash.js \
 	js/lib/ohauth.js \
 	js/lib/sha.js \
-	js/lib/jxon.js \
-	js/lib/lodash.js \
 	js/id/id.js \
-	js/id/oauth.js \
 	js/id/connection.js \
+	js/id/oauth.js \
+	js/id/taginfo.js \
 	js/id/util.js \
 	js/id/actions/*.js \
+	js/id/controller/*.js \
+	js/id/format/*.js \
 	js/id/graph/*.js \
 	js/id/renderer/*.js \
 	js/id/ui/*.js \
diff --git a/test/index_packaged.html b/test/index_packaged.html
new file mode 100644
index 000000000..c634fa8c6
--- /dev/null
+++ b/test/index_packaged.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset='utf-8'>
+    <title>Mocha Tests</title>
+    <link rel="stylesheet" href="lib/mocha.css">
+</head>
+<body>
+    <div id="mocha"></div>
+
+    <script src="lib/mocha.js"></script>
+    <script src="lib/chai.js"></script>
+    <script src="lib/sinon.js"></script>
+    <script src="lib/sinon-chai.js"></script>
+    <script src="lib/bind-shim.js"></script>
+    <script src="lib/happen.js"></script>
+
+    <!-- include source files here... -->
+    <script src='../iD.min.js'></script>
+
+    <script>
+        iD.debug = true;
+        mocha.setup('bdd');
+        var expect = chai.expect;
+    </script>
+
+    <!-- include spec files here... -->
+    <script src="spec/format/geojson.js"></script>
+    <script src="spec/format/xml.js"></script>
+    <script src="spec/graph/graph.js"></script>
+    <script src="spec/graph/entity.js"></script>
+    <script src="spec/graph/history.js"></script>
+    <script src="spec/graph/way.js"></script>
+    <script src="spec/renderer/background.js"></script>
+    <script src="spec/renderer/hash.js"></script>
+    <script src="spec/renderer/map.js"></script>
+    <script src="spec/renderer/style.js"></script>
+    <script src="spec/ui/inspector.js"></script>
+    <script src="spec/connection.js"></script>
+    <script src="spec/oauth.js"></script>
+    <script src="spec/util.js"></script>
+
+    <script>
+        (window.mochaPhantomJS || window.mocha).run();
+    </script>
+</body>
+</html>
