diff --git a/scm-webapp/src/main/java/sonia/scm/web/filter/HttpProtocolServletAuthenticationFilter.java b/scm-core/src/main/java/sonia/scm/web/filter/HttpProtocolServletAuthenticationFilterBase.java
similarity index 74%
rename from scm-webapp/src/main/java/sonia/scm/web/filter/HttpProtocolServletAuthenticationFilter.java
rename to scm-core/src/main/java/sonia/scm/web/filter/HttpProtocolServletAuthenticationFilterBase.java
index 973b3af4cb..8b1868309b 100644
--- a/scm-webapp/src/main/java/sonia/scm/web/filter/HttpProtocolServletAuthenticationFilter.java
+++ b/scm-core/src/main/java/sonia/scm/web/filter/HttpProtocolServletAuthenticationFilterBase.java
@@ -1,16 +1,11 @@
 package sonia.scm.web.filter;
 
-import sonia.scm.Priority;
 import sonia.scm.config.ScmConfiguration;
-import sonia.scm.filter.Filters;
-import sonia.scm.filter.WebElement;
 import sonia.scm.util.HttpUtil;
 import sonia.scm.web.UserAgent;
 import sonia.scm.web.UserAgentParser;
 import sonia.scm.web.WebTokenGenerator;
-import sonia.scm.web.protocol.HttpProtocolServlet;
 
-import javax.inject.Inject;
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -18,14 +13,11 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Set;
 
-@Priority(Filters.PRIORITY_AUTHENTICATION)
-@WebElement(value = HttpProtocolServlet.PATTERN)
-public class HttpProtocolServletAuthenticationFilter extends AuthenticationFilter {
+public class HttpProtocolServletAuthenticationFilterBase extends AuthenticationFilter {
 
   private final UserAgentParser userAgentParser;
 
-  @Inject
-  public HttpProtocolServletAuthenticationFilter(
+  protected HttpProtocolServletAuthenticationFilterBase(
     ScmConfiguration configuration,
     Set<WebTokenGenerator> tokenGenerators,
     UserAgentParser userAgentParser) {
diff --git a/scm-webapp/src/test/java/sonia/scm/web/filter/HttpProtocolServletAuthenticationFilterTest.java b/scm-core/src/test/java/sonia/scm/web/filter/HttpProtocolServletAuthenticationFilterBaseTest.java
similarity index 91%
rename from scm-webapp/src/test/java/sonia/scm/web/filter/HttpProtocolServletAuthenticationFilterTest.java
rename to scm-core/src/test/java/sonia/scm/web/filter/HttpProtocolServletAuthenticationFilterBaseTest.java
index ff493e2b84..1f9b4fad07 100644
--- a/scm-webapp/src/test/java/sonia/scm/web/filter/HttpProtocolServletAuthenticationFilterTest.java
+++ b/scm-core/src/test/java/sonia/scm/web/filter/HttpProtocolServletAuthenticationFilterBaseTest.java
@@ -23,7 +23,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
-class HttpProtocolServletAuthenticationFilterTest {
+class HttpProtocolServletAuthenticationFilterBaseTest {
 
   private ScmConfiguration configuration = new ScmConfiguration();
 
@@ -32,7 +32,7 @@ class HttpProtocolServletAuthenticationFilterTest {
   @Mock
   private UserAgentParser userAgentParser;
 
-  private HttpProtocolServletAuthenticationFilter authenticationFilter;
+  private HttpProtocolServletAuthenticationFilterBase authenticationFilter;
 
   @Mock
   private HttpServletRequest request;
@@ -48,7 +48,7 @@ class HttpProtocolServletAuthenticationFilterTest {
 
   @BeforeEach
   void setUpObjectUnderTest() {
-    authenticationFilter = new HttpProtocolServletAuthenticationFilter(configuration, tokenGenerators, userAgentParser);
+    authenticationFilter = new HttpProtocolServletAuthenticationFilterBase(configuration, tokenGenerators, userAgentParser);
   }
 
   @Test
diff --git a/scm-core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/scm-core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 0000000000..1f0955d450
--- /dev/null
+++ b/scm-core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline
diff --git a/scm-plugins/scm-legacy-plugin/src/main/java/sonia/scm/legacy/LegacyProtocolServletAuthenticationFilter.java b/scm-plugins/scm-legacy-plugin/src/main/java/sonia/scm/legacy/LegacyProtocolServletAuthenticationFilter.java
new file mode 100644
index 0000000000..ca6dea0898
--- /dev/null
+++ b/scm-plugins/scm-legacy-plugin/src/main/java/sonia/scm/legacy/LegacyProtocolServletAuthenticationFilter.java
@@ -0,0 +1,22 @@
+package sonia.scm.legacy;
+
+import sonia.scm.Priority;
+import sonia.scm.config.ScmConfiguration;
+import sonia.scm.filter.Filters;
+import sonia.scm.filter.WebElement;
+import sonia.scm.web.UserAgentParser;
+import sonia.scm.web.WebTokenGenerator;
+import sonia.scm.web.filter.HttpProtocolServletAuthenticationFilterBase;
+
+import javax.inject.Inject;
+import java.util.Set;
+
+@Priority(Filters.PRIORITY_AUTHENTICATION)
+@WebElement(value = "/git/*", morePatterns = {"/hg/*", "/svn/*"})
+public class LegacyProtocolServletAuthenticationFilter extends HttpProtocolServletAuthenticationFilterBase {
+
+  @Inject
+  public LegacyProtocolServletAuthenticationFilter(ScmConfiguration configuration, Set<WebTokenGenerator> tokenGenerators, UserAgentParser userAgentParser) {
+    super(configuration, tokenGenerators, userAgentParser);
+  }
+}
diff --git a/scm-webapp/src/main/java/sonia/scm/web/filter/DefaultHttpProtocolServletAuthenticationFilter.java b/scm-webapp/src/main/java/sonia/scm/web/filter/DefaultHttpProtocolServletAuthenticationFilter.java
new file mode 100644
index 0000000000..f9b40961a3
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/web/filter/DefaultHttpProtocolServletAuthenticationFilter.java
@@ -0,0 +1,22 @@
+package sonia.scm.web.filter;
+
+import sonia.scm.Priority;
+import sonia.scm.config.ScmConfiguration;
+import sonia.scm.filter.Filters;
+import sonia.scm.filter.WebElement;
+import sonia.scm.web.UserAgentParser;
+import sonia.scm.web.WebTokenGenerator;
+import sonia.scm.web.protocol.HttpProtocolServlet;
+
+import javax.inject.Inject;
+import java.util.Set;
+
+@Priority(Filters.PRIORITY_AUTHENTICATION)
+@WebElement(value = HttpProtocolServlet.PATTERN)
+public class DefaultHttpProtocolServletAuthenticationFilter extends HttpProtocolServletAuthenticationFilterBase {
+
+  @Inject
+  public DefaultHttpProtocolServletAuthenticationFilter(ScmConfiguration configuration, Set<WebTokenGenerator> tokenGenerators, UserAgentParser userAgentParser) {
+    super(configuration, tokenGenerators, userAgentParser);
+  }
+}