--- a/testing/mochitest/server.js
+++ b/testing/mochitest/server.js
@@ -192,17 +192,16 @@ function serverShutdown(metadata, respon
   response.setStatusLine("1.1", 200, "OK");
   response.setHeader("Content-type", "text/plain");
 
   var body = "Server shut down.";
   response.bodyOutputStream.write(body, body.length);
 
   // Note: this doesn't disrupt the current request.
   server.stop();
-  otherDomainServer.stop();
 }
 
 function redirect(metadata, response)
 {
   response.setStatusLine("1.1", 301, "Moved Permanently");
   response.setHeader("Location", metadata.queryString);
 }
 

deleted file mode 100644
--- a/testing/mochitest/server.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import SimpleHTTPServer
-import SocketServer
-
-# minimal web server.  serves files relative to the
-# current directory.
-
-PORT = 8888
-
-Handler = SimpleHTTPServer.SimpleHTTPRequestHandler
-Handler.extensions_map[".xhtml"] = "application/xhtml+xml"
-Handler.extensions_map[".svg"] = "image/svg+xml"
-Handler.extensions_map[".xul"] = "application/vnd.mozilla.xul+xml"
-httpd = SocketServer.TCPServer(("", PORT), Handler)
-
-print "serving at port", PORT
-httpd.serve_forever()