--- a/netwerk/test/unit/test_bug561042.js
+++ b/netwerk/test/unit/test_bug561042.js
@@ -1,8 +1,14 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
 Cu.import("resource://testing-common/httpd.js");
 Cu.import("resource://gre/modules/NetUtil.jsm");
 
 const SERVER_PORT = 8080;
 const baseURL = "http://localhost:" + SERVER_PORT + "/";
 
 var cookie = "";
 for (let i =0; i < 10000; i++) {
@@ -13,23 +19,23 @@ var listener = {
   onStartRequest: function (request, ctx) {
   },
 
   onDataAvailable: function (request, ctx, stream) {
   },
 
   onStopRequest: function (request, ctx, status) {
       do_check_eq(status, Components.results.NS_OK);
-      do_test_finished();
+      server.stop(do_test_finished);
   },
 
 };
 
+var server = new HttpServer();
 function run_test() {
-    var server = new HttpServer();
     server.start(SERVER_PORT);
     server.registerPathHandler('/', function(metadata, response) {
         response.setStatusLine(metadata.httpVersion, 200, "OK");
         response.setHeader("Set-Cookie", "BigCookie=" + cookie, false);
         response.write("Hello world");
     });
     var chan = NetUtil.newChannel({uri: baseURL, loadUsingSystemPrincipal: true})
                       .QueryInterface(Components.interfaces.nsIHttpChannel);