diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/SearchActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/SearchActionTest.java
index dd9bce7ff..352d52449 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/SearchActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/SearchActionTest.java
@@ -48,7 +48,7 @@ import static org.mockito.Mockito.when;
  *
  */
 public class SearchActionTest
-    extends PlexusInSpringTestCase
+    extends AbstractActionTestCase
 {
     private SearchAction action;
 
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/UploadActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/UploadActionTest.java
index 6e688f598..029110110 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/UploadActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/UploadActionTest.java
@@ -57,7 +57,7 @@ import java.util.TimeZone;
  * UploadActionTest
  */
 public class UploadActionTest
-    extends PlexusInSpringTestCase
+    extends AbstractActionTestCase
 {
     private UploadAction uploadAction;