diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
index 58cef79f4..c3039ae97 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <version>5.8</version>
+      <version>5.9</version>
       <scope>test</scope>
       <classifier>jdk15</classifier>
     </dependency>
@@ -235,29 +235,6 @@
       </activation>
       <build>
         <plugins>
-          <!--
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-clean-plugin</artifactId>
-            <version>2.4.1</version>
-            <configuration>
-              <filesets>
-                <fileset>
-                  <directory>${project.build.directory}/${container.name}conf/webapps/archiva</directory>
-                </fileset>
-              </filesets>
-            </configuration>
-            <executions>
-              <execution>
-                <id>clean-webapp</id>
-                <phase>process-sources</phase>
-                <goals>
-                  <goal>clean</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          -->
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-dependency-plugin</artifactId>
@@ -519,6 +496,7 @@
       </activation>
       <properties>
         <selenium.browser>*googlechrome</selenium.browser>
+        <excluded.groups>requiresUpload</excluded.groups>
         <excluded.groups/>
       </properties>
     </profile>
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LoginTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LoginTest.java
index 54f501973..751b99788 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LoginTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LoginTest.java
@@ -40,14 +40,15 @@ import org.testng.annotations.Test;
 public class LoginTest
     extends AbstractArchivaTest
 {
-    @Test
+    @Test(alwaysRun = true)
     public void testWithBadUsername()
     {
         goToLoginPage();
         setFieldValue( "loginForm_username", "badUsername" );
-        clickButtonWithValue( "Login" );
+        getSelenium().click( "loginSubmit" );
         getSelenium().waitForPageToLoad( maxWaitTimeInMs );
-        assertTextPresent( "You have entered an incorrect username and/or password" );
+        assertElementPresent( "//ul[@class=\'errorMessage\']" );
+        //assertTextPresent( "You have entered an incorrect username and/or password" );
     }
 
     @Test( dependsOnMethods = { "testWithBadUsername" }, alwaysRun = true )
@@ -59,8 +60,7 @@ public class LoginTest
         getSelenium().click( "loginSubmit" );
         getSelenium().waitForPageToLoad( maxWaitTimeInMs );
         //assertTextPresent( "You have entered an incorrect username and/or password" );
-        // <ul class="errorMessage">
-
+        //<ul class="errorMessage"><li><span>
         assertElementPresent( "//ul[@class=\'errorMessage\']" );
     }
 
@@ -69,9 +69,10 @@ public class LoginTest
     {
         goToLoginPage();
         setFieldValue( "loginForm_password", "password" );
-        clickButtonWithValue( "Login" );
+        getSelenium().click( "loginSubmit" );
         getSelenium().waitForPageToLoad( maxWaitTimeInMs );
-        assertTextPresent( "User Name is required" );
+        //assertTextPresent( "User Name is required" );
+        assertElementPresent( "//tr[@errorFor=\'loginForm_username\']");
     }
 
     @Test( dependsOnMethods = { "testWithEmptyUsername" }, alwaysRun = true )
@@ -79,9 +80,10 @@ public class LoginTest
     {
         goToLoginPage();
         setFieldValue( "loginForm_username", getProperty( "ADMIN_USERNAME" ) );
-        clickButtonWithValue( "Login" );
+        getSelenium().click( "loginSubmit" );
         getSelenium().waitForPageToLoad( maxWaitTimeInMs );
-        assertTextPresent( "You have entered an incorrect username and/or password" );
+        //assertTextPresent( "You have entered an incorrect username and/or password" );
+        assertElementPresent( "//ul[@class=\'errorMessage\']" );
     }
 
     @Test( groups = { "loginSuccess" }, dependsOnMethods = { "testWithEmptyPassword" }, alwaysRun = true )
@@ -90,10 +92,12 @@ public class LoginTest
         goToLoginPage();
         setFieldValue( "loginForm_username", getProperty( "ADMIN_USERNAME" ) );
         setFieldValue( "loginForm_password", getProperty( "ADMIN_PASSWORD" ) );
-        clickButtonWithValue( "Login" );
+        getSelenium().click( "loginSubmit" );
         getSelenium().waitForPageToLoad( maxWaitTimeInMs );
-        assertTextPresent( "Edit Details" );
-        assertTextPresent( "Logout" );
+        //assertTextPresent( "Logout" );
+        assertElementPresent( "logoutLink" );
+        //assertTextPresent( "Edit Details" );
+        assertElementPresent( "editUserLink" );
         assertTextPresent( getProperty( "ADMIN_USERNAME" ) );
     }