1 files changed, 7 insertions, 1 deletions
diff --git a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java
index f8b01fb11b..460006b7f8 100755
--- a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java
+++ b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java
@@ -50,8 +50,14 @@ public abstract class MultiBrowserTestWithProxy extends MultiBrowserTest {
 
     protected Integer getProxyPort() {
         if (proxyPort == null) {
-            // Assumes we can use any port >= 2000
+            // Assumes we can use any port >= 2000,
+            // except for 2049 in Firefox...
             proxyPort = availablePort.addAndGet(1);
+            if (proxyPort == 2049) {
+                // Restricted in Firefox, see
+                // http://www-archive.mozilla.org/projects/netlib/PortBanning.html#portlist
+                proxyPort = availablePort.addAndGet(1);
+            }
         }
         return proxyPort;
     }