diff --git a/services/git-bridge/pom.xml b/services/git-bridge/pom.xml
index 351cc054e0..18cbd74e3a 100644
--- a/services/git-bridge/pom.xml
+++ b/services/git-bridge/pom.xml
@@ -23,12 +23,13 @@
                     <compilerArgument></compilerArgument>
                 </configuration>
             </plugin>
-						<!-- Hack, test loader crashes without this bit -->
+						<!-- Workaround, test loader crashes without this configuration option -->
+						<!-- See: https://stackoverflow.com/questions/53010200/maven-surefire-could-not-find-forkedbooter-class -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <useSystemClassLoader>false</useSystemClassLoader>
+                  <argLine>-Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
                 </configuration>
             </plugin>
             <!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-assembly-plugin -->