diff --git a/package.json b/package.json
index 1dc114a9..2ff0ad49 100644
--- a/package.json
+++ b/package.json
@@ -11,10 +11,8 @@
     },
     "dependencies": {
         "acorn": ">=0.11.0",
-        "amd-loader": "",
         "async": "^0.9.0",
         "base64id": "~0.1.0",
-        "c9": "",
         "connect": "~2.12.0",
         "debug": "~0.7.4",
         "ejs": "~0.8.3",
@@ -44,10 +42,19 @@
         "read": "~1.0.5",
         "form-data": "~0.2.0"
     },
-    "optionalDependencies": {
-        "pty.js": "git://github.com/cloud9ide/pty.js.git#10e31e23ed"
+    "devDependencies": {
+        "chai": "~1.5.0",
+        "mocha": "~1.8.1"
     },
     "licenses": [],
+    "bundledDependencies": [
+        "ace",
+        "ace_tree",
+        "amd-loader",
+        "architect",
+        "architect-build",
+        "c9"
+    ],
     "c9plugins": {
         "c9.ide.language": "#77f75c7635",
         "c9.ide.language.css": "#ef8a28943e",
diff --git a/test/setup_paths.js b/test/setup_paths.js
new file mode 100644
index 00000000..ea3648b1
--- /dev/null
+++ b/test/setup_paths.js
@@ -0,0 +1,20 @@
+var modules = require("module");
+var oldResolve = modules._resolveFilename;
+var extraPaths = [
+    __dirname + "/../node_modules/ace/lib",
+    __dirname + "/../node_modules/treehugger/lib",
+    __dirname + "/../node_modules/v8debug/lib",
+    __dirname + "/../"
+];
+modules._resolveFilename = function(request, paths) {
+    // Ensure client extensions can be loaded
+    request = request.replace(/^ext\//, "ext.")
+            .replace(/^core\//, "cloud9.core/www/core/")
+            .replace(/^lib\/chai\//, "chai/");
+    // Add the extra paths
+    extraPaths.forEach(function(p) {
+        if(paths.paths.indexOf(p) === -1)
+            paths.paths.push(p);
+    });
+    return oldResolve(request, paths);
+};