diff --git a/test/content/support.js b/test/content/support.js
index c4922e5c4c..30e66392c4 100644
--- a/test/content/support.js
+++ b/test/content/support.js
@@ -137,7 +137,7 @@ function waitForDialog(onOpen, button='accept', url) {
 			function acceptWhenEnabled() {
 				// Handle delayed buttons
 				if (dialog.document.documentElement.getButton(button).disabled) {
-					setTimeout(function () {
+					dialog.setTimeout(function () {
 						acceptWhenEnabled();
 					}, 250);
 				}
diff --git a/test/tests/server_connectorTest.js b/test/tests/server_connectorTest.js
index 14b5bda473..4a7a572fe0 100644
--- a/test/tests/server_connectorTest.js
+++ b/test/tests/server_connectorTest.js
@@ -14,10 +14,12 @@ describe("Connector Server", function () {
 		
 		win = yield loadZoteroPane();
 		connectorServerPath = 'http://127.0.0.1:' + Zotero.Prefs.get('httpServer.port');
-		testServerPath = 'http://127.0.0.1:' + testServerPort;
 	});
 	
 	beforeEach(function () {
+		// Alternate ports to prevent exceptions not catchable in JS
+		testServerPort += (testServerPort & 1) ? 1 : -1;
+		testServerPath = 'http://127.0.0.1:' + testServerPort;
 		httpd = new HttpServer();
 		httpd.start(testServerPort);
 	});