diff --git a/adapters/oidc/fuse7/tomcat8/pom.xml b/adapters/oidc/fuse7/tomcat8/pom.xml
index ae094e71cec..3fbad988c7b 100644
--- a/adapters/oidc/fuse7/tomcat8/pom.xml
+++ b/adapters/oidc/fuse7/tomcat8/pom.xml
@@ -57,7 +57,7 @@
 
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-tomcat8-adapter</artifactId>
+            <artifactId>keycloak-tomcat-adapter</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/adapters/oidc/spring-boot-container-bundle/pom.xml b/adapters/oidc/spring-boot-container-bundle/pom.xml
index 67b0d2ad48f..fd83d32eb5b 100644
--- a/adapters/oidc/spring-boot-container-bundle/pom.xml
+++ b/adapters/oidc/spring-boot-container-bundle/pom.xml
@@ -12,7 +12,7 @@
     <dependencies>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-tomcat8-adapter</artifactId>
+            <artifactId>keycloak-tomcat-adapter</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -41,7 +41,7 @@
                         <configuration>
                             <artifactSet>
                                 <includes>
-                                    <include>org.keycloak:keycloak-tomcat8-adapter</include>
+                                    <include>org.keycloak:keycloak-tomcat-adapter</include>
                                     <include>org.keycloak:keycloak-undertow-adapter</include>
                                     <include>org.keycloak:keycloak-jetty93-adapter</include>
                                     <include>org.keycloak:keycloak-tomcat-core-adapter</include>
diff --git a/adapters/oidc/tomcat/pom.xml b/adapters/oidc/tomcat/pom.xml
index e1551ee1e0a..ef2d7094b52 100755
--- a/adapters/oidc/tomcat/pom.xml
+++ b/adapters/oidc/tomcat/pom.xml
@@ -32,7 +32,7 @@
 
     <modules>
         <module>tomcat-core</module>
-        <module>tomcat8</module>
+        <module>tomcat</module>
     </modules>
 
     <profiles>
diff --git a/adapters/oidc/tomcat/tomcat8/pom.xml b/adapters/oidc/tomcat/tomcat/pom.xml
similarity index 97%
rename from adapters/oidc/tomcat/tomcat8/pom.xml
rename to adapters/oidc/tomcat/tomcat/pom.xml
index 721d56980f2..922b40e511f 100755
--- a/adapters/oidc/tomcat/tomcat8/pom.xml
+++ b/adapters/oidc/tomcat/tomcat/pom.xml
@@ -26,8 +26,8 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>keycloak-tomcat8-adapter</artifactId>
-    <name>Keycloak Tomcat 8 Integration</name>
+    <artifactId>keycloak-tomcat-adapter</artifactId>
+    <name>Keycloak Tomcat Integration</name>
     <properties>
         <maven.compiler.target>1.7</maven.compiler.target>
         <maven.compiler.source>1.7</maven.compiler.source>
diff --git a/adapters/oidc/tomcat/tomcat8/src/main/java/org/keycloak/adapters/tomcat/AuthenticatedActionsValve.java b/adapters/oidc/tomcat/tomcat/src/main/java/org/keycloak/adapters/tomcat/AuthenticatedActionsValve.java
similarity index 100%
rename from adapters/oidc/tomcat/tomcat8/src/main/java/org/keycloak/adapters/tomcat/AuthenticatedActionsValve.java
rename to adapters/oidc/tomcat/tomcat/src/main/java/org/keycloak/adapters/tomcat/AuthenticatedActionsValve.java
diff --git a/adapters/oidc/tomcat/tomcat8/src/main/java/org/keycloak/adapters/tomcat/KeycloakAuthenticatorValve.java b/adapters/oidc/tomcat/tomcat/src/main/java/org/keycloak/adapters/tomcat/KeycloakAuthenticatorValve.java
similarity index 100%
rename from adapters/oidc/tomcat/tomcat8/src/main/java/org/keycloak/adapters/tomcat/KeycloakAuthenticatorValve.java
rename to adapters/oidc/tomcat/tomcat/src/main/java/org/keycloak/adapters/tomcat/KeycloakAuthenticatorValve.java
diff --git a/adapters/oidc/tomcat/tomcat8/src/main/java/org/keycloak/adapters/tomcat/Tomcat8RequestAuthenticator.java b/adapters/oidc/tomcat/tomcat/src/main/java/org/keycloak/adapters/tomcat/TomcatRequestAuthenticator.java
similarity index 84%
rename from adapters/oidc/tomcat/tomcat8/src/main/java/org/keycloak/adapters/tomcat/Tomcat8RequestAuthenticator.java
rename to adapters/oidc/tomcat/tomcat/src/main/java/org/keycloak/adapters/tomcat/TomcatRequestAuthenticator.java
index 5829cac3445..8103959fcaa 100755
--- a/adapters/oidc/tomcat/tomcat8/src/main/java/org/keycloak/adapters/tomcat/Tomcat8RequestAuthenticator.java
+++ b/adapters/oidc/tomcat/tomcat/src/main/java/org/keycloak/adapters/tomcat/TomcatRequestAuthenticator.java
@@ -27,8 +27,8 @@ import javax.servlet.http.HttpSession;
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
  * @version $Revision: 1 $
  */
