keycloak-uncached

diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml
index 2eacdd3..3d99d83 100644
--- a/testsuite/integration-arquillian/pom.xml
+++ b/testsuite/integration-arquillian/pom.xml
@@ -44,6 +44,8 @@
         <!--component versions-->
         <!--to update arquillian-core to 1.3.0.Final or higher see https://issues.jboss.org/browse/ARQ-2181 -->
         <arquillian-core.version>1.2.1.Final</arquillian-core.version>
+        <!--the version of shrinkwrap_resolver should align with the version in arquillian-bom-->
+        <shrinkwrap-resolver.version>2.2.6</shrinkwrap-resolver.version>
         <selenium.version>3.11.0</selenium.version>
         <arquillian-drone.version>2.5.1</arquillian-drone.version>
         <arquillian-graphene.version>2.3.2</arquillian-graphene.version>
@@ -83,8 +85,10 @@
             </dependency>
             <dependency>
                 <groupId>org.jboss.shrinkwrap.resolver</groupId>
-                <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
-                <scope>test</scope>
+                <artifactId>shrinkwrap-resolver-bom</artifactId>
+                <version>${shrinkwrap-resolver.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.jboss.arquillian.extension</groupId>
@@ -141,6 +145,11 @@
                     <artifactId>maven-resources-plugin</artifactId>
                     <version>3.0.0</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.commonjava.maven.plugins</groupId>
+                    <artifactId>directory-maven-plugin</artifactId>
+                    <version>0.3.1</version>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>

diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/common/cli/configure-crossdc-config.cli b/testsuite/integration-arquillian/servers/app-server/jboss/common/cli/configure-crossdc-config.cli
new file mode 100644
index 0000000..223e419
--- /dev/null
+++ b/testsuite/integration-arquillian/servers/app-server/jboss/common/cli/configure-crossdc-config.cli
@@ -0,0 +1,28 @@
+embed-server --server-config=standalone-ha.xml
+
+/subsystem=jgroups/stack=tcpping:add
+/subsystem=jgroups/stack=tcpping/transport=TCP:add(socket-binding=jgroups-tcp)
+/subsystem=jgroups/stack=tcpping/protocol=TCPPING:add
+/subsystem=jgroups/stack=tcpping/protocol=TCPPING/property=initial_hosts:add(value=localhost[${tcpping.port}])
+/subsystem=jgroups/stack=tcpping/protocol=TCPPING/property=port_range:add(value=0)
+/subsystem=jgroups/stack=tcpping/protocol=MERGE3:add
+/subsystem=jgroups/stack=tcpping/protocol=FD_SOCK:add(socket-binding=jgroups-tcp-fd)
+/subsystem=jgroups/stack=tcpping/protocol=FD:add
+/subsystem=jgroups/stack=tcpping/protocol=VERIFY_SUSPECT:add
+/subsystem=jgroups/stack=tcpping/protocol=pbcast.NAKACK2:add
+/subsystem=jgroups/stack=tcpping/protocol=UNICAST3:add
+/subsystem=jgroups/stack=tcpping/protocol=pbcast.STABLE:add
+/subsystem=jgroups/stack=tcpping/protocol=pbcast.GMS:add
+/subsystem=jgroups/stack=tcpping/protocol=MFC:add
+/subsystem=jgroups/stack=tcpping/protocol=FRAG2:add
+/subsystem=jgroups/channel=ee:write-attribute(name=stack,value=tcpping)
+
+/socket-binding-group=standard-sockets/remote-destination-outbound-socket-binding=cache-server:add(host=localhost,port=${cache.hotrod.port})
+
+/subsystem=infinispan/cache-container=web/replicated-cache=employee-distributable-cache:add(statistics-enabled=true,mode=SYNC)
+/subsystem=infinispan/cache-container=web/replicated-cache=employee-distributable-cache/component=locking:add(isolation=REPEATABLE_READ)
+/subsystem=infinispan/cache-container=web/replicated-cache=employee-distributable-cache/component=transaction:add(mode=BATCH)
+/subsystem=infinispan/cache-container=web/replicated-cache=employee-distributable-cache/store=remote:add(remote-servers=[cache-server],cache=employee-distributable-cache,passivation=false,purge=false,preload=false,shared=true)
+
+/subsystem=infinispan/cache-container=web/replicated-cache=employee-distributable-cache.ssoCache:add(statistics-enabled=true,mode=SYNC)
+/subsystem=infinispan/cache-container=web/replicated-cache=employee-distributable-cache.ssoCache/store=remote:add(remote-servers=[cache-server],cache=employee-distributable-cache.ssoCache,passivation=false,purge=false,preload=false,shared=true)

diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/eap6/pom.xml b/testsuite/integration-arquillian/servers/app-server/jboss/eap6/pom.xml
index 9a99b1b..c949a67 100644
--- a/testsuite/integration-arquillian/servers/app-server/jboss/eap6/pom.xml
+++ b/testsuite/integration-arquillian/servers/app-server/jboss/eap6/pom.xml
@@ -39,6 +39,8 @@
         
         <app.server.oidc.adapter.artifactId>keycloak-eap6-adapter-dist</app.server.oidc.adapter.artifactId>
         <app.server.saml.adapter.artifactId>keycloak-saml-eap6-adapter-dist</app.server.saml.adapter.artifactId>
+        
+        <skip.apply.offline.cli>true</skip.apply.offline.cli>
     </properties>
     
     <build>

diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml b/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml
index 21af789..ec5190b 100644
--- a/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml
+++ b/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml
@@ -233,6 +233,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
+                                    <skip>${skip.apply.offline.cli}</skip><!--eap6-->
                                     <executable>./jboss-cli.${script.suffix}</executable>
                                     <workingDirectory>${app.server.jboss.home}/bin</workingDirectory>
                                     <arguments>
@@ -247,6 +248,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
+                                    <skip>${skip.apply.offline.cli}</skip><!--eap6-->
                                     <executable>./jboss-cli.${script.suffix}</executable>
                                     <workingDirectory>${app.server.jboss.home}/bin</workingDirectory>
                                     <arguments>
@@ -396,6 +398,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
+                                    <skip>${skip.apply.offline.cli}</skip><!--eap6-->
                                     <workingDirectory>${app.server.jboss.home}/bin</workingDirectory>
                                     <executable>./jboss-cli.sh</executable>
                                     <arguments>
@@ -410,6 +413,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
+                                    <skip>${skip.apply.offline.cli}</skip><!--eap6-->
                                     <workingDirectory>${app.server.jboss.home}/bin</workingDirectory>
                                     <executable>./jboss-cli.sh</executable>
                                     <arguments>
@@ -418,6 +422,22 @@
                                     </arguments>
                                 </configuration>
                             </execution>
+                            <execution>
+                                <id>configure-crossdc-config</id>
+                                <phase>generate-test-sources</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <skip>${skip.apply.offline.cli}</skip><!--eap6-->
+                                    <workingDirectory>${app.server.jboss.home}/bin</workingDirectory>
+                                    <executable>./jboss-cli.sh</executable>
+                                    <arguments>
+                                        <argument>--file=${common.resources}/cli/configure-crossdc-config.cli</argument>
+                                        <argument>-Djboss.server.config.dir=${app.server.jboss.home}/standalone-crossdc/configuration</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
                         </executions>
                     </plugin>
 

diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerDatabaseServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerDatabaseServlet.java
index d6d038a..9214d46 100644
--- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerDatabaseServlet.java
+++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerDatabaseServlet.java
@@ -46,7 +46,7 @@ public class CustomerDatabaseServlet extends HttpServlet {
     protected void doDelete(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
         req.logout();
         PrintWriter pw = resp.getWriter();
-        pw.println("servlet logout from database ok");
+        pw.println("<div id=\"customer_database_logout\">servlet logout from database ok</div>");
         pw.flush();  
     }
 }

diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerServlet.java
index c6a72e1..f928454 100644
--- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerServlet.java
+++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerServlet.java
@@ -47,8 +47,10 @@ public class CustomerServlet extends HttpServlet {
         KeycloakSecurityContext context = (KeycloakSecurityContext) req.getAttribute(KeycloakSecurityContext.class.getName());
         if (req.getRequestURI().endsWith("logout")) {
             resp.setStatus(200);
-            pw.println("servlet logout ok");
-            
+            pw.println("<html><body>");
+            pw.println("<div id=\"customer_portal_logout\">servlet logout ok</div>");
+            pw.println("</body></html>");
+
             //Clear principal form database-service by calling logout
             StringBuilder result = new StringBuilder();
             String urlBase = ServletTestUtils.getUrlBase(req);

diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ErrorServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ErrorServlet.java
index 9f322eb..f718b5f 100644
--- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ErrorServlet.java
+++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ErrorServlet.java
@@ -29,7 +29,7 @@ import org.keycloak.adapters.spi.AuthenticationError;
  * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
  */
 public class ErrorServlet extends HttpServlet {
-    public static AuthenticationError authError;
+    private AuthenticationError authError;
 
     @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
@@ -44,7 +44,7 @@ public class ErrorServlet extends HttpServlet {
         if (statusCode != null)
             pw.print("<br/>HTTP status code: " + statusCode);
         if (authError != null) 
-            pw.print("<br/>Error info: " + authError.toString());
+            pw.print("<br/>Error info: <span id=\"error\">" + authError.toString() + "</span>");
         pw.print("</body></html>");
         pw.flush();
     }

diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml
index 63c9533..ed6b5bf 100644
--- a/testsuite/integration-arquillian/tests/base/pom.xml
+++ b/testsuite/integration-arquillian/tests/base/pom.xml
@@ -340,6 +340,137 @@
                     <version>${wildfly.core.version}</version>
                 </dependency>
             </dependencies>
+            <!--todo move the build section higher probably-->
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.commonjava.maven.plugins</groupId>
+                        <artifactId>directory-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>keycloak-parent-basedir</id>
+                                <goals>
+                                    <goal>directory-of</goal>
+                                </goals>
+                                <phase>initialize</phase>
+                                <configuration>
+                                    <property>keycloak-parent.basedir</property>
+                                    <project>
+                                        <groupId>org.keycloak</groupId>
+                                        <artifactId>keycloak-parent</artifactId>
+                                    </project>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>example-wars</id>
+                                <phase>generate-test-resources</phase>
+                                <goals>
+                                    <goal>copy</goal>
+                                </goals>
+                                <configuration>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>org.keycloak.testsuite</groupId>
+                                            <artifactId>hello-world-authz-service</artifactId>
+                                            <version>${project.version}</version>
+                                            <type>war</type>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>org.keycloak.testsuite</groupId>
+                                            <artifactId>photoz-html5-client</artifactId>
+                                            <version>${project.version}</version>
+                                            <type>war</type>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>org.keycloak.testsuite</groupId>
+                                            <artifactId>photoz-restful-api</artifactId>
+                                            <version>${project.version}</version>
+                                            <type>war</type>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>org.keycloak.testsuite</groupId>
+                                            <artifactId>servlet-authz-app</artifactId>
+                                            <version>${project.version}</version>
+                                            <type>war</type>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>org.keycloak.testsuite</groupId>
+                                            <artifactId>servlet-policy-enforcer</artifactId>
+                                            <version>${project.version}</version>
+                                            <type>war</type>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>org.keycloak.testsuite</groupId>
+                                            <artifactId>integration-arquillian-test-apps-cors-angular-product</artifactId>
+                                            <version>${project.version}</version>
+                                            <type>war</type>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>org.keycloak.testsuite</groupId>
+                                            <artifactId>integration-arquillian-test-apps-cors-database-service</artifactId>
+                                            <version>${project.version}</version>
+                                            <type>war</type>
+                                        </artifactItem>
+                                    </artifactItems>
+                                    <outputDirectory>${examples.home}</outputDirectory>
+                                    <overWriteIfNewer>true</overWriteIfNewer>
+                                    <!--<skip>${skip.example.tests}</skip>-->
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>test-apps-realms</id>
+                                <phase>generate-test-resources</phase>
+                                <goals>
+                                    <goal>unpack</goal>
+                                </goals>
+                                <configuration>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>org.keycloak.testsuite</groupId>
+                                            <artifactId>integration-arquillian-test-apps-dist</artifactId>
+                                            <version>${project.version}</version>
+                                            <type>zip</type>
+                                            <includes>**/*realm.json,**/*authz-service.json,**/testsaml.json,**/*-keycloak.json</includes>
+                                        </artifactItem>
+                                    </artifactItems>
+                                    <outputDirectory>${examples.home}</outputDirectory>
+                                    <overWriteIfNewer>true</overWriteIfNewer>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>example-realms</id>
+                                <phase>generate-test-resources</phase>
+                                <goals>
+                                    <goal>copy-resources</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${examples.home}/example-realms</outputDirectory>
+                                    <overWriteIfNewer>true</overWriteIfNewer>
+                                    <resources>
+                                        <resource>
+                                            <directory>${examples.basedir}</directory>
+                                            <filtering>true</filtering>
+                                            <includes>
+                                                <include>**/*.json</include>
+                                            </includes>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
         <profile>
             <id>auth-servers-crossdc-undertow</id>

diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java
index ce5ec6d..5fd541e 100644
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java
@@ -48,13 +48,6 @@ public class AppServerTestEnricher {
 
     protected final Logger log = Logger.getLogger(this.getClass());
 
-    public static final String APP_SERVER_PREFIX = "app-server-";
-
-    public static final String APP_SERVER_UNDERTOW = APP_SERVER_PREFIX + "undertow";
-
-    public static final String APP_SERVER_WILDFLY = APP_SERVER_PREFIX + "wildfly";
-    public static final String APP_SERVER_WILDFLY_CLUSTER = APP_SERVER_WILDFLY + "-ha-node-1;"+ APP_SERVER_WILDFLY + "-ha-node-2";
-
     public static final String CURRENT_APP_SERVER = System.getProperty("app.server", "undertow");
 
     @Inject private Instance<ContainerController> containerConrollerInstance;
@@ -157,7 +150,7 @@ public class AppServerTestEnricher {
         try {
             return ManagementClient.online(OnlineOptions
                     .standalone()
-                    .hostAndPort(System.getProperty("app.server.host"), System.getProperty("app.server","").startsWith("eap6") ? 10199 : 10190)
+                    .hostAndPort(System.getProperty("app.server.host", "localhost"), System.getProperty("app.server","").startsWith("eap6") ? 10199 : 10190)
                     .protocol(System.getProperty("app.server","").startsWith("eap6") ? ManagementProtocol.REMOTE : ManagementProtocol.HTTP_REMOTING)
                     .build()
             );

diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/DeploymentTargetModifier.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/DeploymentTargetModifier.java
index de54ce7..6a3a03a 100644
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/DeploymentTargetModifier.java
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/DeploymentTargetModifier.java
@@ -28,7 +28,7 @@ import org.jboss.arquillian.container.test.impl.client.deployment.AnnotationDepl
 import org.jboss.arquillian.test.spi.TestClass;
 import org.jboss.logging.Logger;
 import org.keycloak.common.util.StringPropertyReplacer;
-import org.keycloak.testsuite.arquillian.AppServerTestEnricher;
+import org.keycloak.testsuite.arquillian.containers.ContainerConstants;
 
 import static org.keycloak.testsuite.arquillian.AppServerTestEnricher.getAppServerQualifiers;
 
@@ -96,7 +96,7 @@ public class DeploymentTargetModifier extends AnnotationDeploymentScenarioGenera
                     updateServerQualifier(deployment, testClass, newAuthServerQualifier);
                 } else if (containerQualifier.contains(APP_SERVER_CURRENT)) {
                     String suffix = containerQualifier.split(APP_SERVER_CURRENT)[1];
-                    String newAppServerQualifier = AppServerTestEnricher.APP_SERVER_PREFIX  + AppServerTestEnricher.CURRENT_APP_SERVER + "-" + suffix;
+                    String newAppServerQualifier = ContainerConstants.APP_SERVER_PREFIX  + AppServerTestEnricher.CURRENT_APP_SERVER + "-" + suffix;
                     updateServerQualifier(deployment, testClass, newAppServerQualifier);
                 } else {
                     String newServerQualifier = StringPropertyReplacer.replaceProperties(containerQualifier);

diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AccountUpdateProfilePage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AccountUpdateProfilePage.java
index 2a3f944..bb35777 100755
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AccountUpdateProfilePage.java
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AccountUpdateProfilePage.java
@@ -19,9 +19,11 @@ package org.keycloak.testsuite.pages;
 
 import org.keycloak.models.Constants;
 import org.keycloak.services.resources.RealmsResource;
+import org.keycloak.testsuite.util.DroneUtils;
 import org.openqa.selenium.By;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.WebElement;
+import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.support.FindBy;
 
 import javax.ws.rs.core.UriBuilder;
@@ -137,10 +139,13 @@ public class AccountUpdateProfilePage extends AbstractAccountPage {
         return attrElement.getAttribute("value");
     }
 
+    @Override
     public boolean isCurrent() {
-        return driver.getTitle().contains("Account Management") && driver.getPageSource().contains("Edit Account");
+        WebDriver currentDriver = DroneUtils.getCurrentDriver();
+        return currentDriver.getTitle().contains("Account Management") && currentDriver.getPageSource().contains("Edit Account");
     }
 
+    @Override
     public void open() {
         driver.navigate().to(getPath());
     }

diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AppServerWelcomePage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AppServerWelcomePage.java
index 3da0273..dbb2e5f 100644
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AppServerWelcomePage.java
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AppServerWelcomePage.java
@@ -21,6 +21,8 @@ import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad;
 import org.jboss.arquillian.graphene.page.Page;
 import org.keycloak.testsuite.adapter.page.AppServerContextRoot;
 import org.keycloak.testsuite.auth.page.login.OIDCLogin;
+import org.keycloak.testsuite.util.DroneUtils;
+import org.keycloak.testsuite.util.JavascriptBrowser;
 import org.keycloak.testsuite.util.URLUtils;
 import org.keycloak.testsuite.util.WaitUtils;
 import org.openqa.selenium.WebElement;
@@ -32,6 +34,7 @@ import org.openqa.selenium.support.FindBy;
 public class AppServerWelcomePage extends AppServerContextRoot {
 
     @Page
+    @JavascriptBrowser
     protected OIDCLogin loginPage;
 
     @FindBy(xpath = "//span[text() = 'Access Control']")
@@ -45,7 +48,7 @@ public class AppServerWelcomePage extends AppServerContextRoot {
 
     @Override
     public boolean isCurrent() {
-        return driver.getPageSource().contains("Access Control");
+        return DroneUtils.getCurrentDriver().getPageSource().contains("Access Control");
     }
 
     public void navigateToConsole() {

diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/ContainerAssume.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/ContainerAssume.java
new file mode 100644
index 0000000..f062264
--- /dev/null
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/ContainerAssume.java
@@ -0,0 +1,18 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.keycloak.testsuite.util;
+
+import org.junit.Assume;
+import org.keycloak.testsuite.arquillian.AuthServerTestEnricher;
+
+public class ContainerAssume {
+
+    public static void assumeNotAuthServerUndertow() {
+        Assume.assumeFalse("Doesn't work on auth-server-undertow", 
+                AuthServerTestEnricher.AUTH_SERVER_CONTAINER.equals(AuthServerTestEnricher.AUTH_SERVER_CONTAINER_DEFAULT));
+    }
+
+}

diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractAdapterTest.java
index d337345..63cddce 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractAdapterTest.java
@@ -47,6 +47,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeoutException;
+import org.junit.Assume;
 
 /**
  * <code>@AppServerContainer</code> is needed for stopping recursion in 
@@ -233,6 +234,16 @@ public abstract class AbstractAdapterTest extends AbstractAuthTest {
         }
     }
 
+    protected void assumeNotOnAppServerUndertow() {
+        log.warn("TODO: Not stable on app-server-undertow. "
+                + "It throws: KC-SERVICES0057: Logout for client '${CLIENT_NAME}' failed\n" 
+                + "org.apache.http.NoHttpResponseException: localhost:8280 failed to respond");
+        Assume.assumeFalse("Not stable on app-server-undertow. "
+                + "It throws: KC-SERVICES0057: Logout for client '${CLIENT_NAME}' failed\n" 
+                + "org.apache.http.NoHttpResponseException: localhost:8280 failed to respond",
+                System.getProperty("app.server", "undertow").equals("undertow"));
+    }
+
     public static void addContextXml(Archive archive, String contextPath) {
         try {
             String contextXmlContent = IOUtils.toString(tomcatContext.openStream(), "UTF-8")

diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractServletsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractServletsAdapterTest.java
index 5e14568..294106d 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractServletsAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractServletsAdapterTest.java
@@ -131,6 +131,8 @@ public abstract class AbstractServletsAdapterTest extends AbstractAdapterTest {
 
             driver.navigate().to(timeOffsetUri);
             WaitUtils.waitUntilElement(By.tagName("body")).is().visible();
+            String pageSource = driver.getPageSource();
+            System.out.println(pageSource);
         }
     }
 

diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/AbstractPhotozExampleAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/AbstractPhotozExampleAdapterTest.java
index 011bd61..6e596ed 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/AbstractPhotozExampleAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/AbstractPhotozExampleAdapterTest.java
@@ -46,9 +46,11 @@ import org.keycloak.testsuite.ProfileAssume;
 import org.keycloak.testsuite.adapter.AbstractExampleAdapterTest;
 import org.keycloak.testsuite.adapter.page.PhotozClientAuthzTestApp;
 import org.keycloak.testsuite.auth.page.login.OIDCLogin;
+import org.keycloak.testsuite.util.ContainerAssume;
 import org.keycloak.testsuite.util.DroneUtils;
 import org.keycloak.testsuite.util.JavascriptBrowser;
 import org.keycloak.util.JsonSerialization;
+import org.openqa.selenium.By;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.WebDriver;
 
@@ -182,6 +184,8 @@ public abstract class AbstractPhotozExampleAdapterTest extends AbstractExampleAd
 
     @Test
     public void testOnlyOwnerCanDeleteAlbum() throws Exception {
+        ContainerAssume.assumeNotAuthServerUndertow();
+
         loginToClientPage("alice", "alice");
         clientPage.createAlbum("Alice-Family-Album");
 
@@ -233,6 +237,8 @@ public abstract class AbstractPhotozExampleAdapterTest extends AbstractExampleAd
 
     @Test
     public void testAdminOnlyFromSpecificAddress() throws Exception {
+        ContainerAssume.assumeNotAuthServerUndertow();
+
         loginToClientPage("admin", "admin");
         clientPage.navigateToAdminAlbum(false);
 
@@ -251,6 +257,8 @@ public abstract class AbstractPhotozExampleAdapterTest extends AbstractExampleAd
 
     @Test
     public void testAdminWithoutPermissionsToTypedResource() throws Exception {
+        ContainerAssume.assumeNotAuthServerUndertow();
+
         loginToClientPage("alice", "alice");
         clientPage.createAlbum("Alice Family Album");
         
@@ -300,6 +308,8 @@ public abstract class AbstractPhotozExampleAdapterTest extends AbstractExampleAd
 
     @Test
     public void testAdminWithoutPermissionsToDeleteAlbum() throws Exception {
+        ContainerAssume.assumeNotAuthServerUndertow();
+
         loginToClientPage("alice", "alice");
         clientPage.createAlbum("Alice Family Album");
 
@@ -343,6 +353,8 @@ public abstract class AbstractPhotozExampleAdapterTest extends AbstractExampleAd
 
     @Test
     public void testClientRoleRepresentingUserConsent() throws Exception {
+        ContainerAssume.assumeNotAuthServerUndertow();
+
         loginToClientPage("alice", "alice");
         clientPage.createAlbum("Alice Family Album");
         clientPage.viewAlbum("Alice Family Album", false);
@@ -423,6 +435,8 @@ public abstract class AbstractPhotozExampleAdapterTest extends AbstractExampleAd
 
     @Test
     public void testOverridePermissionFromResourceParent() throws Exception {
+        ContainerAssume.assumeNotAuthServerUndertow();
+
         loginToClientPage("alice", "alice");
         String resourceName = "My Resource Instance";
         clientPage.createAlbum(resourceName);
@@ -483,6 +497,8 @@ public abstract class AbstractPhotozExampleAdapterTest extends AbstractExampleAd
 
     @Test
     public void testInheritPermissionFromResourceParent() throws Exception {
+        ContainerAssume.assumeNotAuthServerUndertow();
+
         loginToClientPage("alice", "alice");
 
         String resourceName = "My Resource Instance";
@@ -567,6 +583,8 @@ public abstract class AbstractPhotozExampleAdapterTest extends AbstractExampleAd
     //KEYCLOAK-3777
     @Test
     public void testEntitlementRequest() throws Exception {
+        ContainerAssume.assumeNotAuthServerUndertow();
+
         clientPage.navigateTo();
         loginToClientPage("admin", "admin");
 
@@ -716,5 +734,6 @@ public abstract class AbstractPhotozExampleAdapterTest extends AbstractExampleAd
         clientPage.navigateTo();
         waitForPageToLoad();
         clientPage.login(username, password, scopes);
+        waitUntilElement(By.linkText("Sign Out")).is().clickable();
     }
-}
\ No newline at end of file
+}

diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/customer-cookie-portal/WEB-INF/web.xml b/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/customer-cookie-portal/WEB-INF/web.xml
index e3aef1d..4b7847e 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/customer-cookie-portal/WEB-INF/web.xml
+++ b/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/customer-cookie-portal/WEB-INF/web.xml
@@ -67,6 +67,13 @@
             <url-pattern>/error.html</url-pattern>
         </web-resource-collection>
     </security-constraint>
+    <security-constraint>
+        <web-resource-collection>
+            <web-resource-name>Unsecured</web-resource-name>
+            <url-pattern>/unsecured/*</url-pattern>
+        </web-resource-collection>
+    </security-constraint>
+
 
     <login-config>
         <auth-method>KEYCLOAK</auth-method>

diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
index 0cbd649..99b6183 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
+++ b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
@@ -233,7 +233,7 @@
                 <property name="jbossHome">${cache.server.home}</property>
                 <property name="serverConfig">clustered-1.xml</property>
                 <property name="jbossArguments">
-                    -Djboss.socket.binding.port-offset=${cache.server.port.offset}
+                    -Djboss.socket.binding.port-offset=${cache.server.1.port.offset}
                     -Djboss.default.multicast.address=234.56.78.99
                     -Djboss.node.name=cache-server-dc-1
                     ${adapter.test.props}

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/cluster/EAPSAMLAdapterClusterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/cluster/EAPSAMLAdapterClusterTest.java
index eb41e03..fdd95df 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/cluster/EAPSAMLAdapterClusterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/cluster/EAPSAMLAdapterClusterTest.java
@@ -19,19 +19,12 @@ package org.keycloak.testsuite.adapter.cluster;
 import org.keycloak.testsuite.adapter.page.EmployeeServletDistributable;
 import org.keycloak.testsuite.arquillian.annotation.*;
 
-import java.io.*;
-import java.util.concurrent.TimeoutException;
-
-import org.keycloak.testsuite.adapter.servlet.cluster.AbstractSAMLAdapterClusterTest;
+import org.keycloak.testsuite.adapter.AbstractSAMLAdapterClusteredTest;
 import org.keycloak.testsuite.adapter.servlet.SendUsernameServlet;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.TargetsContainer;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.wildfly.extras.creaper.core.*;
-import org.wildfly.extras.creaper.core.online.*;
-import org.wildfly.extras.creaper.core.online.operations.*;
-import org.wildfly.extras.creaper.core.online.operations.admin.Administration;
 
 
 /**
@@ -39,7 +32,7 @@ import org.wildfly.extras.creaper.core.online.operations.admin.Administration;
  * @author hmlnarik
  */
 @AppServerContainer("app-server-eap")
-public class EAPSAMLAdapterClusterTest extends AbstractSAMLAdapterClusterTest {
+public class EAPSAMLAdapterClusterTest extends AbstractSAMLAdapterClusteredTest {
 
     @TargetsContainer(value = "app-server-eap-" + NODE_1_NAME)
     @Deployment(name = EmployeeServletDistributable.DEPLOYMENT_NAME, managed = false)
@@ -54,45 +47,9 @@ public class EAPSAMLAdapterClusterTest extends AbstractSAMLAdapterClusterTest {
     }
 
     @Override
-    protected void prepareWorkerNode(int nodeIndex, Integer managementPort) throws IOException, NumberFormatException, TimeoutException, InterruptedException {
-        log.infov("Preparing worker node ({0} @ {1})", nodeIndex, managementPort);
-
-        OnlineManagementClient clientWorkerNodeClient = ManagementClient.online(OnlineOptions
-          .standalone()
-          .hostAndPort("localhost", managementPort)
-          .build());
-        Administration administration = new Administration(clientWorkerNodeClient);
-        Operations op = new Operations(clientWorkerNodeClient);
-
-        Batch b = new Batch();
-        Address tcppingStack = Address
-          .subsystem("jgroups")
-          .and("stack", "tcpping");
-        b.add(tcppingStack);
-        b.add(tcppingStack.and("transport", "TCP"), Values.of("socket-binding", "jgroups-tcp"));
-        b.add(tcppingStack.and("protocol", "TCPPING"));
-        b.add(tcppingStack.and("protocol", "TCPPING").and("property", "initial_hosts"), Values.of("value", "localhost[" + (7600 + PORT_OFFSET_NODE_1) + "],localhost[" + (7600 + PORT_OFFSET_NODE_2) + "]"));
-        b.add(tcppingStack.and("protocol", "TCPPING").and("property", "port_range"), Values.of("value", "0"));
-        b.add(tcppingStack.and("protocol", "MERGE3"));
-        b.add(tcppingStack.and("protocol", "FD_SOCK"), Values.of("socket-binding", "jgroups-tcp-fd"));
-        b.add(tcppingStack.and("protocol", "FD"));
-        b.add(tcppingStack.and("protocol", "VERIFY_SUSPECT"));
-        b.add(tcppingStack.and("protocol", "pbcast.NAKACK2"));
-        b.add(tcppingStack.and("protocol", "UNICAST3"));
-        b.add(tcppingStack.and("protocol", "pbcast.STABLE"));
-        b.add(tcppingStack.and("protocol", "pbcast.GMS"));
-        b.add(tcppingStack.and("protocol", "MFC"));
-        b.add(tcppingStack.and("protocol", "FRAG2"));
-        b.writeAttribute(Address.subsystem("jgroups").and("channel", "ee"), "stack", "tcpping");
-        op.batch(b);
-
-        op.add(Address.extension("org.keycloak.keycloak-saml-adapter-subsystem"), Values.of("module", "org.keycloak.keycloak-saml-adapter-subsystem"));
-        op.add(Address.subsystem("keycloak-saml"));
-
-        //clientWorkerNodeClient.execute("reload");
-        administration.reload();
-
-        log.infov("Worker node ({0}) Prepared", managementPort);
+    protected void prepareServerDirectories() throws Exception {
+        prepareServerDirectory("standalone-cluster", "standalone-" + NODE_1_NAME);
+        prepareServerDirectory("standalone-cluster", "standalone-" + NODE_2_NAME);
     }
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPClientInitiatedAccountLinkTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPClientInitiatedAccountLinkTest.java
index 7cc7f21..7f5b392 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPClientInitiatedAccountLinkTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPClientInitiatedAccountLinkTest.java
@@ -16,7 +16,7 @@
  */
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractClientInitiatedAccountLinkTest;
+import org.keycloak.testsuite.adapter.servlet.ClientInitiatedAccountLinkTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
@@ -24,6 +24,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author <a href="mailto:vramik@redhat.com">Vlastislav Ramik</a>
  */
 @AppServerContainer("app-server-eap")
-public class EAPClientInitiatedAccountLinkTest extends AbstractClientInitiatedAccountLinkTest {
+public class EAPClientInitiatedAccountLinkTest extends ClientInitiatedAccountLinkTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPOfflineServletsAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPOfflineServletsAdapterTest.java
index 48cb3ef..e17065e 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPOfflineServletsAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPOfflineServletsAdapterTest.java
@@ -1,11 +1,11 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractOfflineServletsAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.OfflineServletsAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
  * @author <a href="mailto:bruno@abstractj.org">Bruno Oliveira</a>.
  */
 @AppServerContainer("app-server-eap")
-public class EAPOfflineServletsAdapterTest extends AbstractOfflineServletsAdapterTest {
+public class EAPOfflineServletsAdapterTest extends OfflineServletsAdapterTest {
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPOIDCAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPOIDCAdapterTest.java
index b5f3ee9..33154d7 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPOIDCAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPOIDCAdapterTest.java
@@ -1,6 +1,6 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractJBossOIDCServletsAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.DemoServletsAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
@@ -8,6 +8,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-eap")
-public class EAPOIDCAdapterTest extends AbstractJBossOIDCServletsAdapterTest {
+public class EAPOIDCAdapterTest extends DemoServletsAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPOIDCPublicKeyRotationAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPOIDCPublicKeyRotationAdapterTest.java
index df936d8..408df9a 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPOIDCPublicKeyRotationAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPOIDCPublicKeyRotationAdapterTest.java
@@ -17,12 +17,12 @@
 
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractOIDCPublicKeyRotationAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.OIDCPublicKeyRotationAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
  * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
  */
 @AppServerContainer("app-server-eap")
-public class EAPOIDCPublicKeyRotationAdapterTest extends AbstractOIDCPublicKeyRotationAdapterTest {
+public class EAPOIDCPublicKeyRotationAdapterTest extends OIDCPublicKeyRotationAdapterTest {
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPOIDCSessionAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPOIDCSessionAdapterTest.java
index c84f2cb..dc9d55f 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPOIDCSessionAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPOIDCSessionAdapterTest.java
@@ -1,6 +1,6 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractSessionServletAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.SessionServletAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
@@ -8,6 +8,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-eap")
-public class EAPOIDCSessionAdapterTest extends AbstractSessionServletAdapterTest {
+public class EAPOIDCSessionAdapterTest extends SessionServletAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPSAMLAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPSAMLAdapterTest.java
index 33aaab3..569fc76 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPSAMLAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPSAMLAdapterTest.java
@@ -1,12 +1,12 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractSAMLServletsAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.SAMLServletsAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
  * @author mhajas
  */
 @AppServerContainer("app-server-eap")
-public class EAPSAMLAdapterTest extends AbstractSAMLServletsAdapterTest {
+public class EAPSAMLAdapterTest extends SAMLServletsAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPSAMLFilterAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPSAMLFilterAdapterTest.java
index 28455cd..14d83b1 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPSAMLFilterAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPSAMLFilterAdapterTest.java
@@ -1,11 +1,11 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractSAMLFilterServletAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.SAMLFilterServletAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
  * @author mhajas
  */
 @AppServerContainer("app-server-eap")
-public class EAPSAMLFilterAdapterTest extends AbstractSAMLFilterServletAdapterTest {
+public class EAPSAMLFilterAdapterTest extends SAMLFilterServletAdapterTest {
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/authorization/EAPDefaultAuthzConfigAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/authorization/EAPDefaultAuthzConfigAdapterTest.java
index 6d63c38..ed1dba5 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/authorization/EAPDefaultAuthzConfigAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/authorization/EAPDefaultAuthzConfigAdapterTest.java
@@ -16,7 +16,7 @@
  */
 package org.keycloak.testsuite.adapter.example.authorization;
 
-import org.keycloak.testsuite.adapter.example.authorization.AbstractDefaultAuthzConfigAdapterTest;
+import org.keycloak.testsuite.adapter.example.authorization.DefaultAuthzConfigAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
@@ -25,6 +25,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  */
 @AppServerContainer("app-server-eap")
 //@AdapterLibsLocationProperty("adapter.libs.wildfly")
-public class EAPDefaultAuthzConfigAdapterTest extends AbstractDefaultAuthzConfigAdapterTest {
+public class EAPDefaultAuthzConfigAdapterTest extends DefaultAuthzConfigAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/authorization/EAPPermissiveModeAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/authorization/EAPPermissiveModeAdapterTest.java
index 9eb58fa..e2b86d6 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/authorization/EAPPermissiveModeAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/authorization/EAPPermissiveModeAdapterTest.java
@@ -25,6 +25,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  */
 @RunAsClient
 @AppServerContainer("app-server-eap")
-public class EAPPermissiveModeAdapterTest extends AbstractPermissiveModeAdapterTest {
+public class EAPPermissiveModeAdapterTest extends PermissiveModeAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/cors/EAPCorsExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/cors/EAPCorsExampleAdapterTest.java
index cd36b3f..06898e0 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/cors/EAPCorsExampleAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/cors/EAPCorsExampleAdapterTest.java
@@ -7,6 +7,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-eap")
-public class EAPCorsExampleAdapterTest extends AbstractCorsExampleAdapterTest {
+public class EAPCorsExampleAdapterTest extends CorsExampleAdapterTest {
 
 }
\ No newline at end of file

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/cluster/EAP6SAMLAdapterClusterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/cluster/EAP6SAMLAdapterClusterTest.java
index 37a7aa6..b75c8ca 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/cluster/EAP6SAMLAdapterClusterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/cluster/EAP6SAMLAdapterClusterTest.java
@@ -22,26 +22,28 @@ import org.keycloak.testsuite.arquillian.annotation.*;
 import java.io.*;
 import java.util.concurrent.TimeoutException;
 
-import org.keycloak.testsuite.adapter.servlet.cluster.AbstractSAMLAdapterClusterTest;
+import org.keycloak.testsuite.adapter.AbstractSAMLAdapterClusteredTest;
 import org.keycloak.testsuite.adapter.servlet.SendUsernameServlet;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.TargetsContainer;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Assert;
+import org.junit.Before;
 import org.wildfly.extras.creaper.core.*;
 import org.wildfly.extras.creaper.core.online.*;
 import org.wildfly.extras.creaper.core.online.operations.*;
 import org.wildfly.extras.creaper.core.online.operations.admin.Administration;
 
 import static org.keycloak.testsuite.adapter.AbstractServletsAdapterTest.samlServletDeployment;
+import org.keycloak.testsuite.arquillian.ContainerInfo;
 
 /**
  *
  * @author hmlnarik
  */
 @AppServerContainer("app-server-eap6")
-public class EAP6SAMLAdapterClusterTest extends AbstractSAMLAdapterClusterTest {
+public class EAP6SAMLAdapterClusterTest extends AbstractSAMLAdapterClusteredTest {
 
     @TargetsContainer(value = "app-server-eap6-" + NODE_1_NAME)
     @Deployment(name = EmployeeServletDistributable.DEPLOYMENT_NAME, managed = false)
@@ -55,7 +57,6 @@ public class EAP6SAMLAdapterClusterTest extends AbstractSAMLAdapterClusterTest {
         return employee();
     }
 
-    @Override
     protected void prepareWorkerNode(int nodeIndex, Integer managementPort) throws IOException, NumberFormatException, TimeoutException, InterruptedException {
         log.infov("Preparing worker node ({0} @ {1})", nodeIndex, managementPort);
 
@@ -102,5 +103,27 @@ public class EAP6SAMLAdapterClusterTest extends AbstractSAMLAdapterClusterTest {
 
         log.infov("Worker node ({0}) Prepared", managementPort);
     }
+    
+    @Before
+    @Override
+    public void startServers() throws Exception {
+        prepareServerDirectories();
+        
+        for (ContainerInfo containerInfo : testContext.getAppServerBackendsInfo()) {
+            controller.start(containerInfo.getQualifier());
+        }
+        
+        prepareWorkerNode(0, Integer.valueOf(System.getProperty("app.server.1.management.port")));
+        prepareWorkerNode(1, Integer.valueOf(System.getProperty("app.server.2.management.port")));
+        
+        deployer.deploy(EmployeeServletDistributable.DEPLOYMENT_NAME);
+        deployer.deploy(EmployeeServletDistributable.DEPLOYMENT_NAME + "_2");
+    }
+
+    @Override
+    protected void prepareServerDirectories() throws Exception {
+        prepareServerDirectory("standalone-cluster", "standalone-" + NODE_1_NAME);
+        prepareServerDirectory("standalone-cluster", "standalone-" + NODE_2_NAME);
+    }
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/crossdc/EAP6SAMLAdapterCrossDCTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/crossdc/EAP6SAMLAdapterCrossDCTest.java
index 3a726ce..259f285 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/crossdc/EAP6SAMLAdapterCrossDCTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/crossdc/EAP6SAMLAdapterCrossDCTest.java
@@ -21,7 +21,7 @@ import org.keycloak.testsuite.arquillian.annotation.*;
 
 import java.io.*;
 
-import org.keycloak.testsuite.adapter.servlet.cluster.AbstractSAMLAdapterClusterTest;
+import org.keycloak.testsuite.adapter.AbstractSAMLAdapterClusteredTest;
 import org.keycloak.testsuite.adapter.servlet.SendUsernameServlet;
 
 import org.apache.commons.lang3.math.NumberUtils;
@@ -40,7 +40,9 @@ import org.wildfly.extras.creaper.core.online.operations.*;
 
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
+import org.junit.Before;
 import static org.keycloak.testsuite.adapter.AbstractServletsAdapterTest.samlServletDeployment;
+import org.keycloak.testsuite.arquillian.ContainerInfo;
 
 /**
  *
@@ -48,14 +50,14 @@ import static org.keycloak.testsuite.adapter.AbstractServletsAdapterTest.samlSer
  */
 @Ignore("Infinispan version 5 does not support remote cache events, hence this test is left here for development purposes only")
 @AppServerContainer("app-server-eap6")
-public class EAP6SAMLAdapterCrossDCTest extends AbstractSAMLAdapterClusterTest {
+public class EAP6SAMLAdapterCrossDCTest extends AbstractSAMLAdapterClusteredTest {
 
     @BeforeClass
     public static void checkCrossDcTest() {
         Assume.assumeThat("Seems not to be running cross-DC tests", System.getProperty("cache.server"), not(is("undefined")));
     }
 
-    protected static final int PORT_OFFSET_CACHE_1 = NumberUtils.toInt(System.getProperty("cache.server.port.offset"), 0);
+    protected static final int PORT_OFFSET_CACHE_1 = NumberUtils.toInt(System.getProperty("cache.server.1.port.offset"), 0);
     protected static final int CACHE_HOTROD_PORT_CACHE_1 = 11222 + PORT_OFFSET_CACHE_1;
     protected static final int PORT_OFFSET_CACHE_2 = NumberUtils.toInt(System.getProperty("cache.server.2.port.offset"), 0);
     protected static final int CACHE_HOTROD_PORT_CACHE_2 = 11222 + PORT_OFFSET_CACHE_2;
@@ -96,7 +98,6 @@ public class EAP6SAMLAdapterCrossDCTest extends AbstractSAMLAdapterClusterTest {
         return employee();
     }
 
-    @Override
     protected void prepareWorkerNode(int nodeIndex, Integer managementPort) throws IOException, CliException, NumberFormatException {
         log.infov("Preparing worker node ({0} @ {1})", nodeIndex, managementPort);
 
@@ -166,4 +167,26 @@ public class EAP6SAMLAdapterCrossDCTest extends AbstractSAMLAdapterClusterTest {
         log.infov("Worker node ({0}) Prepared", managementPort);
     }
 
+    @Before
+    @Override
+    public void startServers() throws Exception {
+        prepareServerDirectories();
+        
+        for (ContainerInfo containerInfo : testContext.getAppServerBackendsInfo()) {
+            controller.start(containerInfo.getQualifier());
+        }
+        
+        prepareWorkerNode(0, Integer.valueOf(System.getProperty("app.server.1.management.port")));
+        prepareWorkerNode(1, Integer.valueOf(System.getProperty("app.server.2.management.port")));
+        
+        deployer.deploy(EmployeeServletDistributable.DEPLOYMENT_NAME);
+        deployer.deploy(EmployeeServletDistributable.DEPLOYMENT_NAME + "_2");
+    }
+
+    @Override
+    protected void prepareServerDirectories() throws Exception {
+        prepareServerDirectory("standalone-crossdc", "standalone-" + NODE_1_NAME);
+        prepareServerDirectory("standalone-crossdc", "standalone-" + NODE_2_NAME);
+    }
+
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6ClientInitiatedAccountLinkTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6ClientInitiatedAccountLinkTest.java
index 4cff5d7..ca367cf 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6ClientInitiatedAccountLinkTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6ClientInitiatedAccountLinkTest.java
@@ -16,7 +16,7 @@
  */
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractClientInitiatedAccountLinkTest;
+import org.keycloak.testsuite.adapter.servlet.ClientInitiatedAccountLinkTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
@@ -24,6 +24,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author <a href="mailto:vramik@redhat.com">Vlastislav Ramik</a>
  */
 @AppServerContainer("app-server-eap6")
-public class EAP6ClientInitiatedAccountLinkTest extends AbstractClientInitiatedAccountLinkTest {
+public class EAP6ClientInitiatedAccountLinkTest extends ClientInitiatedAccountLinkTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6OfflineServletsAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6OfflineServletsAdapterTest.java
index 76b180f..8ead300 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6OfflineServletsAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6OfflineServletsAdapterTest.java
@@ -1,11 +1,11 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractOfflineServletsAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.OfflineServletsAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
  * @author <a href="mailto:bruno@abstractj.org">Bruno Oliveira</a>.
  */
 @AppServerContainer("app-server-eap6")
-public class EAP6OfflineServletsAdapterTest extends AbstractOfflineServletsAdapterTest {
+public class EAP6OfflineServletsAdapterTest extends OfflineServletsAdapterTest {
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6OIDCAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6OIDCAdapterTest.java
index 1367d95..f095ce8 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6OIDCAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6OIDCAdapterTest.java
@@ -1,6 +1,6 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractJBossOIDCServletsAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.DemoServletsAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
@@ -8,6 +8,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-eap6")
-public class EAP6OIDCAdapterTest extends AbstractJBossOIDCServletsAdapterTest {
+public class EAP6OIDCAdapterTest extends DemoServletsAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6OIDCPublicKeyRotationAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6OIDCPublicKeyRotationAdapterTest.java
index 607ead8..86bbb54 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6OIDCPublicKeyRotationAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6OIDCPublicKeyRotationAdapterTest.java
@@ -17,12 +17,12 @@
 
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractOIDCPublicKeyRotationAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.OIDCPublicKeyRotationAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
  * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
  */
 @AppServerContainer("app-server-eap6")
-public class EAP6OIDCPublicKeyRotationAdapterTest extends AbstractOIDCPublicKeyRotationAdapterTest {
+public class EAP6OIDCPublicKeyRotationAdapterTest extends OIDCPublicKeyRotationAdapterTest {
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6OIDCSessionAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6OIDCSessionAdapterTest.java
index a3c6bc9..f830c51 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6OIDCSessionAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6OIDCSessionAdapterTest.java
@@ -1,6 +1,6 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractSessionServletAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.SessionServletAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
@@ -8,6 +8,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-eap6")
-public class EAP6OIDCSessionAdapterTest extends AbstractSessionServletAdapterTest {
+public class EAP6OIDCSessionAdapterTest extends SessionServletAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6SAMLAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6SAMLAdapterTest.java
index ee73379..0320f93 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6SAMLAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6SAMLAdapterTest.java
@@ -1,12 +1,12 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractSAMLServletsAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.SAMLServletsAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
  * @author mhajas
  */
 @AppServerContainer("app-server-eap6")
-public class EAP6SAMLAdapterTest extends AbstractSAMLServletsAdapterTest {
+public class EAP6SAMLAdapterTest extends SAMLServletsAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6SAMLFilterAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6SAMLFilterAdapterTest.java
index 71866d6..96fcdf2 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6SAMLFilterAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6SAMLFilterAdapterTest.java
@@ -1,11 +1,11 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractSAMLFilterServletAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.SAMLFilterServletAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
  * @author mhajas
  */
 @AppServerContainer("app-server-eap6")
-public class EAP6SAMLFilterAdapterTest extends AbstractSAMLFilterServletAdapterTest {
+public class EAP6SAMLFilterAdapterTest extends SAMLFilterServletAdapterTest {
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/authorization/EAP6DefaultAuthzConfigAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/authorization/EAP6DefaultAuthzConfigAdapterTest.java
index d7fe93a..1cbc46d 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/authorization/EAP6DefaultAuthzConfigAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/authorization/EAP6DefaultAuthzConfigAdapterTest.java
@@ -23,6 +23,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-eap6")
-public class EAP6DefaultAuthzConfigAdapterTest extends AbstractDefaultAuthzConfigAdapterTest {
+public class EAP6DefaultAuthzConfigAdapterTest extends DefaultAuthzConfigAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/authorization/EAP6PermissiveModeAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/authorization/EAP6PermissiveModeAdapterTest.java
index c300b51..ec58198 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/authorization/EAP6PermissiveModeAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/authorization/EAP6PermissiveModeAdapterTest.java
@@ -25,6 +25,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  */
 @RunAsClient
 @AppServerContainer("app-server-eap6")
-public class EAP6PermissiveModeAdapterTest extends AbstractPermissiveModeAdapterTest {
+public class EAP6PermissiveModeAdapterTest extends PermissiveModeAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/cors/EAP6CorsExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/cors/EAP6CorsExampleAdapterTest.java
index 433966a..a71a252 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/cors/EAP6CorsExampleAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/cors/EAP6CorsExampleAdapterTest.java
@@ -7,5 +7,5 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-eap6")
-public class EAP6CorsExampleAdapterTest extends AbstractCorsExampleAdapterTest {
+public class EAP6CorsExampleAdapterTest extends CorsExampleAdapterTest {
 }
\ No newline at end of file

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/jboss/pom.xml
index e0faa72..c66b83a 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/pom.xml
@@ -84,12 +84,6 @@
             </modules>
         </profile>
         <profile>
-            <id>app-server-wildfly</id>
-            <modules>
-                <module>wildfly</module>
-            </modules>
-        </profile>
-        <profile>
             <id>app-server-wildfly9</id>
             <modules>
                 <module>wildfly9</module>

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/example/authorization/RemoteDefaultAuthzConfigAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/example/authorization/RemoteDefaultAuthzConfigAdapterTest.java
index bbedcde..9cb10d5 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/example/authorization/RemoteDefaultAuthzConfigAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/example/authorization/RemoteDefaultAuthzConfigAdapterTest.java
@@ -23,6 +23,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-remote")
-public class RemoteDefaultAuthzConfigAdapterTest extends AbstractDefaultAuthzConfigAdapterTest {
+public class RemoteDefaultAuthzConfigAdapterTest extends DefaultAuthzConfigAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/example/authorization/RemoteServletAuthzAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/example/authorization/RemoteServletAuthzAdapterTest.java
index f2f37b2..3f790ab 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/example/authorization/RemoteServletAuthzAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/example/authorization/RemoteServletAuthzAdapterTest.java
@@ -25,6 +25,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  */
 @RunAsClient
 @AppServerContainer("app-server-remote")
-public class RemoteServletAuthzAdapterTest extends AbstractServletAuthzAdapterTest {
+public class RemoteServletAuthzAdapterTest extends ServletAuthzAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteOfflineServletsAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteOfflineServletsAdapterTest.java
index d336e1f..34eb330 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteOfflineServletsAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteOfflineServletsAdapterTest.java
@@ -1,11 +1,11 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractOfflineServletsAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.OfflineServletsAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
  * @author <a href="mailto:bruno@abstractj.org">Bruno Oliveira</a>.
  */
 @AppServerContainer("app-server-remote")
-public class RemoteOfflineServletsAdapterTest extends AbstractOfflineServletsAdapterTest {
+public class RemoteOfflineServletsAdapterTest extends OfflineServletsAdapterTest {
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteOIDCAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteOIDCAdapterTest.java
index ddce0c0..5a78bbc 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteOIDCAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteOIDCAdapterTest.java
@@ -1,6 +1,6 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractJBossOIDCServletsAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.DemoServletsAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
@@ -8,6 +8,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-remote")
-public class RemoteOIDCAdapterTest extends AbstractJBossOIDCServletsAdapterTest {
+public class RemoteOIDCAdapterTest extends DemoServletsAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteOIDCSessionAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteOIDCSessionAdapterTest.java
index 26d3414..7723d30 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteOIDCSessionAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteOIDCSessionAdapterTest.java
@@ -1,6 +1,6 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractSessionServletAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.SessionServletAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
@@ -8,6 +8,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-remote")
-public class RemoteOIDCSessionAdapterTest extends AbstractSessionServletAdapterTest {
+public class RemoteOIDCSessionAdapterTest extends SessionServletAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteSAMLAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteSAMLAdapterTest.java
index 4b52ad2..438ddb1 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteSAMLAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteSAMLAdapterTest.java
@@ -1,12 +1,12 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractSAMLServletsAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.SAMLServletsAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
  * @author mhajas
  */
 @AppServerContainer("app-server-remote")
-public class RemoteSAMLAdapterTest extends AbstractSAMLServletsAdapterTest {
+public class RemoteSAMLAdapterTest extends SAMLServletsAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteSAMLFilterAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteSAMLFilterAdapterTest.java
index e8b14a0..69f4f44 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteSAMLFilterAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteSAMLFilterAdapterTest.java
@@ -1,11 +1,11 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractSAMLFilterServletAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.SAMLFilterServletAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
  * @author mhajas
  */
 @AppServerContainer("app-server-remote")
-public class RemoteSAMLFilterAdapterTest extends AbstractSAMLFilterServletAdapterTest {
+public class RemoteSAMLFilterAdapterTest extends SAMLFilterServletAdapterTest {
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/cluster/Wildfly10SAMLAdapterClusterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/cluster/Wildfly10SAMLAdapterClusterTest.java
index d80fda5..5b91a17 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/cluster/Wildfly10SAMLAdapterClusterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/cluster/Wildfly10SAMLAdapterClusterTest.java
@@ -18,18 +18,11 @@ package org.keycloak.testsuite.adapter.cluster;
 
 import org.keycloak.testsuite.adapter.page.EmployeeServletDistributable;
 import org.keycloak.testsuite.arquillian.annotation.*;
-
-import java.io.*;
-
-import org.keycloak.testsuite.adapter.servlet.cluster.AbstractSAMLAdapterClusterTest;
+import org.keycloak.testsuite.adapter.AbstractSAMLAdapterClusteredTest;
 import org.keycloak.testsuite.adapter.servlet.SendUsernameServlet;
-
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.TargetsContainer;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.wildfly.extras.creaper.core.*;
-import org.wildfly.extras.creaper.core.online.*;
-import org.wildfly.extras.creaper.core.online.operations.*;
 
 import static org.keycloak.testsuite.adapter.AbstractServletsAdapterTest.samlServletDeployment;
 
@@ -38,7 +31,7 @@ import static org.keycloak.testsuite.adapter.AbstractServletsAdapterTest.samlSer
  * @author hmlnarik
  */
 @AppServerContainer("app-server-wildfly10")
-public class Wildfly10SAMLAdapterClusterTest extends AbstractSAMLAdapterClusterTest {
+public class Wildfly10SAMLAdapterClusterTest extends AbstractSAMLAdapterClusteredTest {
 
     @TargetsContainer(value = "app-server-wildfly10-" + NODE_1_NAME)
     @Deployment(name = EmployeeServletDistributable.DEPLOYMENT_NAME, managed = false)
@@ -53,43 +46,9 @@ public class Wildfly10SAMLAdapterClusterTest extends AbstractSAMLAdapterClusterT
     }
 
     @Override
-    protected void prepareWorkerNode(int nodeIndex, Integer managementPort) throws IOException, CliException, NumberFormatException {
-        log.infov("Preparing worker node ({0} @ {1})", nodeIndex, managementPort);
-
-        OnlineManagementClient clientWorkerNodeClient = ManagementClient.online(OnlineOptions
-          .standalone()
-          .hostAndPort("localhost", managementPort)
-          .build());
-        Operations op = new Operations(clientWorkerNodeClient);
-
-        Batch b = new Batch();
-        Address tcppingStack = Address
-          .subsystem("jgroups")
-          .and("stack", "tcpping");
-        b.add(tcppingStack);
-        b.add(tcppingStack.and("transport", "TCP"), Values.of("socket-binding", "jgroups-tcp"));
-        b.add(tcppingStack.and("protocol", "TCPPING"));
-        b.add(tcppingStack.and("protocol", "TCPPING").and("property", "initial_hosts"), Values.of("value", "localhost[" + (7600 + PORT_OFFSET_NODE_1) + "],localhost[" + (7600 + PORT_OFFSET_NODE_2) + "]"));
-        b.add(tcppingStack.and("protocol", "TCPPING").and("property", "port_range"), Values.of("value", "0"));
-        b.add(tcppingStack.and("protocol", "MERGE3"));
-        b.add(tcppingStack.and("protocol", "FD_SOCK"), Values.of("socket-binding", "jgroups-tcp-fd"));
-        b.add(tcppingStack.and("protocol", "FD"));
-        b.add(tcppingStack.and("protocol", "VERIFY_SUSPECT"));
-        b.add(tcppingStack.and("protocol", "pbcast.NAKACK2"));
-        b.add(tcppingStack.and("protocol", "UNICAST3"));
-        b.add(tcppingStack.and("protocol", "pbcast.STABLE"));
-        b.add(tcppingStack.and("protocol", "pbcast.GMS"));
-        b.add(tcppingStack.and("protocol", "MFC"));
-        b.add(tcppingStack.and("protocol", "FRAG2"));
-        b.writeAttribute(Address.subsystem("jgroups").and("channel", "ee"), "stack", "tcpping");
-        op.batch(b);
-
-        op.add(Address.extension("org.keycloak.keycloak-saml-adapter-subsystem"), Values.of("module", "org.keycloak.keycloak-saml-adapter-subsystem"));
-        op.add(Address.subsystem("keycloak-saml"));
-
-        clientWorkerNodeClient.execute("reload");
-
-        log.infov("Worker node ({0}) Prepared", managementPort);
+    protected void prepareServerDirectories() throws Exception {
+        prepareServerDirectory("standalone-cluster", "standalone-" + NODE_1_NAME);
+        prepareServerDirectory("standalone-cluster", "standalone-" + NODE_2_NAME);
     }
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/crossdc/Wildfly10SAMLAdapterCrossDCTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/crossdc/Wildfly10SAMLAdapterCrossDCTest.java
index 9c7d935..5ff0779 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/crossdc/Wildfly10SAMLAdapterCrossDCTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/crossdc/Wildfly10SAMLAdapterCrossDCTest.java
@@ -19,21 +19,15 @@ package org.keycloak.testsuite.adapter.crossdc;
 import org.keycloak.testsuite.adapter.page.EmployeeServletDistributable;
 import org.keycloak.testsuite.arquillian.annotation.*;
 
-import java.io.*;
-
-import org.keycloak.testsuite.adapter.servlet.cluster.AbstractSAMLAdapterClusterTest;
+import org.keycloak.testsuite.adapter.AbstractSAMLAdapterClusteredTest;
 import org.keycloak.testsuite.adapter.servlet.SendUsernameServlet;
 
-import org.apache.commons.lang3.math.NumberUtils;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.TargetsContainer;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Assume;
 import org.junit.BeforeClass;
-import org.wildfly.extras.creaper.core.*;
-import org.wildfly.extras.creaper.core.online.*;
-import org.wildfly.extras.creaper.core.online.operations.*;
 
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
@@ -44,30 +38,14 @@ import static org.keycloak.testsuite.adapter.AbstractServletsAdapterTest.samlSer
  * @author hmlnarik
  */
 @AppServerContainer("app-server-wildfly10")
-public class Wildfly10SAMLAdapterCrossDCTest extends AbstractSAMLAdapterClusterTest {
+public class Wildfly10SAMLAdapterCrossDCTest extends AbstractSAMLAdapterClusteredTest {
 
     @BeforeClass
     public static void checkCrossDcTest() {
         Assume.assumeThat("Seems not to be running cross-DC tests", System.getProperty("cache.server"), not(is("undefined")));
     }
 
-    protected static final int PORT_OFFSET_CACHE_1 = NumberUtils.toInt(System.getProperty("cache.server.port.offset"), 0);
-    protected static final int CACHE_HOTROD_PORT_CACHE_1 = 11222 + PORT_OFFSET_CACHE_1;
-    protected static final int PORT_OFFSET_CACHE_2 = NumberUtils.toInt(System.getProperty("cache.server.2.port.offset"), 0);
-    protected static final int CACHE_HOTROD_PORT_CACHE_2 = 11222 + PORT_OFFSET_CACHE_2;
-
-    private final int[] CACHE_HOTROD_PORTS = new int[] { CACHE_HOTROD_PORT_CACHE_1, CACHE_HOTROD_PORT_CACHE_2 };
-    private final int[] TCPPING_PORTS = new int[] { 7600 + PORT_OFFSET_NODE_1, 7600 + PORT_OFFSET_NODE_2 };
-
     private static final String SESSION_CACHE_NAME = EmployeeServletDistributable.DEPLOYMENT_NAME + "-cache";
-    private static final String SSO_CACHE_NAME = SESSION_CACHE_NAME + ".ssoCache";
-
-    private static final Address SESSION_CACHE_ADDR = Address.subsystem("infinispan")
-      .and("cache-container", "web")
-      .and("replicated-cache", SESSION_CACHE_NAME);
-    private static final Address SSO_CACHE_ADDR = Address.subsystem("infinispan")
-      .and("cache-container", "web")
-      .and("replicated-cache", SSO_CACHE_NAME);
 
     private static final String JBOSS_WEB_XML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
       + "<jboss-web>\n"
@@ -93,70 +71,9 @@ public class Wildfly10SAMLAdapterCrossDCTest extends AbstractSAMLAdapterClusterT
     }
 
     @Override
-    protected void prepareWorkerNode(int nodeIndex, Integer managementPort) throws IOException, CliException, NumberFormatException {
-        log.infov("Preparing worker node ({0} @ {1})", nodeIndex, managementPort);
-
-        OnlineManagementClient clientWorkerNodeClient = ManagementClient.online(OnlineOptions
-          .standalone()
-          .hostAndPort("localhost", managementPort)
-          .build());
-        Operations op = new Operations(clientWorkerNodeClient);
-
-        Batch b = new Batch();
-        Address tcppingStack = Address
-          .subsystem("jgroups")
-          .and("stack", "tcpping");
-        b.add(tcppingStack);
-        b.add(tcppingStack.and("transport", "TCP"), Values.of("socket-binding", "jgroups-tcp"));
-        b.add(tcppingStack.and("protocol", "TCPPING"));
-        b.add(tcppingStack.and("protocol", "TCPPING").and("property", "initial_hosts"), Values.of("value", "localhost[" + TCPPING_PORTS[nodeIndex] + "]"));
-        b.add(tcppingStack.and("protocol", "TCPPING").and("property", "port_range"), Values.of("value", "0"));
-        b.add(tcppingStack.and("protocol", "MERGE3"));
-        b.add(tcppingStack.and("protocol", "FD_SOCK"), Values.of("socket-binding", "jgroups-tcp-fd"));
-        b.add(tcppingStack.and("protocol", "FD"));
-        b.add(tcppingStack.and("protocol", "VERIFY_SUSPECT"));
-        b.add(tcppingStack.and("protocol", "pbcast.NAKACK2"));
-        b.add(tcppingStack.and("protocol", "UNICAST3"));
-        b.add(tcppingStack.and("protocol", "pbcast.STABLE"));
-        b.add(tcppingStack.and("protocol", "pbcast.GMS"));
-        b.add(tcppingStack.and("protocol", "MFC"));
-        b.add(tcppingStack.and("protocol", "FRAG2"));
-        b.writeAttribute(Address.subsystem("jgroups").and("channel", "ee"), "stack", "tcpping");
-        op.batch(b);
-
-
-        op.add(Address.of("socket-binding-group", "standard-sockets").and("remote-destination-outbound-socket-binding", "cache-server"),
-          Values.of("host", "localhost")
-            .and("port", CACHE_HOTROD_PORTS[nodeIndex]));
-
-        op.add(SESSION_CACHE_ADDR, Values.of("statistics-enabled", "true").and("mode", "SYNC"));
-        op.writeAttribute(SESSION_CACHE_ADDR.and("component", "locking"), "isolation", "REPEATABLE_READ");
-        op.writeAttribute(SESSION_CACHE_ADDR.and("component", "transaction"), "mode", "BATCH");
-        op.add(SESSION_CACHE_ADDR.and("store", "remote"),
-          Values.ofList("remote-servers", "cache-server")
-            .and("cache", SESSION_CACHE_NAME)
-            .and("passivation", false)
-            .and("purge", false)
-            .and("preload", false)
-            .and("shared", true)
-        );
-
-        op.add(SSO_CACHE_ADDR, Values.of("statistics-enabled", "true").and("mode", "SYNC"));
-        op.add(SSO_CACHE_ADDR.and("store", "remote"),
-          Values.ofList("remote-servers", "cache-server")
-            .and("cache", SSO_CACHE_NAME)
-            .and("passivation", false)
-            .and("purge", false)
-            .and("preload", false)
-            .and("shared", true)
-        );
-
-        op.add(Address.extension("org.keycloak.keycloak-saml-adapter-subsystem"), Values.of("module", "org.keycloak.keycloak-saml-adapter-subsystem"));
-        op.add(Address.subsystem("keycloak-saml"));
-
-        clientWorkerNodeClient.execute("reload");
-
-        log.infov("Worker node ({0}) Prepared", managementPort);
+    protected void prepareServerDirectories() throws Exception {
+        prepareServerDirectory("standalone-crossdc", "standalone-" + NODE_1_NAME);
+        prepareServerDirectory("standalone-crossdc", "standalone-" + NODE_2_NAME);
     }
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10DefaultAuthzConfigAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10DefaultAuthzConfigAdapterTest.java
index a0c23c5..200829a 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10DefaultAuthzConfigAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10DefaultAuthzConfigAdapterTest.java
@@ -16,7 +16,7 @@
  */
 package org.keycloak.testsuite.adapter.example.authorization;
 
-import org.keycloak.testsuite.adapter.example.authorization.AbstractDefaultAuthzConfigAdapterTest;
+import org.keycloak.testsuite.adapter.example.authorization.DefaultAuthzConfigAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
@@ -25,6 +25,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  */
 @AppServerContainer("app-server-wildfly10")
 //@AdapterLibsLocationProperty("adapter.libs.wildfly")
-public class Wildfly10DefaultAuthzConfigAdapterTest extends AbstractDefaultAuthzConfigAdapterTest {
+public class Wildfly10DefaultAuthzConfigAdapterTest extends DefaultAuthzConfigAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10PermissiveModeAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10PermissiveModeAdapterTest.java
index 3dc091c..99a6f18 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10PermissiveModeAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10PermissiveModeAdapterTest.java
@@ -26,6 +26,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 @RunAsClient
 @AppServerContainer("app-server-wildfly10")
 //@AdapterLibsLocationProperty("adapter.libs.wildfly")
-public class Wildfly10PermissiveModeAdapterTest extends AbstractPermissiveModeAdapterTest {
+public class Wildfly10PermissiveModeAdapterTest extends PermissiveModeAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10ServletPolicyEnforcerAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10ServletPolicyEnforcerAdapterTest.java
index 8345479..b520a2f 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10ServletPolicyEnforcerAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10ServletPolicyEnforcerAdapterTest.java
@@ -25,6 +25,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 @RunAsClient
 @AppServerContainer("app-server-wildfly10")
 //@AdapterLibsLocationProperty("adapter.libs.wildfly")
-public class Wildfly10ServletPolicyEnforcerAdapterTest extends AbstractServletPolicyEnforcerTest {
+public class Wildfly10ServletPolicyEnforcerAdapterTest extends ServletPolicyEnforcerTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/cors/Wildfly10CorsExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/cors/Wildfly10CorsExampleAdapterTest.java
index 9191b78..4910d6e 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/cors/Wildfly10CorsExampleAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/cors/Wildfly10CorsExampleAdapterTest.java
@@ -7,6 +7,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-wildfly10")
-public class Wildfly10CorsExampleAdapterTest extends AbstractCorsExampleAdapterTest {
+public class Wildfly10CorsExampleAdapterTest extends CorsExampleAdapterTest {
 
 }
\ No newline at end of file

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10ClientInitiatedAccountLinkTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10ClientInitiatedAccountLinkTest.java
index b35c561..934b883 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10ClientInitiatedAccountLinkTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10ClientInitiatedAccountLinkTest.java
@@ -16,7 +16,7 @@
  */
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractClientInitiatedAccountLinkTest;
+import org.keycloak.testsuite.adapter.servlet.ClientInitiatedAccountLinkTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
@@ -24,6 +24,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author <a href="mailto:vramik@redhat.com">Vlastislav Ramik</a>
  */
 @AppServerContainer("app-server-wildfly10")
-public class Wildfly10ClientInitiatedAccountLinkTest extends AbstractClientInitiatedAccountLinkTest {
+public class Wildfly10ClientInitiatedAccountLinkTest extends ClientInitiatedAccountLinkTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OfflineServletsAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OfflineServletsAdapterTest.java
index 137bc71..980fc47 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OfflineServletsAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OfflineServletsAdapterTest.java
@@ -1,11 +1,11 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractOfflineServletsAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.OfflineServletsAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
  * @author <a href="mailto:bruno@abstractj.org">Bruno Oliveira</a>.
  */
 @AppServerContainer("app-server-wildfly10")
-public class Wildfly10OfflineServletsAdapterTest extends AbstractOfflineServletsAdapterTest {
+public class Wildfly10OfflineServletsAdapterTest extends OfflineServletsAdapterTest {
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCAdapterTest.java
index 72a986f..3372496 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCAdapterTest.java
@@ -1,6 +1,6 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractJBossOIDCServletsAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.DemoServletsAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
@@ -8,6 +8,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-wildfly10")
-public class Wildfly10OIDCAdapterTest extends AbstractJBossOIDCServletsAdapterTest {
+public class Wildfly10OIDCAdapterTest extends DemoServletsAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCFilterAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCFilterAdapterTest.java
index 7707f4b..f73a7ee 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCFilterAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCFilterAdapterTest.java
@@ -1,6 +1,6 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractDemoFilterServletAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.DemoFilterServletAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
@@ -8,5 +8,5 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  */
 
 @AppServerContainer("app-server-wildfly10")
-public class Wildfly10OIDCFilterAdapterTest extends AbstractDemoFilterServletAdapterTest{
+public class Wildfly10OIDCFilterAdapterTest extends DemoFilterServletAdapterTest{
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCPublicKeyRotationAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCPublicKeyRotationAdapterTest.java
index b136e86..f1230ec 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCPublicKeyRotationAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCPublicKeyRotationAdapterTest.java
@@ -17,12 +17,12 @@
 
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractOIDCPublicKeyRotationAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.OIDCPublicKeyRotationAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
  * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
  */
 @AppServerContainer("app-server-wildfly10")
-public class Wildfly10OIDCPublicKeyRotationAdapterTest extends AbstractOIDCPublicKeyRotationAdapterTest {
+public class Wildfly10OIDCPublicKeyRotationAdapterTest extends OIDCPublicKeyRotationAdapterTest {
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCSessionAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCSessionAdapterTest.java
index eac4d19..69170f1 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCSessionAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCSessionAdapterTest.java
@@ -1,6 +1,6 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractSessionServletAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.SessionServletAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
@@ -8,6 +8,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-wildfly10")
-public class Wildfly10OIDCSessionAdapterTest extends AbstractSessionServletAdapterTest {
+public class Wildfly10OIDCSessionAdapterTest extends SessionServletAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10SAMLAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10SAMLAdapterTest.java
index 5610d8c..a867a98 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10SAMLAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10SAMLAdapterTest.java
@@ -1,12 +1,12 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractSAMLServletsAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.SAMLServletsAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
  * @author mhajas
  */
 @AppServerContainer("app-server-wildfly10")
-public class Wildfly10SAMLAdapterTest extends AbstractSAMLServletsAdapterTest {
+public class Wildfly10SAMLAdapterTest extends SAMLServletsAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10SAMLFilterAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10SAMLFilterAdapterTest.java
index e2b67b8..a673991 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10SAMLFilterAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10SAMLFilterAdapterTest.java
@@ -1,11 +1,11 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractSAMLFilterServletAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.SAMLFilterServletAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
  * @author mhajas
  */
 @AppServerContainer("app-server-wildfly10")
-public class Wildfly10SAMLFilterAdapterTest extends AbstractSAMLFilterServletAdapterTest {
+public class Wildfly10SAMLFilterAdapterTest extends SAMLFilterServletAdapterTest {
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OfflineServletsAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OfflineServletsAdapterTest.java
index 83ae9cf..5e28b82 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OfflineServletsAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OfflineServletsAdapterTest.java
@@ -1,11 +1,11 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractOfflineServletsAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.OfflineServletsAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
  * @author <a href="mailto:bruno@abstractj.org">Bruno Oliveira</a>.
  */
 @AppServerContainer("app-server-wildfly9")
-public class Wildfly9OfflineServletsAdapterTest extends AbstractOfflineServletsAdapterTest {
+public class Wildfly9OfflineServletsAdapterTest extends OfflineServletsAdapterTest {
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCAdapterTest.java
index 0ffc804..3626e1d 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCAdapterTest.java
@@ -1,6 +1,6 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractJBossOIDCServletsAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.DemoServletsAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
@@ -8,6 +8,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-wildfly9")
-public class Wildfly9OIDCAdapterTest extends AbstractJBossOIDCServletsAdapterTest {
+public class Wildfly9OIDCAdapterTest extends DemoServletsAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCPublicKeyRotationAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCPublicKeyRotationAdapterTest.java
index a1b8118..3ea2395 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCPublicKeyRotationAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCPublicKeyRotationAdapterTest.java
@@ -17,12 +17,12 @@
 
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractOIDCPublicKeyRotationAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.OIDCPublicKeyRotationAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
  * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
  */
 @AppServerContainer("app-server-wildfly9")
-public class Wildfly9OIDCPublicKeyRotationAdapterTest extends AbstractOIDCPublicKeyRotationAdapterTest {
+public class Wildfly9OIDCPublicKeyRotationAdapterTest extends OIDCPublicKeyRotationAdapterTest {
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCSessionAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCSessionAdapterTest.java
index 61436ea..32c8e6b 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCSessionAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCSessionAdapterTest.java
@@ -1,6 +1,6 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractSessionServletAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.SessionServletAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
@@ -8,6 +8,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-wildfly9")
-public class Wildfly9OIDCSessionAdapterTest extends AbstractSessionServletAdapterTest {
+public class Wildfly9OIDCSessionAdapterTest extends SessionServletAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9SAMLAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9SAMLAdapterTest.java
index a042c78..1792eea 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9SAMLAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9SAMLAdapterTest.java
@@ -1,12 +1,12 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractSAMLServletsAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.SAMLServletsAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
  * @author mhajas
  */
 @AppServerContainer("app-server-wildfly9")
-public class Wildfly9SAMLAdapterTest extends AbstractSAMLServletsAdapterTest {
+public class Wildfly9SAMLAdapterTest extends SAMLServletsAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9SAMLFilterAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9SAMLFilterAdapterTest.java
index 97cb6c6..2cb0c34 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9SAMLFilterAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9SAMLFilterAdapterTest.java
@@ -1,11 +1,11 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractSAMLFilterServletAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.SAMLFilterServletAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
  * @author mhajas
  */
 @AppServerContainer("app-server-wildfly9")
-public class Wildfly9SAMLFilterAdapterTest extends AbstractSAMLFilterServletAdapterTest {
+public class Wildfly9SAMLFilterAdapterTest extends SAMLFilterServletAdapterTest {
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/pom.xml
index bbc6c35..0f5c2ce 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/adapters/pom.xml
@@ -92,7 +92,7 @@
 
         <app.server.home>${containers.home}/app-server-${app.server}</app.server.home>
         <adapter.config.bundled>true</adapter.config.bundled>
-        <examples.basedir>${main.basedir}/examples</examples.basedir>
+        <examples.basedir>${keycloak-parent.basedir}/examples</examples.basedir>
         <exclude.test>-</exclude.test>
         <exclude.cors.tests>**/cors/*Test.java</exclude.cors.tests>
     </properties>
@@ -119,16 +119,15 @@
                     <plugin>
                         <groupId>org.commonjava.maven.plugins</groupId>
                         <artifactId>directory-maven-plugin</artifactId>
-                        <version>0.1</version>
                         <executions>
                             <execution>
-                                <id>directories</id>
+                                <id>keycloak-parent-basedir</id>
                                 <goals>
                                     <goal>directory-of</goal>
                                 </goals>
                                 <phase>initialize</phase>
                                 <configuration>
-                                    <property>main.basedir</property>
+                                    <property>keycloak-parent.basedir</property>
                                     <project>
                                         <groupId>org.keycloak</groupId>
                                         <artifactId>keycloak-parent</artifactId>
@@ -231,7 +230,7 @@
                             </systemPropertyVariables>
                         </configuration>
                     </plugin>
-                    <plugin>
+<!--                    <plugin>
                         <groupId>org.jboss.shrinkwrap.resolver</groupId>
                         <artifactId>shrinkwrap-resolver-maven-plugin</artifactId>
                         <executions>
@@ -241,7 +240,7 @@
                                 </goals>
                             </execution>
                         </executions>
-                    </plugin>
+                    </plugin>-->
                 </plugins>
             </build>
         </profile>

diff --git a/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat7/src/test/java/org/keycloak/testsuite/adapter/Tomcat7OIDCAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat7/src/test/java/org/keycloak/testsuite/adapter/Tomcat7OIDCAdapterTest.java
index 0b1fd6e..c94e9d7 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat7/src/test/java/org/keycloak/testsuite/adapter/Tomcat7OIDCAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat7/src/test/java/org/keycloak/testsuite/adapter/Tomcat7OIDCAdapterTest.java
@@ -1,6 +1,6 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractDemoServletsAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.DemoServletsAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
@@ -8,6 +8,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-tomcat7")
-public class Tomcat7OIDCAdapterTest extends AbstractDemoServletsAdapterTest {
+public class Tomcat7OIDCAdapterTest extends DemoServletsAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat7/src/test/java/org/keycloak/testsuite/adapter/Tomcat7OIDCSessionAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat7/src/test/java/org/keycloak/testsuite/adapter/Tomcat7OIDCSessionAdapterTest.java
index 0e15d9c..88f3e7d 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat7/src/test/java/org/keycloak/testsuite/adapter/Tomcat7OIDCSessionAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat7/src/test/java/org/keycloak/testsuite/adapter/Tomcat7OIDCSessionAdapterTest.java
@@ -1,6 +1,6 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractSessionServletAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.SessionServletAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
@@ -8,6 +8,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-tomcat7")
-public class Tomcat7OIDCSessionAdapterTest extends AbstractSessionServletAdapterTest {
+public class Tomcat7OIDCSessionAdapterTest extends SessionServletAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat8/src/test/java/org/keycloak/testsuite/adapter/example/Tomcat8DefaultAuthzConfigAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat8/src/test/java/org/keycloak/testsuite/adapter/example/Tomcat8DefaultAuthzConfigAdapterTest.java
index a7f900b..4a25510 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat8/src/test/java/org/keycloak/testsuite/adapter/example/Tomcat8DefaultAuthzConfigAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat8/src/test/java/org/keycloak/testsuite/adapter/example/Tomcat8DefaultAuthzConfigAdapterTest.java
@@ -16,7 +16,7 @@
  */
 package org.keycloak.testsuite.adapter.example;
 
-import org.keycloak.testsuite.adapter.example.authorization.AbstractDefaultAuthzConfigAdapterTest;
+import org.keycloak.testsuite.adapter.example.authorization.DefaultAuthzConfigAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
@@ -25,6 +25,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  */
 @AppServerContainer("app-server-tomcat8")
 //@AdapterLibsLocationProperty("adapter.libs.wildfly")
-public class Tomcat8DefaultAuthzConfigAdapterTest extends AbstractDefaultAuthzConfigAdapterTest {
+public class Tomcat8DefaultAuthzConfigAdapterTest extends DefaultAuthzConfigAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat8/src/test/java/org/keycloak/testsuite/adapter/Tomcat8OIDCAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat8/src/test/java/org/keycloak/testsuite/adapter/Tomcat8OIDCAdapterTest.java
index ce6255f..f7290fb 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat8/src/test/java/org/keycloak/testsuite/adapter/Tomcat8OIDCAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat8/src/test/java/org/keycloak/testsuite/adapter/Tomcat8OIDCAdapterTest.java
@@ -1,6 +1,6 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractDemoServletsAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.DemoServletsAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
@@ -8,6 +8,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-tomcat8")
-public class Tomcat8OIDCAdapterTest extends AbstractDemoServletsAdapterTest {
+public class Tomcat8OIDCAdapterTest extends DemoServletsAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat8/src/test/java/org/keycloak/testsuite/adapter/Tomcat8OIDCSessionAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat8/src/test/java/org/keycloak/testsuite/adapter/Tomcat8OIDCSessionAdapterTest.java
index 36d8385..2bf8a17 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat8/src/test/java/org/keycloak/testsuite/adapter/Tomcat8OIDCSessionAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat8/src/test/java/org/keycloak/testsuite/adapter/Tomcat8OIDCSessionAdapterTest.java
@@ -1,6 +1,6 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractSessionServletAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.SessionServletAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
@@ -8,6 +8,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-tomcat8")
-public class Tomcat8OIDCSessionAdapterTest extends AbstractSessionServletAdapterTest {
+public class Tomcat8OIDCSessionAdapterTest extends SessionServletAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat9/src/test/java/org/keycloak/testsuite/adapter/Tomcat9OIDCAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat9/src/test/java/org/keycloak/testsuite/adapter/Tomcat9OIDCAdapterTest.java
index e52fb4d..df150d8 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat9/src/test/java/org/keycloak/testsuite/adapter/Tomcat9OIDCAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat9/src/test/java/org/keycloak/testsuite/adapter/Tomcat9OIDCAdapterTest.java
@@ -1,6 +1,6 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractDemoServletsAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.DemoServletsAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
@@ -8,6 +8,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-tomcat9")
-public class Tomcat9OIDCAdapterTest extends AbstractDemoServletsAdapterTest {
+public class Tomcat9OIDCAdapterTest extends DemoServletsAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat9/src/test/java/org/keycloak/testsuite/adapter/Tomcat9OIDCSessionAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat9/src/test/java/org/keycloak/testsuite/adapter/Tomcat9OIDCSessionAdapterTest.java
index 6e880d8..eb5fb48 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat9/src/test/java/org/keycloak/testsuite/adapter/Tomcat9OIDCSessionAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/tomcat/tomcat9/src/test/java/org/keycloak/testsuite/adapter/Tomcat9OIDCSessionAdapterTest.java
@@ -1,6 +1,6 @@
 package org.keycloak.testsuite.adapter;
 
-import org.keycloak.testsuite.adapter.servlet.AbstractSessionServletAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.SessionServletAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 /**
@@ -8,6 +8,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-tomcat9")
-public class Tomcat9OIDCSessionAdapterTest extends AbstractSessionServletAdapterTest {
+public class Tomcat9OIDCSessionAdapterTest extends SessionServletAdapterTest {
 
 }

diff --git a/testsuite/integration-arquillian/tests/other/adapters/was/was8/src/test/java/org/keycloak/testsuite/adapter/WASSAMLFilterAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/was/was8/src/test/java/org/keycloak/testsuite/adapter/WASSAMLFilterAdapterTest.java
index e2df24e..866dc55 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/was/was8/src/test/java/org/keycloak/testsuite/adapter/WASSAMLFilterAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/was/was8/src/test/java/org/keycloak/testsuite/adapter/WASSAMLFilterAdapterTest.java
@@ -2,11 +2,11 @@ package org.keycloak.testsuite.adapter;
 
 import org.junit.Ignore;
 import org.junit.Test;
-import org.keycloak.testsuite.adapter.servlet.AbstractSAMLFilterServletAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.SAMLFilterServletAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 @AppServerContainer("app-server-was")
-public class WASSAMLFilterAdapterTest extends AbstractSAMLFilterServletAdapterTest {
+public class WASSAMLFilterAdapterTest extends SAMLFilterServletAdapterTest {
     @Override
     @Ignore // KEYCLOAK-6152
     @Test

diff --git a/testsuite/integration-arquillian/tests/other/adapters/wls/wls12/src/test/java/org/keycloak/testsuite/adapter/WLSSAMLFilterAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/wls/wls12/src/test/java/org/keycloak/testsuite/adapter/WLSSAMLFilterAdapterTest.java
index 9a9bd1f..5463e10 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/wls/wls12/src/test/java/org/keycloak/testsuite/adapter/WLSSAMLFilterAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/wls/wls12/src/test/java/org/keycloak/testsuite/adapter/WLSSAMLFilterAdapterTest.java
@@ -2,11 +2,11 @@ package org.keycloak.testsuite.adapter;
 
 import org.junit.Ignore;
 import org.junit.Test;
-import org.keycloak.testsuite.adapter.servlet.AbstractSAMLFilterServletAdapterTest;
+import org.keycloak.testsuite.adapter.servlet.SAMLFilterServletAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
 @AppServerContainer("app-server-wls")
-public class WLSSAMLFilterAdapterTest extends AbstractSAMLFilterServletAdapterTest {
+public class WLSSAMLFilterAdapterTest extends SAMLFilterServletAdapterTest {
 
     @Ignore // KEYCLOAK-6152
     @Override

diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml
index a2a0e25..f38d996 100755
--- a/testsuite/integration-arquillian/tests/pom.xml
+++ b/testsuite/integration-arquillian/tests/pom.xml
@@ -92,11 +92,14 @@
         <app.server.1.management.port>10290</app.server.1.management.port>
         <app.server.2.port.offset>400</app.server.2.port.offset>
         <app.server.2.management.port>10390</app.server.2.management.port>
+        <app.server.debug.port>5006</app.server.debug.port>
+        <app.server.debug.suspend>n</app.server.debug.suspend>
+        <app.server.jboss.jvm.debug.args>-agentlib:jdwp=transport=dt_socket,server=y,suspend=${app.server.debug.suspend},address=localhost:${app.server.debug.port}</app.server.jboss.jvm.debug.args>
 
         <cache.server>undefined</cache.server>
         <cache.server.container>cache-server-${cache.server}</cache.server.container>
         <cache.server.home>${containers.home}/${cache.server.container}</cache.server.home>
-        <cache.server.port.offset>1010</cache.server.port.offset>
+        <cache.server.1.port.offset>1010</cache.server.1.port.offset>
         <cache.server.management.port>11000</cache.server.management.port>
         <cache.server.2.port.offset>2010</cache.server.2.port.offset>
         <cache.server.2.management.port>12000</cache.server.2.management.port>
@@ -114,6 +117,8 @@
         <kie.maven.settings/>
 
         <examples.home>${project.build.directory}/examples</examples.home>
+        <examples.basedir>${keycloak-parent.basedir}/examples</examples.basedir> <!--keycloak/examples directory-->
+        <examples.version.suffix>${project.version}</examples.version.suffix>
 
         <browser>htmlUnit</browser>
         <webdriverDownloadBinaries>true</webdriverDownloadBinaries>
@@ -313,6 +318,7 @@
                             <app.server.1.management.port>${app.server.1.management.port}</app.server.1.management.port>
                             <app.server.2.port.offset>${app.server.2.port.offset}</app.server.2.port.offset>
                             <app.server.2.management.port>${app.server.2.management.port}</app.server.2.management.port>
+                            <app.server.jboss.jvm.debug.args>${app.server.jboss.jvm.debug.args}</app.server.jboss.jvm.debug.args>
 
                             <frontend.console.output>${frontend.console.output}</frontend.console.output>
                             <backends.console.output>${backend.console.output}</backends.console.output>
@@ -320,6 +326,9 @@
                             <auth.server.remote>${auth.server.remote}</auth.server.remote>
 
                             <adapter.test.props>${adapter.test.props}</adapter.test.props>
+                            <examples.home>${examples.home}</examples.home>
+                            <examples.version.suffix>${examples.version.suffix}</examples.version.suffix>
+
                             <migration.import.properties>${migration.import.properties}</migration.import.properties>
                             <kie.maven.settings>${kie.maven.settings}</kie.maven.settings>
 
@@ -370,7 +379,7 @@
                             <cache.server.lifecycle.skip>${cache.server.lifecycle.skip}</cache.server.lifecycle.skip>
 
                             <cache.server>${cache.server}</cache.server>
-                            <cache.server.port.offset>${cache.server.port.offset}</cache.server.port.offset>
+                            <cache.server.1.port.offset>${cache.server.1.port.offset}</cache.server.1.port.offset>
                             <cache.server.container>${cache.server.container}</cache.server.container>
                             <cache.server.home>${cache.server.home}</cache.server.home>
                             <cache.server.console.output>${cache.server.console.output}</cache.server.console.output>
@@ -398,6 +407,31 @@
                 </plugin>
             </plugins>
         </pluginManagement>
+        <plugins>
+            <plugin>
+                <!--
+                    Required for Filter Adapter tests - this plugin has to be here to prevent
+                    org.jboss.shrinkwrap.resolver.api.maven.InvalidEnvironmentException
+
+                    ShrinkWrap Maven Resolver Plugin sets automatically following properties:
+                        maven.execution.pom-file
+                        maven.execution.offline
+                        maven.execution.user-settings
+                        maven.execution.global-settings
+                        maven.execution.active-profiles
+                -->
+                <groupId>org.jboss.shrinkwrap.resolver</groupId>
+                <artifactId>shrinkwrap-resolver-maven-plugin</artifactId>
+                <version>${shrinkwrap-resolver.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>propagate-execution-context</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 
     <dependencies>