diff --git a/distribution-test/pom.xml b/distribution-test/pom.xml
index d0e3f4636..6e70240bc 100644
--- a/distribution-test/pom.xml
+++ b/distribution-test/pom.xml
@@ -105,6 +105,7 @@
         <configuration>
           <background>true</background>
           <multiWindow>true</multiWindow>
+          <port>4444</port>
         </configuration>
       </plugin>
       <!-- Step 4: Start XWiki, Execute the tests and Stop XWiki
diff --git a/distribution-test/src/test/it/com/xpn/xwiki/it/framework/XWikiTestSetup.java b/distribution-test/src/test/it/com/xpn/xwiki/it/framework/XWikiTestSetup.java
index be1c65b33..c414f39c9 100644
--- a/distribution-test/src/test/it/com/xpn/xwiki/it/framework/XWikiTestSetup.java
+++ b/distribution-test/src/test/it/com/xpn/xwiki/it/framework/XWikiTestSetup.java
@@ -77,6 +77,7 @@ private void startXWiki() throws Exception
         Process process =
             Runtime.getRuntime().exec(START_COMMAND, null, new File(EXECUTION_DIRECTORY));
         if (process.waitFor() != 0) {
+            tearDown();
             throw new RuntimeException("Failed to start XWiki with command [" + START_COMMAND
                 + "] in directory [" + EXECUTION_DIRECTORY + "]");
         }
@@ -117,6 +118,7 @@ private void waitForXWikiToLoad() throws Exception
         if (timedOut) {
             String message = "Failed to start XWiki in [" + TIMEOUT_SECONDS + "] seconds";
             System.out.println(message);
+            tearDown();
             throw new RuntimeException(message);
         }
     }