diff --git a/mozilla/dom/tests/mochitest/ajax/Makefile.in b/mozilla/dom/tests/mochitest/ajax/Makefile.in
index f7a51fce7b2..0fa61a18b89 100644
--- a/mozilla/dom/tests/mochitest/ajax/Makefile.in
+++ b/mozilla/dom/tests/mochitest/ajax/Makefile.in
@@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk
 DIRS =	lib \
 	prototype \
 	offline \
+	mochikit \
 	$(NULL)
-#	mochikit \  removed until fixed on linux
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/dom/tests/mochitest/ajax/mochikit/MochiKit/Makefile.in b/mozilla/dom/tests/mochitest/ajax/mochikit/MochiKit/Makefile.in
index ce5b35ad4f8..2f804ccdf67 100644
--- a/mozilla/dom/tests/mochitest/ajax/mochikit/MochiKit/Makefile.in
+++ b/mozilla/dom/tests/mochitest/ajax/mochikit/MochiKit/Makefile.in
@@ -39,7 +39,7 @@ DEPTH		= ../../../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/ajax/mochikit/Mochikit
+relativesrcdir	= dom/tests/mochitest/ajax/mochikit/MochiKit
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/mozilla/dom/tests/mochitest/ajax/mochikit/manifest.json b/mozilla/dom/tests/mochitest/ajax/mochikit/manifest.json
index a1fb91cd973..5bf0e943de6 100644
--- a/mozilla/dom/tests/mochitest/ajax/mochikit/manifest.json
+++ b/mozilla/dom/tests/mochitest/ajax/mochikit/manifest.json
@@ -1 +1 @@
-{testcases:["tests/index.html"]}
+{testcases:['tests/MochiKit-Async.html','tests/MochiKit-Base.html','tests/MochiKit-DateTime.html','tests/MochiKit-DOM.html','tests/MochiKit-Style.html','tests/MochiKit-Format.html','tests/MochiKit-Iter.html','tests/MochiKit-Logging.html','tests/MochiKit-MochiKit.html','tests/MochiKit-Color.html','tests/MochiKit-Selector.html','tests/MochiKit-Signal.html','tests/MochiKit-Visual.html']}
diff --git a/mozilla/dom/tests/mochitest/ajax/mochikit/tests/SimpleTest/SimpleTest.js b/mozilla/dom/tests/mochitest/ajax/mochikit/tests/SimpleTest/SimpleTest.js
index 06954a04397..36933c0c149 100644
--- a/mozilla/dom/tests/mochitest/ajax/mochikit/tests/SimpleTest/SimpleTest.js
+++ b/mozilla/dom/tests/mochitest/ajax/mochikit/tests/SimpleTest/SimpleTest.js
@@ -360,6 +360,22 @@ SimpleTest.isa = function (object, clas) {
     return SimpleTest.typeOf(object) == clas;
 };
 
+if ( parent.SimpleTest && parent.runAJAXTest ) (function(){
+    var oldOK = SimpleTest.ok;
+
+    SimpleTest.ok = function(condition, name, diag) {
+        parent.SimpleTest.ok( condition, name, diag );
+        return oldOK( condition, name, diag );
+    };
+
+    var oldFinish = SimpleTest.finish;
+
+    SimpleTest.finish = function() {
+	oldFinish();
+	parent.runAJAXTest();
+    };
+})();
+
 // Global symbols:
 var ok = SimpleTest.ok;
 var is = SimpleTest.is;