diff --git a/layout/tools/reftest/reftest.js b/layout/tools/reftest/reftest.js
index edd61b9cbf23..27daf26b8db9 100644
--- a/layout/tools/reftest/reftest.js
+++ b/layout/tools/reftest/reftest.js
@@ -1177,6 +1177,9 @@ function ServeFiles(manifestPrincipal, depth, aURL, files)
     var testbase = gIOService.newURI("http://localhost:" + gHttpServerPort +
                                      path + dirPath, null, null);
 
+    // Give the testbase URI access to XUL and XBL
+    Services.perms.add(testbase, "allowXULXBL", Services.perms.ALLOW_ACTION);
+
     function FileToURI(file)
     {
         // Only serve relative URIs via the HTTP server, not absolute
diff --git a/layout/tools/reftest/remotereftest.py b/layout/tools/reftest/remotereftest.py
index c0f5dd1092d1..e7430bade751 100644
--- a/layout/tools/reftest/remotereftest.py
+++ b/layout/tools/reftest/remotereftest.py
@@ -342,7 +342,7 @@ class RemoteReftest(RefTest):
         self.server.stop()
 
     def createReftestProfile(self, options, reftestlist):
-        profile = RefTest.createReftestProfile(self, options, reftestlist, server=options.remoteWebServer)
+        profile = RefTest.createReftestProfile(self, options, reftestlist, server=options.remoteWebServer, port=options.httpPort)
         profileDir = profile.profile
 
         prefs = {}
diff --git a/layout/tools/reftest/runreftest.py b/layout/tools/reftest/runreftest.py
index 752d0f41a3c8..3d7dd67ea01c 100644
--- a/layout/tools/reftest/runreftest.py
+++ b/layout/tools/reftest/runreftest.py
@@ -187,7 +187,8 @@ class RefTest(object):
         """
 
         locations = mozprofile.permissions.ServerLocations()
-        locations.add_host(server, port=0)
+        locations.add_host(server, scheme='http', port=0)
+        locations.add_host(server, scheme='https', port=0)
 
         # Set preferences for communication between our command line arguments
         # and the reftest harness.  Preferences that are required for reftest