diff --git a/plugins/c9.ide.server/plugins.js b/plugins/c9.ide.server/plugins.js
index a9c2e4ed..72de157f 100644
--- a/plugins/c9.ide.server/plugins.js
+++ b/plugins/c9.ide.server/plugins.js
@@ -57,7 +57,6 @@ define(function(require, exports, module) {
                 }]); 
             } else {
                 [
-                    "ace_tree", 
                     "acorn",
                     "tern",
                     "tern_from_ts",
@@ -82,7 +81,12 @@ define(function(require, exports, module) {
                 });
                 
                 statics.addStatics([{
-                    path: __dirname + "/../../node_modules/ace",
+                    path: __dirname + "/../node_modules/ace_tree",
+                    mount: "/lib/ace_tree",
+                }]);
+                
+                statics.addStatics([{
+                    path: __dirname + "/../node_modules/ace",
                     mount: "/lib/ace",
                     rjs: requirePaths
                 }]);
diff --git a/plugins/c9.static/cdn.cli.js b/plugins/c9.static/cdn.cli.js
index 5bc10999..071e4849 100644
--- a/plugins/c9.static/cdn.cli.js
+++ b/plugins/c9.static/cdn.cli.js
@@ -171,7 +171,7 @@ define(function(require, exports, module) {
             
             // FIXME: this could be resolved via pathConfig:
             var pathMap = {
-                "ace": __dirname + "/../../node_modules/ace/lib/ace",
+                "ace": __dirname + "/../node_modules/ace/lib/ace",
                 "plugins": __dirname + "/../../plugins",
                 "plugins/salesforce.language": __dirname + "/../../node_modules/salesforce.language",
                 "plugins/salesforce.sync": __dirname + "/../../node_modules/salesforce.sync"
diff --git a/test/setup_paths.js b/test/setup_paths.js
index 058f29a3..35f7a6fc 100644
--- a/test/setup_paths.js
+++ b/test/setup_paths.js
@@ -1,7 +1,7 @@
 var modules = require("module");
 var oldResolve = modules._resolveFilename;
 var extraPaths = [
-    __dirname + "/../node_modules/ace/lib",
+    __dirname + "/../plugins/node_modules/ace/lib",
     __dirname + "/../node_modules/v8debug/lib",
     __dirname + "/../"
 ];