diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml
index ff95ddcf5..3301ea685 100644
--- a/archiva-modules/archiva-web/archiva-webdav/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml
@@ -29,6 +29,10 @@
   <artifactId>archiva-webdav</artifactId>
   <name>Archiva Web :: WebDAV</name>
 
+  <properties>
+    <webdav.forkMode>always</webdav.forkMode>
+  </properties>
+
   <dependencies>
     <!-- TODO: remove this hardcoding through a better event mechanism -->
     <dependency>
@@ -159,7 +163,7 @@
           <systemPropertyVariables>
             <appserver.base>${basedir}/target/appserver-base</appserver.base>
           </systemPropertyVariables>
-          <forkMode>always</forkMode>
+          <forkMode>${webdav.forkMode}</forkMode>
         </configuration>
       </plugin>
     </plugins>
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedPluginSnapshotPolicyTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedPluginSnapshotPolicyTest.java
index d83bf35de..efa390254 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedPluginSnapshotPolicyTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedPluginSnapshotPolicyTest.java
@@ -24,10 +24,12 @@ import com.meterware.httpunit.HttpUnitOptions;
 import com.meterware.httpunit.WebRequest;
 import com.meterware.httpunit.WebResponse;
 
+import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
 import org.apache.maven.archiva.policies.SnapshotsPolicy;
 import org.junit.Test;
 
 import java.io.File;
+import java.util.ArrayList;
 
 /**
  * RepositoryServlet Tests, Proxied, Get of Timestamped Snapshot Artifacts, with varying policy settings. 
@@ -178,6 +180,8 @@ public class RepositoryServletProxiedPluginSnapshotPolicyTest
             managedFile.setLastModified( remoteFile.lastModified() + deltaManagedToRemoteTimestamp );
         }
 
+        archivaConfiguration.getConfiguration().setProxyConnectors( new ArrayList<ProxyConnectorConfiguration>( 0 ) );
+
         setupSnapshotConnector( REPOID_INTERNAL, remoteSnapshots, snapshotsPolicy );
         saveConfiguration();