-public class Tomcat8RequestAuthenticator extends CatalinaRequestAuthenticator {
-    public Tomcat8RequestAuthenticator(KeycloakDeployment deployment, AdapterTokenStore tokenStore, CatalinaHttpFacade facade, Request request, GenericPrincipalFactory principalFactory) {
+public class TomcatRequestAuthenticator extends CatalinaRequestAuthenticator {
+    public TomcatRequestAuthenticator(KeycloakDeployment deployment, AdapterTokenStore tokenStore, CatalinaHttpFacade facade, Request request, GenericPrincipalFactory principalFactory) {
         super(deployment, tokenStore, facade, request, principalFactory);
     }
 
diff --git a/adapters/saml/tomcat/pom.xml b/adapters/saml/tomcat/pom.xml
index b662da1098a..43a6ef6657a 100755
--- a/adapters/saml/tomcat/pom.xml
+++ b/adapters/saml/tomcat/pom.xml
@@ -32,7 +32,7 @@
 
     <modules>
         <module>tomcat-core</module>
-        <module>tomcat8</module>
+        <module>tomcat</module>
     </modules>
 
     <profiles>
diff --git a/adapters/saml/tomcat/tomcat8/pom.xml b/adapters/saml/tomcat/tomcat/pom.xml
similarity index 96%
rename from adapters/saml/tomcat/tomcat8/pom.xml
rename to adapters/saml/tomcat/tomcat/pom.xml
index 13af9e075fd..05c7fa0fa65 100755
--- a/adapters/saml/tomcat/tomcat8/pom.xml
+++ b/adapters/saml/tomcat/tomcat/pom.xml
@@ -26,8 +26,8 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>keycloak-saml-tomcat8-adapter</artifactId>
-    <name>Keycloak Tomcat 8 SAML Integration</name>
+    <artifactId>keycloak-saml-tomcat-adapter</artifactId>
+    <name>Keycloak Tomcat SAML Integration</name>
     <properties>
         <maven.compiler.target>1.7</maven.compiler.target>
         <maven.compiler.source>1.7</maven.compiler.source>
diff --git a/adapters/saml/tomcat/tomcat8/src/main/java/org/keycloak/adapters/saml/tomcat/SamlAuthenticatorValve.java b/adapters/saml/tomcat/tomcat/src/main/java/org/keycloak/adapters/saml/tomcat/SamlAuthenticatorValve.java
similarity index 86%
rename from adapters/saml/tomcat/tomcat8/src/main/java/org/keycloak/adapters/saml/tomcat/SamlAuthenticatorValve.java
rename to adapters/saml/tomcat/tomcat/src/main/java/org/keycloak/adapters/saml/tomcat/SamlAuthenticatorValve.java
index caf1bf98a7c..58c041091fc 100755
--- a/adapters/saml/tomcat/tomcat8/src/main/java/org/keycloak/adapters/saml/tomcat/SamlAuthenticatorValve.java
+++ b/adapters/saml/tomcat/tomcat/src/main/java/org/keycloak/adapters/saml/tomcat/SamlAuthenticatorValve.java
@@ -44,6 +44,7 @@ public class SamlAuthenticatorValve extends AbstractSamlAuthenticatorValve {
     /**
      * Method called by Tomcat &lt; 8.5.5
      */
+    @Override
     public boolean authenticate(Request request, HttpServletResponse response) throws IOException {
        return authenticateInternal(request, response, request.getContext().getLoginConfig());
     }
@@ -51,6 +52,7 @@ public class SamlAuthenticatorValve extends AbstractSamlAuthenticatorValve {
     /**
      * Method called by Tomcat &gt;= 8.5.5
      */
+    @Override
     protected boolean doAuthenticate(Request request, HttpServletResponse response) throws IOException {
        return this.authenticate(request, response);
     }
@@ -62,16 +64,7 @@ public class SamlAuthenticatorValve extends AbstractSamlAuthenticatorValve {
         if (config.getErrorPage() == null) return false;
         // had to do this to get around compiler/IDE issues :(
         try {
-            Method method = null;
-            /*
-            for (Method m : getClass().getDeclaredMethods()) {
-                if (m.getName().equals("forwardToErrorPage")) {
-                    method = m;
-                    break;
-                }
-            }
-            */
-            method = FormAuthenticator.class.getDeclaredMethod("forwardToErrorPage", Request.class, HttpServletResponse.class, LoginConfig.class);
+            Method method = FormAuthenticator.class.getDeclaredMethod("forwardToErrorPage", Request.class, HttpServletResponse.class, LoginConfig.class);
             method.setAccessible(true);
             method.invoke(this, request, response, config);
         } catch (Exception e) {
@@ -80,11 +73,13 @@ public class SamlAuthenticatorValve extends AbstractSamlAuthenticatorValve {
         return true;
     }
 
+    @Override
     protected void initInternal() {
         StandardContext standardContext = (StandardContext) context;
         standardContext.addLifecycleListener(this);
     }
 
+    @Override
     public void logout(Request request) {
         logoutInternal(request);
     }
@@ -102,7 +97,7 @@ public class SamlAuthenticatorValve extends AbstractSamlAuthenticatorValve {
     @Override
     protected SamlSessionStore createSessionStore(Request request, HttpFacade facade, SamlDeployment resolvedDeployment) {
         SamlSessionStore store;
-        store = new Tomcat8SamlSessionStore(userSessionManagement, createPrincipalFactory(), mapper, request, this, facade, resolvedDeployment);
+        store = new TomcatSamlSessionStore(userSessionManagement, createPrincipalFactory(), mapper, request, this, facade, resolvedDeployment);
         return store;
     }
 
diff --git a/adapters/saml/tomcat/tomcat8/src/main/java/org/keycloak/adapters/saml/tomcat/Tomcat8SamlSessionStore.java b/adapters/saml/tomcat/tomcat/src/main/java/org/keycloak/adapters/saml/tomcat/TomcatSamlSessionStore.java
similarity index 84%
rename from adapters/saml/tomcat/tomcat8/src/main/java/org/keycloak/adapters/saml/tomcat/Tomcat8SamlSessionStore.java
rename to adapters/saml/tomcat/tomcat/src/main/java/org/keycloak/adapters/saml/tomcat/TomcatSamlSessionStore.java
index 57fef3e043b..f3d852ece15 100755
--- a/adapters/saml/tomcat/tomcat8/src/main/java/org/keycloak/adapters/saml/tomcat/Tomcat8SamlSessionStore.java
+++ b/adapters/saml/tomcat/tomcat/src/main/java/org/keycloak/adapters/saml/tomcat/TomcatSamlSessionStore.java
@@ -32,8 +32,8 @@ import org.keycloak.adapters.tomcat.GenericPrincipalFactory;
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
  * @version $Revision: 1 $
  */
-public class Tomcat8SamlSessionStore extends CatalinaSamlSessionStore {
-    public Tomcat8SamlSessionStore(CatalinaUserSessionManagement sessionManagement, GenericPrincipalFactory principalFactory, SessionIdMapper idMapper, Request request, AbstractSamlAuthenticatorValve valve, HttpFacade facade, SamlDeployment deployment) {
+public class TomcatSamlSessionStore extends CatalinaSamlSessionStore {
+    public TomcatSamlSessionStore(CatalinaUserSessionManagement sessionManagement, GenericPrincipalFactory principalFactory, SessionIdMapper idMapper, Request request, AbstractSamlAuthenticatorValve valve, HttpFacade facade, SamlDeployment deployment) {
         super(sessionManagement, principalFactory, idMapper, SessionIdMapperUpdater.DIRECT, request, valve, facade, deployment);
     }
 
diff --git a/boms/adapter/pom.xml b/boms/adapter/pom.xml
index f8f558ba1c1..82a3a6548a5 100644
--- a/boms/adapter/pom.xml
+++ b/boms/adapter/pom.xml
@@ -66,7 +66,7 @@
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-tomcat8-adapter</artifactId>
+                <artifactId>keycloak-tomcat-adapter</artifactId>
                 <version>7.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
diff --git a/distribution/adapters/pom.xml b/distribution/adapters/pom.xml
index 9ebe42cdfd6..017bc3ba7c4 100755
--- a/distribution/adapters/pom.xml
+++ b/distribution/adapters/pom.xml
@@ -47,8 +47,8 @@
                 </property>
             </activation>
             <modules>
+                <module>tomcat-adapter-zip</module>
                 <module>tomcat7-adapter-zip</module>
-                <module>tomcat8-adapter-zip</module>
                 <module>jetty92-adapter-zip</module>
                 <module>jetty93-adapter-zip</module>
                 <module>jetty94-adapter-zip</module>
diff --git a/distribution/adapters/tomcat8-adapter-zip/assembly.xml b/distribution/adapters/tomcat-adapter-zip/assembly.xml
similarity index 95%
rename from distribution/adapters/tomcat8-adapter-zip/assembly.xml
rename to distribution/adapters/tomcat-adapter-zip/assembly.xml
index 9dc47147a18..a5a3c5601b6 100755
--- a/distribution/adapters/tomcat8-adapter-zip/assembly.xml
+++ b/distribution/adapters/tomcat-adapter-zip/assembly.xml
@@ -30,7 +30,7 @@
             <useTransitiveDependencies>true</useTransitiveDependencies>
             <useTransitiveFiltering>true</useTransitiveFiltering>
             <includes>
-                <include>org.keycloak:keycloak-tomcat8-adapter</include>
+                <include>org.keycloak:keycloak-tomcat-adapter</include>
             </includes>
             <excludes>
                 <exclude>org.apache.tomcat:tomcat-servlet-api</exclude>
diff --git a/distribution/adapters/tomcat8-adapter-zip/pom.xml b/distribution/adapters/tomcat-adapter-zip/pom.xml
similarity index 93%
rename from distribution/adapters/tomcat8-adapter-zip/pom.xml
rename to distribution/adapters/tomcat-adapter-zip/pom.xml
index f2e2f060ec1..4e7c067d8ad 100755
--- a/distribution/adapters/tomcat8-adapter-zip/pom.xml
+++ b/distribution/adapters/tomcat-adapter-zip/pom.xml
@@ -25,15 +25,15 @@
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>keycloak-tomcat8-adapter-dist</artifactId>
+    <artifactId>keycloak-tomcat-adapter-dist</artifactId>
     <packaging>pom</packaging>
-    <name>Keycloak Tomcat 8 Adapter Distro</name>
+    <name>Keycloak Tomcat Adapter Distro</name>
     <description/>
 
     <dependencies>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-tomcat8-adapter</artifactId>
+            <artifactId>keycloak-tomcat-adapter</artifactId>
         </dependency>
     </dependencies>
     <build>
diff --git a/distribution/downloads/src/main/resources/files b/distribution/downloads/src/main/resources/files
index a7bc4fe9844..d84fa46929d 100644
--- a/distribution/downloads/src/main/resources/files
+++ b/distribution/downloads/src/main/resources/files
@@ -11,8 +11,8 @@
     keycloak-jetty93-adapter-dist
     keycloak-jetty94-adapter-dist
     keycloak-js-adapter-dist
+    keycloak-tomcat-adapter-dist
     keycloak-tomcat7-adapter-dist
-    keycloak-tomcat8-adapter-dist
     keycloak-wildfly-adapter-dist
     keycloak-fuse-adapter-dist
 
@@ -22,6 +22,6 @@
     keycloak-saml-jetty92-adapter-dist
     keycloak-saml-jetty93-adapter-dist
     keycloak-saml-jetty94-adapter-dist
+    keycloak-saml-tomcat-adapter-dist
     keycloak-saml-tomcat7-adapter-dist
-    keycloak-saml-tomcat8-adapter-dist
     keycloak-saml-wildfly-adapter-dist
diff --git a/distribution/saml-adapters/pom.xml b/distribution/saml-adapters/pom.xml
index 4a5dd58e6d0..9f79a0e2d91 100755
--- a/distribution/saml-adapters/pom.xml
+++ b/distribution/saml-adapters/pom.xml
@@ -47,8 +47,8 @@
                 <module>jetty92-adapter-zip</module>
                 <module>jetty93-adapter-zip</module>
                 <module>jetty94-adapter-zip</module>
+                <module>tomcat-adapter-zip</module>
                 <module>tomcat7-adapter-zip</module>
-                <module>tomcat8-adapter-zip</module>
             </modules>
         </profile>
     </profiles>
diff --git a/distribution/saml-adapters/tomcat8-adapter-zip/assembly.xml b/distribution/saml-adapters/tomcat-adapter-zip/assembly.xml
similarity index 94%
rename from distribution/saml-adapters/tomcat8-adapter-zip/assembly.xml
rename to distribution/saml-adapters/tomcat-adapter-zip/assembly.xml
index e25c17c3e9a..8fce0fa7343 100755
--- a/distribution/saml-adapters/tomcat8-adapter-zip/assembly.xml
+++ b/distribution/saml-adapters/tomcat-adapter-zip/assembly.xml
@@ -30,7 +30,7 @@
             <useTransitiveDependencies>true</useTransitiveDependencies>
             <useTransitiveFiltering>true</useTransitiveFiltering>
             <includes>
-                <include>org.keycloak:keycloak-saml-tomcat8-adapter</include>
+                <include>org.keycloak:keycloak-saml-tomcat-adapter</include>
             </includes>
             <excludes>
                 <exclude>org.apache.tomcat:tomcat-servlet-api</exclude>
diff --git a/distribution/saml-adapters/tomcat8-adapter-zip/pom.xml b/distribution/saml-adapters/tomcat-adapter-zip/pom.xml
similarity index 92%
rename from distribution/saml-adapters/tomcat8-adapter-zip/pom.xml
rename to distribution/saml-adapters/tomcat-adapter-zip/pom.xml
index e39c24870a5..5c6e0cc6595 100755
--- a/distribution/saml-adapters/tomcat8-adapter-zip/pom.xml
+++ b/distribution/saml-adapters/tomcat-adapter-zip/pom.xml
@@ -25,15 +25,15 @@
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>keycloak-saml-tomcat8-adapter-dist</artifactId>
+    <artifactId>keycloak-saml-tomcat-adapter-dist</artifactId>
     <packaging>pom</packaging>
-    <name>Keycloak SAML Tomcat 8 Adapter Distro</name>
+    <name>Keycloak SAML Tomcat Adapter Distro</name>
     <description/>
 
     <dependencies>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-saml-tomcat8-adapter</artifactId>
+            <artifactId>keycloak-saml-tomcat-adapter</artifactId>
         </dependency>
     </dependencies>
     <build>
diff --git a/pom.xml b/pom.xml
index b4d07cc048d..0caf3acd6f3 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1006,7 +1006,7 @@
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-saml-tomcat8-adapter</artifactId>
+                <artifactId>keycloak-saml-tomcat-adapter</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -1016,7 +1016,7 @@
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-tomcat8-adapter</artifactId>
+                <artifactId>keycloak-tomcat-adapter</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -1260,7 +1260,7 @@
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-tomcat8-adapter-dist</artifactId>
+                <artifactId>keycloak-tomcat-adapter-dist</artifactId>
                 <version>${project.version}</version>
                 <type>zip</type>
             </dependency>
@@ -1320,7 +1320,7 @@
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-saml-tomcat8-adapter-dist</artifactId>
+                <artifactId>keycloak-saml-tomcat-adapter-dist</artifactId>
                 <version>${project.version}</version>
                 <type>zip</type>
             </dependency>
diff --git a/testsuite/integration-arquillian/servers/app-server/tomcat/pom.xml b/testsuite/integration-arquillian/servers/app-server/tomcat/pom.xml
index 27be7f5cd97..337707cb13c 100644
--- a/testsuite/integration-arquillian/servers/app-server/tomcat/pom.xml
+++ b/testsuite/integration-arquillian/servers/app-server/tomcat/pom.xml
@@ -34,13 +34,8 @@
         <assembly.xml>${project.parent.basedir}/assembly.xml</assembly.xml>
         <app.server.tomcat.home>${containers.home}/${app.server.tomcat.unpacked.folder.name}</app.server.tomcat.home>
         <tomcat.resteasy.version>${resteasy.version}</tomcat.resteasy.version>
-        <skip.dependencies.for.tomcat7>true</skip.dependencies.for.tomcat7>
-        <skip.dependencies.for.tomcat8>true</skip.dependencies.for.tomcat8>
+        <skip.dependencies.for.tomcat>false</skip.dependencies.for.tomcat>
 
-        <tomcat.scannotation.version>1.0.3</tomcat.scannotation.version>
-        <tomcat.javassist.version>3.18.2-GA</tomcat.javassist.version>
-        <tomcat.javaee-api.version>7.0</tomcat.javaee-api.version>
-        <tomcat.org.glassfish.web.el-impl.version>2.2</tomcat.org.glassfish.web.el-impl.version>
         <tomcat.reactive-streams.version>1.0.2</tomcat.reactive-streams.version>
         <tomcat.javax.json.bind-api.version>1.0</tomcat.javax.json.bind-api.version>
         <tomcat.validation-api.version>1.0.0.GA</tomcat.validation-api.version>
@@ -109,46 +104,6 @@
                                     <overWriteIfNewer>true</overWriteIfNewer>
                                 </configuration>
                             </execution>
-                            <execution>
-                                <id>libs-for-tomcat-7</id>
-                                <phase>generate-test-resources</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <skip>${skip.dependencies.for.tomcat7}</skip>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>org.jboss.resteasy</groupId>
-                                            <artifactId>resteasy-jaxrs</artifactId>
-                                            <version>${tomcat.resteasy.version}</version>
-                                        </artifactItem>
-                                        <artifactItem>
-                                            <groupId>org.scannotation</groupId>
-                                            <artifactId>scannotation</artifactId>
-                                            <version>${tomcat.scannotation.version}</version>
-                                        </artifactItem>
-                                        <artifactItem>
-                                            <groupId>org.javassist</groupId>
-                                            <artifactId>javassist</artifactId>
-                                            <version>${tomcat.javassist.version}</version>
-                                        </artifactItem>
-                                        <artifactItem>
-                                            <groupId>javax</groupId>
-                                            <artifactId>javaee-api</artifactId>
-                                            <version>${tomcat.javaee-api.version}</version>
-                                        </artifactItem>
-                                        <artifactItem>
-                                            <!-- JSP compilation failed without this -->
-                                            <groupId>org.glassfish.web</groupId>
-                                            <artifactId>el-impl</artifactId>
-                                            <version>${tomcat.org.glassfish.web.el-impl.version}</version>
-                                        </artifactItem>
-                                    </artifactItems>
-                                    <outputDirectory>${app.server.tomcat.home}/lib</outputDirectory>
-                                    <overWriteIfNewer>true</overWriteIfNewer>
-                                </configuration>
-                            </execution>
                             <execution>
                                 <id>libs-for-tomcat-8-and-9</id>
                                 <phase>generate-test-resources</phase>
@@ -156,7 +111,7 @@
                                     <goal>copy</goal>
                                 </goals>
                                 <configuration>
-                                    <skip>${skip.dependencies.for.tomcat8}</skip>
+                                    <skip>${skip.dependencies.for.tomcat}</skip>
                                     <artifactItems>
                                         <artifactItem>
                                             <groupId>org.jboss.spec.javax.ws.rs</groupId>
diff --git a/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/pom.xml b/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/pom.xml
index 385e11d2566..5ce358e7e8e 100644
--- a/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/pom.xml
+++ b/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/pom.xml
@@ -39,9 +39,14 @@
         <app.server.oidc.adapter.artifactId>keycloak-tomcat7-adapter-dist</app.server.oidc.adapter.artifactId>
         <app.server.saml.adapter.artifactId>keycloak-saml-tomcat7-adapter-dist</app.server.saml.adapter.artifactId>
 
+        <skip.dependencies.for.tomcat>true</skip.dependencies.for.tomcat>
+
         <!-- newer resteasy-jaxrs is not compatible with annotation-api which is provided by Tomcat7 -->
         <tomcat.resteasy.version>2.3.1.GA</tomcat.resteasy.version>
-        <skip.dependencies.for.tomcat7>false</skip.dependencies.for.tomcat7>
+        <tomcat.scannotation.version>1.0.3</tomcat.scannotation.version>
+        <tomcat.javassist.version>3.18.2-GA</tomcat.javassist.version>
+        <tomcat.javaee-api.version>7.0</tomcat.javaee-api.version>
+        <tomcat.org.glassfish.web.el-impl.version>2.2</tomcat.org.glassfish.web.el-impl.version>
     </properties>
 
     <dependencies>
@@ -56,4 +61,53 @@
             <version>${arquillian-tomcat7-container-version}</version>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>libs-for-tomcat-7</id>
+                        <phase>generate-test-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.jboss.resteasy</groupId>
+                                    <artifactId>resteasy-jaxrs</artifactId>
+                                    <version>${tomcat.resteasy.version}</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.scannotation</groupId>
+                                    <artifactId>scannotation</artifactId>
+                                    <version>${tomcat.scannotation.version}</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.javassist</groupId>
+                                    <artifactId>javassist</artifactId>
+                                    <version>${tomcat.javassist.version}</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>javax</groupId>
+                                    <artifactId>javaee-api</artifactId>
+                                    <version>${tomcat.javaee-api.version}</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <!-- JSP compilation failed without this -->
+                                    <groupId>org.glassfish.web</groupId>
+                                    <artifactId>el-impl</artifactId>
+                                    <version>${tomcat.org.glassfish.web.el-impl.version}</version>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${app.server.tomcat.home}/lib</outputDirectory>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat8/pom.xml b/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat8/pom.xml
index c8c2efc3c84..86c6781bc4c 100644
--- a/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat8/pom.xml
+++ b/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat8/pom.xml
@@ -36,8 +36,8 @@
         <app.server.tomcat.version>${tomcat8.version}</app.server.tomcat.version>
         <app.server.tomcat.unpacked.folder.name>apache-tomcat-${tomcat8.version}</app.server.tomcat.unpacked.folder.name>
         
-        <app.server.oidc.adapter.artifactId>keycloak-tomcat8-adapter-dist</app.server.oidc.adapter.artifactId>
-        <app.server.saml.adapter.artifactId>keycloak-saml-tomcat8-adapter-dist</app.server.saml.adapter.artifactId>
+        <app.server.oidc.adapter.artifactId>keycloak-tomcat-adapter-dist</app.server.oidc.adapter.artifactId>
+        <app.server.saml.adapter.artifactId>keycloak-saml-tomcat-adapter-dist</app.server.saml.adapter.artifactId>
         <skip.dependencies.for.tomcat8>false</skip.dependencies.for.tomcat8>
     </properties>
 
diff --git a/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat9/pom.xml b/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat9/pom.xml
index d0028254d92..a7af9f31a17 100644
--- a/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat9/pom.xml
+++ b/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat9/pom.xml
@@ -36,9 +36,8 @@
         <app.server.tomcat.version>${tomcat9.version}</app.server.tomcat.version>
         <app.server.tomcat.unpacked.folder.name>apache-tomcat-${tomcat9.version}</app.server.tomcat.unpacked.folder.name>
 
-        <!-- KEYCLOAK-9598 - There are no adapters for Tomcat 9 for now we use adapters for Tomcat 8 -->
-        <app.server.oidc.adapter.artifactId>keycloak-tomcat8-adapter-dist</app.server.oidc.adapter.artifactId>
-        <app.server.saml.adapter.artifactId>keycloak-saml-tomcat8-adapter-dist</app.server.saml.adapter.artifactId>
+        <app.server.oidc.adapter.artifactId>keycloak-tomcat-adapter-dist</app.server.oidc.adapter.artifactId>
+        <app.server.saml.adapter.artifactId>keycloak-saml-tomcat-adapter-dist</app.server.saml.adapter.artifactId>
         <skip.dependencies.for.tomcat8>false</skip.dependencies.for.tomcat8>
     </properties>
 
diff --git a/testsuite/integration-arquillian/test-apps/spring-boot-adapter-app/pom.xml b/testsuite/integration-arquillian/test-apps/spring-boot-adapter-app/pom.xml
index a88211a755e..a604c274843 100644
--- a/testsuite/integration-arquillian/test-apps/spring-boot-adapter-app/pom.xml
+++ b/testsuite/integration-arquillian/test-apps/spring-boot-adapter-app/pom.xml
@@ -18,7 +18,7 @@
         <jetty.version>${jetty94.version}</jetty.version>
 
         <spring-boot-adapter-jetty>false</spring-boot-adapter-jetty>
-        <spring.boot.tomcat.adapter.artifactId>keycloak-tomcat8-adapter</spring.boot.tomcat.adapter.artifactId>
+        <spring.boot.tomcat.adapter.artifactId>keycloak-tomcat-adapter</spring.boot.tomcat.adapter.artifactId>
 
         <jetty.version/>