diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/feedServletTest-web.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/feedServletTest-web.xml
index 106e9cb73..7741913b2 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/feedServletTest-web.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/feedServletTest-web.xml
@@ -37,18 +37,13 @@
   	<servlet-name>RssFeedServlet</servlet-name>
 	<url-pattern>/feeds/*</url-pattern>
   </servlet-mapping>
-  
-  <context-param>
-    <param-name>contextClass</param-name>
-    <param-value>org.codehaus.plexus.spring.PlexusWebApplicationContext</param-value>
-  </context-param>
+
 
    <context-param>
     <param-name>contextConfigLocation</param-name>
     <param-value>
-        classpath*:/META-INF/plexus/components.xml
+        classpath*:/spring-context.xml
         classpath*:/META-INF/spring-context.xml
-        target/test-classes/org/apache/maven/archiva/web/rss/RssFeedServletTest.xml
     </param-value>
   </context-param>
 
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/web.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/web.xml
index f47bd657f..7df481abd 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/web.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/web.xml
@@ -28,17 +28,11 @@
     <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
   </listener>
 
-  <context-param>
-    <param-name>contextClass</param-name>
-    <param-value>org.codehaus.plexus.spring.PlexusWebApplicationContext</param-value>
-  </context-param>
-
    <context-param>
     <param-name>contextConfigLocation</param-name>
     <param-value>
-        classpath*:/META-INF/plexus/components.xml
+        classpath*:/spring-context.xml
         classpath*:/META-INF/spring-context.xml
-        target/test-classes/org/apache/maven/archiva/web/repository/RepositoryServletTest.xml
     </param-value>
   </context-param>