diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java
index c5c2da070..9a95ce546 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java
@@ -107,8 +107,7 @@ protected String[] getContextLocations()
 
     protected void setObservableRepos( List<String> repoIds )
     {
-        //(UserRepositoriesStub) lookup( UserRepositories.class );
-        UserRepositoriesStub repos = applicationContext.getBean( "userRepositories#test", UserRepositoriesStub.class );
+        UserRepositoriesStub repos = applicationContext.getBean( "userRepositories", UserRepositoriesStub.class );
         repos.setObservableRepositoryIds( repoIds );
     }
 
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/BrowseActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/BrowseActionTest.java
index 394d04e77..2b5c6c025 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/BrowseActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/BrowseActionTest.java
@@ -19,6 +19,7 @@
  * under the License.
  */
 
+import com.google.common.collect.Lists;
 import com.opensymphony.xwork2.Action;
 import org.apache.archiva.metadata.model.ProjectVersionMetadata;
 import org.apache.archiva.metadata.repository.RepositorySession;
@@ -390,6 +391,7 @@ protected void setUp()
         throws Exception
     {
         super.setUp();
+        setObservableRepos( Lists.<String>newArrayList( "test-repo" ) );
         //action = (BrowseAction) lookup( Action.class, ACTION_HINT );
         action = (BrowseAction) getActionProxy( "/browse.action" ).getAction();
         metadataResolver = new TestMetadataResolver();
@@ -399,4 +401,11 @@ protected void setUp()
             applicationContext.getBean( "repositorySessionFactory#test", TestRepositorySessionFactory.class );
         factory.setRepositorySession( repositorySession );
     }
+
+    protected void tearDown()
+        throws Exception
+    {
+        super.tearDown();
+        setObservableRepos( Lists.<String>newArrayList( "test-repo" ) );
+    }
 }
\ No newline at end of file
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java
index 2a489e6e6..b21e0e5d1 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java
@@ -50,7 +50,7 @@ protected void setUp()
         super.setUp();
 
         //action = (RepositoriesAction) lookup( Action.class.getName(), "repositoriesAction" );
-        action = (RepositoriesAction) getActionProxy( "/admin/index.action"  ).getAction();
+        action = (RepositoriesAction) getActionProxy( "/admin/index.action" ).getAction();
 
     }
 
@@ -67,20 +67,20 @@ public void testGetRepositories()
         MetadataRepository metadataRepository = (MetadataRepository) control.getMock();
         control.expectAndReturn( metadataRepository.getMetadataFacets( "internal", RepositoryStatistics.FACET_ID ),
                                  Arrays.asList( "20091125.123456.678" ) );
-        control.expectAndReturn( metadataRepository.getMetadataFacet( "internal", RepositoryStatistics.FACET_ID,
-                                                                      "20091125.123456.678" ),
-                                 new RepositoryStatistics() );
+        control.expectAndReturn(
+            metadataRepository.getMetadataFacet( "internal", RepositoryStatistics.FACET_ID, "20091125.123456.678" ),
+            new RepositoryStatistics() );
         control.expectAndReturn( metadataRepository.getMetadataFacets( "snapshots", RepositoryStatistics.FACET_ID ),
                                  Arrays.asList( "20091112.012345.012" ) );
-        control.expectAndReturn( metadataRepository.getMetadataFacet( "snapshots", RepositoryStatistics.FACET_ID,
-                                                                      "20091112.012345.012" ),
-                                 new RepositoryStatistics() );
+        control.expectAndReturn(
+            metadataRepository.getMetadataFacet( "snapshots", RepositoryStatistics.FACET_ID, "20091112.012345.012" ),
+            new RepositoryStatistics() );
         control.replay();
 
         RepositorySession session = mock( RepositorySession.class );
         when( session.getRepository() ).thenReturn( metadataRepository );
-        //TestRepositorySessionFactory factory = (TestRepositorySessionFactory) lookup( RepositorySessionFactory.class );
-        TestRepositorySessionFactory factory = new TestRepositorySessionFactory();
+        TestRepositorySessionFactory factory =
+            applicationContext.getBean( "repositorySessionFactory#test", TestRepositorySessionFactory.class );
         factory.setRepositorySession( session );
 
         ServletRunner sr = new ServletRunner();