diff --git a/lib/ace/edit_session_test.js b/lib/ace/edit_session_test.js
index 5d232afe..cb3ce7bb 100644
--- a/lib/ace/edit_session_test.js
+++ b/lib/ace/edit_session_test.js
@@ -47,7 +47,7 @@ var lang = require("pilot/lang");
 var EditSession = require("ace/edit_session").EditSession;
 var Editor = require("ace/editor").Editor;
 var UndoManager = require("ace/undomanager").UndoManager;
-var MockRenderer = require("ace/test/mockrenderer");
+var MockRenderer = require("ace/test/mockrenderer").MockRenderer;
 var Range = require("ace/range").Range;
 var assert = require("ace/test/assertions");
 
diff --git a/lib/ace/editor_change_document_test.js b/lib/ace/editor_change_document_test.js
index ce460ee0..20cd96d8 100644
--- a/lib/ace/editor_change_document_test.js
+++ b/lib/ace/editor_change_document_test.js
@@ -46,7 +46,7 @@ var EditSession = require("ace/edit_session").EditSession;
 var Editor = require("ace/editor").Editor;
 var Text = require("ace/mode/text").Mode;
 var JavaScriptMode = require("ace/mode/javascript").Mode;
-var MockRenderer = require("ace/test/mockrenderer");
+var MockRenderer = require("ace/test/mockrenderer").MockRenderer;
 var assert = require("ace/test/assertions");
 
 module.exports = {
@@ -54,6 +54,8 @@ module.exports = {
     setUp : function(next) {
         this.session1 = new EditSession(["abc", "def"]);
         this.session2 = new EditSession(["ghi", "jkl"]);
+        
+        
         this.editor = new Editor(new MockRenderer());
         next();
     },
diff --git a/lib/ace/editor_highlight_selected_word_test.js b/lib/ace/editor_highlight_selected_word_test.js
index 0f38f1da..d29056c7 100644
--- a/lib/ace/editor_highlight_selected_word_test.js
+++ b/lib/ace/editor_highlight_selected_word_test.js
@@ -45,7 +45,7 @@ define(function(require, exports, module) {
 
 var EditSession = require("ace/edit_session").EditSession;
 var Editor = require("ace/editor").Editor;
-var MockRenderer = require("ace/test/mockrenderer");
+var MockRenderer = require("ace/test/mockrenderer").MockRenderer;
 var TextMode = require("ace/mode/text").Mode;
 var assert = require("ace/test/assertions");
 
diff --git a/lib/ace/editor_navigation_test.js b/lib/ace/editor_navigation_test.js
index 6048aa69..0c219649 100644
--- a/lib/ace/editor_navigation_test.js
+++ b/lib/ace/editor_navigation_test.js
@@ -44,7 +44,7 @@ define(function(require, exports, module) {
 
 var EditSession = require("ace/edit_session").EditSession;
 var Editor = require("ace/editor").Editor;
-var MockRenderer = require("ace/test/mockrenderer");
+var MockRenderer = require("ace/test/mockrenderer").MockRenderer;
 var assert = require("ace/test/assertions");
 
 module.exports = {
diff --git a/lib/ace/editor_text_edit_test.js b/lib/ace/editor_text_edit_test.js
index 1125c0a2..c490fb0e 100644
--- a/lib/ace/editor_text_edit_test.js
+++ b/lib/ace/editor_text_edit_test.js
@@ -46,7 +46,7 @@ var EditSession = require("ace/edit_session").EditSession;
 var Editor = require("ace/editor").Editor;
 var JavaScriptMode = require("ace/mode/javascript").Mode;
 var UndoManager = require("ace/undomanager").UndoManager;
-var MockRenderer = require("ace/test/mockrenderer");
+var MockRenderer = require("ace/test/mockrenderer").MockRenderer;
 var assert = require("ace/test/assertions");
 
 module.exports = {
diff --git a/lib/ace/test/all_browser.js b/lib/ace/test/all_browser.js
index 75d8465c..42e32731 100644
--- a/lib/ace/test/all_browser.js
+++ b/lib/ace/test/all_browser.js
@@ -1,7 +1,7 @@
 define(function(require, exports, module) {
 
 require("pilot/fixoldbrowsers");
-var AsyncTest = require("asyncjs").test;
+var AsyncTest = require("asyncjs/test");
 var async = require("asyncjs");
 var dom = require("pilot/dom");
 
@@ -10,28 +10,32 @@ var failed = 0
 var log = document.getElementById("log")
 
 var tests = [
-     require("ace/editor_change_document_test"),
-     require("ace/editor_navigation_test"),
-     require("ace/editor_highlight_selected_word_test"),
-     require("ace/editor_text_edit_test"),
+     require("ace/anchor_test"),
      require("ace/document_test"),
      require("ace/edit_session_test"),
-     require("ace/test/event_emitter_test"),
-     require("ace/range_test"),
-     require("ace/search_test"),
-     require("ace/selection_test"),
-     require("ace/virtual_renderer_test"),
-     require("ace/anchor_test"),
+     require("ace/editor_change_document_test"),
+     require("ace/editor_highlight_selected_word_test"),
+     require("ace/editor_navigation_test"),
+     require("ace/editor_text_edit_test"),
+     require("ace/layer/text_test"),
+     require("ace/mode/coffee/parser_test"),
      require("ace/mode/css_test"),
      require("ace/mode/css_tokenizer_test"),
+     require("ace/mode/css_worker"),
      require("ace/mode/html_test"),
      require("ace/mode/html_tokenizer_test"),
      require("ace/mode/javascript_test"),
      require("ace/mode/javascript_tokenizer_test"),
+     require("ace/mode/javascript_worker_test"),
      require("ace/mode/ruby_tokenizer_test"),
      require("ace/mode/text_test"),
      require("ace/mode/xml_test"),
-     require("ace/mode/xml_tokenizer_test")
+     require("ace/mode/xml_tokenizer_test"),
+     require("ace/range_test"),
+     require("ace/search_test"),
+     require("ace/selection_test"),
+     require("ace/test/event_emitter_test"),
+     require("ace/virtual_renderer_test")
 ]
 
 async.list(tests)
diff --git a/lib/ace/test/mockrenderer.js b/lib/ace/test/mockrenderer.js
index 7a9cc378..3c0c4342 100644
--- a/lib/ace/test/mockrenderer.js
+++ b/lib/ace/test/mockrenderer.js
@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-MockRenderer = function(visibleRowCount) {
+var MockRenderer = exports.MockRenderer = function(visibleRowCount) {
     this.container = document.createElement("div");
     this.visibleRowCount = visibleRowCount || 20;
 
@@ -161,5 +161,4 @@ MockRenderer.prototype.textToScreenCoordinates = function() {
     }
 };
 
-return MockRenderer;
 });
diff --git a/lib/ace/test/tests.html b/lib/ace/test/tests.html
index 2af7ea55..f5b1a97f 100644
--- a/lib/ace/test/tests.html
+++ b/lib/ace/test/tests.html
@@ -23,32 +23,30 @@
     
 <div id="log"></div>
 
-<script src="../../../demo/require.js" type="text/javascript" charset="utf-8"></script>
-<script>
-
-require({
-    paths: {
-        ace: "../lib/ace",
-        cockpit: "../support/cockpit/lib/cockpit",
-        pilot: "../support/pilot/lib/pilot"
-    },
-    packages : [{
-        name: "asyncjs",
-        location: "../lib/ace/test",
-        lib: "asyncjs",
-        main: "index"
-    }, {
-        name: "assert",
-        location: "../lib/ace/test",
-        lib: "asyncjs",
-        main: "assert"
-    }]
-});
-
-require(["ace/test/all_browser"], function(tests) {
-});
-
+<script type="text/javascript">
+    var require = {
+        paths: {
+            ace: "../",
+            cockpit: "../../../../support/cockpit/lib/cockpit",
+            pilot: "../../../../support/pilot/lib/pilot"
+        },
+        packages : [{
+            name: "asyncjs",
+            location: "./asyncjs",
+            main: "index"
+        }, {
+            name: "assert",
+            location: "./asyncjs",
+            main: "assert"
+        }, {
+            name: "text",
+            location: "../../../demo",
+            main: "text"
+        }]
+    };
 </script>
+<script src="../../../demo/require.js" data-main="all_browser" type="text/javascript" charset="utf-8"></script>
+
 
 </body>
 </html>