diff --git a/archiva-webapp-test/pom.xml b/archiva-webapp-test/pom.xml
index 51aa7d655..53f9b86f6 100644
--- a/archiva-webapp-test/pom.xml
+++ b/archiva-webapp-test/pom.xml
@@ -90,6 +90,19 @@
               <goal>run</goal>
             </goals>
           </execution>
+          <execution>
+            <id>check-archiva-loaded</id>
+            <phase>integration-test</phase>
+            <configuration>
+              <tasks>
+                <get src="http://localhost:9595/archiva/" dest="${project.build.directory}/index.html"/>
+                <delete file="${project.build.directory}/index.html"/>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
         </executions>
       </plugin>
       <plugin>
diff --git a/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/AbstractArchivaTestCase.java b/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/AbstractArchivaTestCase.java
index 352783588..d0d6e815e 100644
--- a/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/AbstractArchivaTestCase.java
+++ b/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/AbstractArchivaTestCase.java
@@ -41,7 +41,6 @@ public abstract class AbstractArchivaTestCase
 
     protected void initialize()
     {
-        getSelenium().setTimeout( "120000" );
         getSelenium().open( "/archiva" );
 
         if ( CREATE_ADMIN_USER_PAGE_TITLE.equals( getSelenium().getTitle() ) )