diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java
index c22e02be7..ee49694d3 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java
@@ -36,6 +36,7 @@ public class RepositoryTest
 		assertRepositoriesPage();
 	}
 	
+	 @Test(dependsOnMethods = { "testAddManagedRepoValidValues" } )
 	public void testAddManagedRepoInvalidValues()
 	{				
 		goToRepositoriesPage();
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
index 95e2fa853..9209d6f60 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
@@ -503,7 +503,10 @@ public abstract class AbstractArchivaTest
 
     public void goToRepositoriesPage()
     {
-    	clickLinkWithText( "Repositories" );
+        if( !getTitle().equals( "Apache Archiva \\ Administration - Repositories" ) )
+        {
+            clickLinkWithText( "Repositories" );
+        }
     	assertRepositoriesPage();
     }
 
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
index 52f02ef8a..6c8e66209 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
@@ -28,7 +28,10 @@ public abstract class AbstractRepositoryTest
 	// Repository Groups
 	public void goToRepositoryGroupsPage()
 	{
-		clickLinkWithText( "Repository Groups" );
+	    if( !getTitle().equals( "Apache Archiva \\ Administration - Repository Groups" ) )
+	    {
+	        clickLinkWithText( "Repository Groups" );
+	    }
 		assertRepositoryGroupsPage();
 	}
 	
@@ -288,8 +291,8 @@ public abstract class AbstractRepositoryTest
 	}
 	
 	public void editManagedRepository( String fieldName, String value )
-	{
-		//goToRepositoriesPage();
+	{	    
+		goToRepositoriesPage();
 		clickLinkWithXPath( "//div[@id='contentArea']/div/div[5]/div[1]/a[1]/img" );
 		assertPage( "Apache Archiva \\ Admin: Edit Managed Repository" );
 		setFieldValue(fieldName, value);