diff --git a/jackrabbit-webapp/pom.xml b/jackrabbit-webapp/pom.xml
index e1d38261a..43e63464e 100644
--- a/jackrabbit-webapp/pom.xml
+++ b/jackrabbit-webapp/pom.xml
@@ -35,7 +35,7 @@
   <description>Web application that hosts and serves a Jackrabbit content repository</description>
 
   <properties>
-    <tomcat.version>8.5.90</tomcat.version>
+    <tomcat.version>9.0.76</tomcat.version>
   </properties>
 
   <dependencies>
diff --git a/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java b/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
index a54775817..d0cc3468c 100644
--- a/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
+++ b/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
@@ -25,8 +25,10 @@ import java.util.List;
 
 import junit.framework.TestCase;
 
+import org.apache.catalina.Context;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.commons.io.FileUtils;
+import org.apache.tomcat.util.scan.StandardJarScanner;
 import org.slf4j.bridge.SLF4JBridgeHandler;
 
 import com.gargoylesoftware.htmlunit.WebClient;
@@ -75,8 +77,11 @@ public class TomcatIT extends TestCase {
         tomcat.setBaseDir(baseDir.getPath());
         tomcat.setHostname(url.getHost());
         tomcat.setPort(url.getPort());
+        tomcat.getConnector();
 
-        tomcat.addWebapp("", war.getAbsolutePath());
+        StandardJarScanner jarScanner = new StandardJarScanner();
+        jarScanner.setScanManifest(false);
+        tomcat.addWebapp("", war.getAbsolutePath()).setJarScanner(jarScanner);
 
         tomcat.start();