keycloak-aplcache

diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlClient.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlClient.java
index 84691be..ff8546c 100644
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlClient.java
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlClient.java
@@ -122,6 +122,11 @@ public class SamlClient {
             }
 
             @Override
+            public HttpUriRequest createSamlSignedResponse(URI samlEndpoint, String relayState, Document samlRequest, String realmPrivateKey, String realmPublicKey) {
+                return null;
+            }
+
+            @Override
             public HttpPost createSamlSignedRequest(URI samlEndpoint, String relayState, Document samlRequest, String realmPrivateKey, String realmPublicKey) {
                 return createSamlPostMessage(samlEndpoint, relayState, samlRequest, GeneralConstants.SAML_REQUEST_KEY, realmPrivateKey, realmPublicKey);
             }
@@ -206,7 +211,38 @@ public class SamlClient {
 
             @Override
             public HttpUriRequest createSamlUnsignedResponse(URI samlEndpoint, String relayState, Document samlRequest) {
-                return null;
+                try {
+                    URI responseURI = new BaseSAML2BindingBuilder()
+                            .relayState(relayState)
+                            .redirectBinding(samlRequest)
+                            .responseURI(samlEndpoint.toString());
+                    return new HttpGet(responseURI);
+                } catch (ProcessingException | ConfigurationException | IOException ex) {
+                    throw new RuntimeException(ex);
+                }
+            }
+
+            @Override
+            public HttpUriRequest createSamlSignedResponse(URI samlEndpoint, String relayState, Document samlRequest, String realmPrivateKey, String realmPublicKey) {
+
+                try {
+                    BaseSAML2BindingBuilder binding = new BaseSAML2BindingBuilder();
+
+                    if (realmPrivateKey != null && realmPublicKey != null) {
+                        PrivateKey privateKey = org.keycloak.testsuite.util.KeyUtils.privateKeyFromString(realmPrivateKey);
+                        PublicKey publicKey = org.keycloak.testsuite.util.KeyUtils.publicKeyFromString(realmPublicKey);
+                        binding
+                                .signatureAlgorithm(SignatureAlgorithm.RSA_SHA256)
+                                .signWith(KeyUtils.createKeyId(privateKey), privateKey, publicKey)
+                                .signDocument();
+                    }
+
+                    binding.relayState(relayState);
+
+                    return new HttpGet(binding.redirectBinding(samlRequest).responseURI(samlEndpoint.toString()));
+                } catch (IOException | ConfigurationException | ProcessingException ex) {
+                    throw new RuntimeException(ex);
+                }
             }
 
             @Override
@@ -224,6 +260,8 @@ public class SamlClient {
         public abstract URI getBindingUri();
 
         public abstract HttpUriRequest createSamlUnsignedResponse(URI samlEndpoint, String relayState, Document samlRequest);
+
+        public abstract HttpUriRequest createSamlSignedResponse(URI samlEndpoint, String relayState, Document samlRequest, String realmPrivateKey, String realmPublicKey);
     }
 
     private static final Logger LOG = Logger.getLogger(SamlClient.class);

diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLFilterServletAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLFilterServletAdapterTest.java
index 70ef820..9d3b5ec 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLFilterServletAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLFilterServletAdapterTest.java
@@ -81,4 +81,11 @@ public abstract class AbstractSAMLFilterServletAdapterTest extends AbstractSAMLS
     public void testErrorHandlingUnsigned() {
 
     }
+
+    @Test
+    @Override
+    @Ignore
+    public void testErrorHandlingSigned() {
+
+    }
 }

diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLServletsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLServletsAdapterTest.java
index 7d0d43e..1459cf4 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLServletsAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLServletsAdapterTest.java
@@ -109,6 +109,8 @@ import static org.keycloak.testsuite.AbstractAuthTest.createUserRepresentation;
 import static org.keycloak.testsuite.admin.ApiUtil.createUserAndResetPasswordWithAdminClient;
 import static org.keycloak.testsuite.admin.Users.setPasswordFor;
 import static org.keycloak.testsuite.auth.page.AuthRealm.SAMLSERVLETDEMO;
+import static org.keycloak.testsuite.saml.AbstractSamlTest.REALM_PRIVATE_KEY;
+import static org.keycloak.testsuite.saml.AbstractSamlTest.REALM_PUBLIC_KEY;
 import static org.keycloak.testsuite.util.IOUtil.loadRealm;
 import static org.keycloak.testsuite.util.IOUtil.loadXML;
 import static org.keycloak.testsuite.util.IOUtil.modifyDocElementAttribute;
@@ -978,22 +980,30 @@ public abstract class AbstractSAMLServletsAdapterTest extends AbstractServletsAd
 
     @Test
     public void testErrorHandlingUnsigned() throws Exception {
-        Client client = ClientBuilder.newClient();
-        // make sure
-        Response response = client.target(employeeServletPage.toString()).request().get();
-        response.close();
         SAML2ErrorResponseBuilder builder = new SAML2ErrorResponseBuilder()
-                .destination(employeeServletPage.toString() + "/saml")
+                .destination(employeeSigServletPage.toString() + "/saml")
                 .issuer("http://localhost:" + System.getProperty("auth.server.http.port", "8180") + "/realms/demo")
                 .status(JBossSAMLURIConstants.STATUS_REQUEST_DENIED.get());
-        BaseSAML2BindingBuilder binding = new BaseSAML2BindingBuilder()
-                .relayState(null);
         Document document = builder.buildDocument();
-        URI uri = binding.redirectBinding(document).generateURI(employeeServletPage.toString() + "/saml", false);
-        response = client.target(uri).request().get();
-        String errorPage = response.readEntity(String.class);
-        response.close();
-        Assert.assertEquals(403, response.getStatus());
+
+        new SamlClientBuilder()
+                .addStep((client, currentURI, currentResponse, context) ->
+                        Binding.REDIRECT.createSamlUnsignedResponse(URI.create(employeeSigServletPage.toString() + "/saml"), null, document))
+                .execute(closeableHttpResponse -> assertThat(closeableHttpResponse, bodyHC(containsString("INVALID_SIGNATURE"))));
+    }
+
+    @Test
+    public void testErrorHandlingSigned() throws Exception {
+        SAML2ErrorResponseBuilder builder = new SAML2ErrorResponseBuilder()
+                .destination(employeeSigServletPage.toString() + "/saml")
+                .issuer("http://localhost:" + System.getProperty("auth.server.http.port", "8180") + "/realms/demo")
+                .status(JBossSAMLURIConstants.STATUS_REQUEST_DENIED.get());
+        Document document = builder.buildDocument();
+
+        new SamlClientBuilder()
+                .addStep((client, currentURI, currentResponse, context) ->
+                        Binding.REDIRECT.createSamlSignedResponse(URI.create(employeeSigServletPage.toString() + "/saml"), null, document, REALM_PRIVATE_KEY, REALM_PUBLIC_KEY))
+                .execute(closeableHttpResponse -> assertThat(closeableHttpResponse, bodyHC(containsString("ERROR_STATUS"))));
     }
 
     @Test

diff --git a/testsuite/integration-deprecated/pom.xml b/testsuite/integration-deprecated/pom.xml
index e9cc992..b47e88a 100755
--- a/testsuite/integration-deprecated/pom.xml
+++ b/testsuite/integration-deprecated/pom.xml
@@ -280,6 +280,11 @@
             <artifactId>mariadb-java-client</artifactId>
             <version>${mariadb.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.keycloak.testsuite</groupId>
+            <artifactId>integration-arquillian-test-apps-servlets</artifactId>
+            <version>4.0.0.CR1-SNAPSHOT</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

diff --git a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/saml/SamlEcpProfileTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/saml/SamlEcpProfileTest.java
index 5ac5722..6e1831d 100755
--- a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/saml/SamlEcpProfileTest.java
+++ b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/saml/SamlEcpProfileTest.java
@@ -27,7 +27,7 @@ import org.keycloak.saml.common.constants.JBossSAMLConstants;
 import org.keycloak.saml.common.constants.JBossSAMLURIConstants;
 import org.keycloak.saml.common.util.DocumentUtil;
 import org.keycloak.saml.processing.core.parsers.saml.SAMLParser;
-import org.keycloak.testsuite.samlfilter.SamlAdapterTest;
+import org.keycloak.testsuite.helper.adapter.SamlKeycloakRule;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -73,10 +73,10 @@ public class SamlEcpProfileTest {
     protected String APP_SERVER_BASE_URL = "http://localhost:8081";
 
     @ClassRule
-    public static org.keycloak.testsuite.samlfilter.SamlKeycloakRule keycloakRule = new org.keycloak.testsuite.samlfilter.SamlKeycloakRule() {
+    public static SamlKeycloakRule keycloakRule = new SamlKeycloakRule() {
         @Override
         public void initWars() {
-            ClassLoader classLoader = SamlAdapterTest.class.getClassLoader();
+            ClassLoader classLoader = SamlEcpProfileTest.class.getClassLoader();
 
             initializeSamlSecuredWar("/keycloak-saml/ecp/ecp-sp", "/ecp-sp",  "ecp-sp.war", classLoader);
         }

diff --git a/testsuite/jetty/jetty81/src/test/java/org/keycloak/testsuite/JettySamlTest.java b/testsuite/jetty/jetty81/src/test/java/org/keycloak/testsuite/JettySamlTest.java
index 064d46e..67cc922 100755
--- a/testsuite/jetty/jetty81/src/test/java/org/keycloak/testsuite/JettySamlTest.java
+++ b/testsuite/jetty/jetty81/src/test/java/org/keycloak/testsuite/JettySamlTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.RealmModel;
 import org.keycloak.services.managers.RealmManager;
-import org.keycloak.testsuite.keycloaksaml.SamlAdapterTestStrategy;
+import org.keycloak.testsuite.helper.adapter.SamlAdapterTestStrategy;
 import org.keycloak.testsuite.rule.AbstractKeycloakRule;
 import org.openqa.selenium.WebDriver;
 

diff --git a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml
index 77a1484..0a0f741 100755
--- a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>Error Servlet</servlet-name>

diff --git a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml
index 124a5ca..8ef9d30 100755
--- a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml
index 42a7f77..40dd007 100755
--- a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>Error Servlet</servlet-name>

diff --git a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml
index 0be7a74..86b6e6e 100755
--- a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.InputServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.adapter.servlet.InputServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty81/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty91/src/test/java/org/keycloak/testsuite/JettySamlTest.java b/testsuite/jetty/jetty91/src/test/java/org/keycloak/testsuite/JettySamlTest.java
index 064d46e..67cc922 100755
--- a/testsuite/jetty/jetty91/src/test/java/org/keycloak/testsuite/JettySamlTest.java
+++ b/testsuite/jetty/jetty91/src/test/java/org/keycloak/testsuite/JettySamlTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.RealmModel;
 import org.keycloak.services.managers.RealmManager;
-import org.keycloak.testsuite.keycloaksaml.SamlAdapterTestStrategy;
+import org.keycloak.testsuite.helper.adapter.SamlAdapterTestStrategy;
 import org.keycloak.testsuite.rule.AbstractKeycloakRule;
 import org.openqa.selenium.WebDriver;
 

diff --git a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml
index 1f59ff9..5dbfdc0 100755
--- a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>Error Servlet</servlet-name>

diff --git a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml
index 124a5ca..8ef9d30 100755
--- a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml
index 42a7f77..40dd007 100755
--- a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>Error Servlet</servlet-name>

diff --git a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml
index 0be7a74..86b6e6e 100755
--- a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.InputServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.adapter.servlet.InputServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty91/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty92/src/test/java/org/keycloak/testsuite/JettySamlTest.java b/testsuite/jetty/jetty92/src/test/java/org/keycloak/testsuite/JettySamlTest.java
index f1e72a4..9529c0f 100755
--- a/testsuite/jetty/jetty92/src/test/java/org/keycloak/testsuite/JettySamlTest.java
+++ b/testsuite/jetty/jetty92/src/test/java/org/keycloak/testsuite/JettySamlTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.RealmModel;
 import org.keycloak.services.managers.RealmManager;
-import org.keycloak.testsuite.keycloaksaml.SamlAdapterTestStrategy;
+import org.keycloak.testsuite.helper.adapter.SamlAdapterTestStrategy;
 import org.keycloak.testsuite.rule.AbstractKeycloakRule;
 import org.openqa.selenium.WebDriver;
 

diff --git a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml
index 42a7f77..40dd007 100755
--- a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>Error Servlet</servlet-name>

diff --git a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml
index 124a5ca..8ef9d30 100755
--- a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml
index 42a7f77..40dd007 100755
--- a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>Error Servlet</servlet-name>

diff --git a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml
index 0be7a74..86b6e6e 100755
--- a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.InputServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.adapter.servlet.InputServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty92/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty93/src/test/java/org/keycloak/testsuite/JettySamlTest.java b/testsuite/jetty/jetty93/src/test/java/org/keycloak/testsuite/JettySamlTest.java
index f1e72a4..9529c0f 100644
--- a/testsuite/jetty/jetty93/src/test/java/org/keycloak/testsuite/JettySamlTest.java
+++ b/testsuite/jetty/jetty93/src/test/java/org/keycloak/testsuite/JettySamlTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.RealmModel;
 import org.keycloak.services.managers.RealmManager;
-import org.keycloak.testsuite.keycloaksaml.SamlAdapterTestStrategy;
+import org.keycloak.testsuite.helper.adapter.SamlAdapterTestStrategy;
 import org.keycloak.testsuite.rule.AbstractKeycloakRule;
 import org.openqa.selenium.WebDriver;
 

diff --git a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100644
--- a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml
index 42a7f77..40dd007 100644
--- a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>Error Servlet</servlet-name>

diff --git a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100644
--- a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml
index 124a5ca..8ef9d30 100644
--- a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml
index f1cdbea..fcb90a9 100644
--- a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml
index 42a7f77..40dd007 100644
--- a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>Error Servlet</servlet-name>

diff --git a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml
index f1cdbea..fcb90a9 100644
--- a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100644
--- a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml
index f1cdbea..fcb90a9 100644
--- a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml
index f1cdbea..fcb90a9 100644
--- a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml
index f1cdbea..fcb90a9 100644
--- a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml
index 0be7a74..86b6e6e 100644
--- a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.InputServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.adapter.servlet.InputServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100644
--- a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml
index f1cdbea..fcb90a9 100644
--- a/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty93/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty94/src/test/java/org/keycloak/testsuite/JettySamlTest.java b/testsuite/jetty/jetty94/src/test/java/org/keycloak/testsuite/JettySamlTest.java
index f1e72a4..9529c0f 100644
--- a/testsuite/jetty/jetty94/src/test/java/org/keycloak/testsuite/JettySamlTest.java
+++ b/testsuite/jetty/jetty94/src/test/java/org/keycloak/testsuite/JettySamlTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.RealmModel;
 import org.keycloak.services.managers.RealmManager;
-import org.keycloak.testsuite.keycloaksaml.SamlAdapterTestStrategy;
+import org.keycloak.testsuite.helper.adapter.SamlAdapterTestStrategy;
 import org.keycloak.testsuite.rule.AbstractKeycloakRule;
 import org.openqa.selenium.WebDriver;
 

diff --git a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100644
--- a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml
index 42a7f77..40dd007 100644
--- a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>Error Servlet</servlet-name>

diff --git a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100644
--- a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml
index 124a5ca..8ef9d30 100644
--- a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml
index f1cdbea..fcb90a9 100644
--- a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml
index 42a7f77..40dd007 100644
--- a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>Error Servlet</servlet-name>

diff --git a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml
index f1cdbea..fcb90a9 100644
--- a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100644
--- a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml
index f1cdbea..fcb90a9 100644
--- a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml
index f1cdbea..fcb90a9 100644
--- a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml
index f1cdbea..fcb90a9 100644
--- a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml
index 0be7a74..86b6e6e 100644
--- a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.InputServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.adapter.servlet.InputServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100644
--- a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml
index f1cdbea..fcb90a9 100644
--- a/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml
+++ b/testsuite/jetty/jetty94/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat6/src/test/java/org/keycloak/testsuite/TomcatSamlTest.java b/testsuite/tomcat6/src/test/java/org/keycloak/testsuite/TomcatSamlTest.java
index dc3bd09..3c1e745 100755
--- a/testsuite/tomcat6/src/test/java/org/keycloak/testsuite/TomcatSamlTest.java
+++ b/testsuite/tomcat6/src/test/java/org/keycloak/testsuite/TomcatSamlTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.RealmModel;
 import org.keycloak.services.managers.RealmManager;
-import org.keycloak.testsuite.keycloaksaml.SamlAdapterTestStrategy;
+import org.keycloak.testsuite.helper.adapter.SamlAdapterTestStrategy;
 import org.keycloak.testsuite.rule.AbstractKeycloakRule;
 import org.openqa.selenium.WebDriver;
 

diff --git a/testsuite/tomcat6/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml b/testsuite/tomcat6/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat6/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml
+++ b/testsuite/tomcat6/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat6/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml b/testsuite/tomcat6/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml
index 1f59ff9..5dbfdc0 100755
--- a/testsuite/tomcat6/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml
+++ b/testsuite/tomcat6/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>Error Servlet</servlet-name>

diff --git a/testsuite/tomcat6/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml b/testsuite/tomcat6/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat6/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml
+++ b/testsuite/tomcat6/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat6/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml b/testsuite/tomcat6/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml
index 124a5ca..8ef9d30 100755
--- a/testsuite/tomcat6/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml
+++ b/testsuite/tomcat6/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml b/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml
+++ b/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml b/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml
index 42a7f77..40dd007 100755
--- a/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml
+++ b/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>Error Servlet</servlet-name>

diff --git a/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml b/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml
+++ b/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml b/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml
+++ b/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml b/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml
+++ b/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml b/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml
+++ b/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml b/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml
+++ b/testsuite/tomcat6/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat6/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml b/testsuite/tomcat6/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml
index 0be7a74..86b6e6e 100755
--- a/testsuite/tomcat6/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml
+++ b/testsuite/tomcat6/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.InputServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.adapter.servlet.InputServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat6/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml b/testsuite/tomcat6/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat6/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml
+++ b/testsuite/tomcat6/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat6/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml b/testsuite/tomcat6/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat6/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml
+++ b/testsuite/tomcat6/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat7/src/test/java/org/keycloak/testsuite/TomcatSamlTest.java b/testsuite/tomcat7/src/test/java/org/keycloak/testsuite/TomcatSamlTest.java
index b4a6d1c..5b1066c 100755
--- a/testsuite/tomcat7/src/test/java/org/keycloak/testsuite/TomcatSamlTest.java
+++ b/testsuite/tomcat7/src/test/java/org/keycloak/testsuite/TomcatSamlTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.RealmModel;
 import org.keycloak.services.managers.RealmManager;
-import org.keycloak.testsuite.keycloaksaml.SamlAdapterTestStrategy;
+import org.keycloak.testsuite.helper.adapter.SamlAdapterTestStrategy;
 import org.keycloak.testsuite.rule.AbstractKeycloakRule;
 import org.openqa.selenium.WebDriver;
 

diff --git a/testsuite/tomcat7/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml b/testsuite/tomcat7/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat7/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml
+++ b/testsuite/tomcat7/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat7/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml b/testsuite/tomcat7/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml
index 42a7f77..40dd007 100755
--- a/testsuite/tomcat7/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml
+++ b/testsuite/tomcat7/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>Error Servlet</servlet-name>

diff --git a/testsuite/tomcat7/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml b/testsuite/tomcat7/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat7/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml
+++ b/testsuite/tomcat7/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat7/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml b/testsuite/tomcat7/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml
index 124a5ca..8ef9d30 100755
--- a/testsuite/tomcat7/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml
+++ b/testsuite/tomcat7/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml b/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml
+++ b/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml b/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml
index 42a7f77..40dd007 100755
--- a/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml
+++ b/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>Error Servlet</servlet-name>

diff --git a/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml b/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml
+++ b/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml b/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml
+++ b/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml b/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml
+++ b/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml b/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml
+++ b/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml b/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml
+++ b/testsuite/tomcat7/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat7/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml b/testsuite/tomcat7/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml
index 0be7a74..86b6e6e 100755
--- a/testsuite/tomcat7/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml
+++ b/testsuite/tomcat7/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.InputServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.adapter.servlet.InputServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat7/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml b/testsuite/tomcat7/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat7/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml
+++ b/testsuite/tomcat7/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat7/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml b/testsuite/tomcat7/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat7/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml
+++ b/testsuite/tomcat7/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat8/src/test/java/org/keycloak/testsuite/TomcatSamlTest.java b/testsuite/tomcat8/src/test/java/org/keycloak/testsuite/TomcatSamlTest.java
index 1456496..1324c14 100755
--- a/testsuite/tomcat8/src/test/java/org/keycloak/testsuite/TomcatSamlTest.java
+++ b/testsuite/tomcat8/src/test/java/org/keycloak/testsuite/TomcatSamlTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.RealmModel;
 import org.keycloak.services.managers.RealmManager;
-import org.keycloak.testsuite.keycloaksaml.SamlAdapterTestStrategy;
+import org.keycloak.testsuite.helper.adapter.SamlAdapterTestStrategy;
 import org.keycloak.testsuite.rule.AbstractKeycloakRule;
 import org.openqa.selenium.WebDriver;
 

diff --git a/testsuite/tomcat8/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml b/testsuite/tomcat8/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat8/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml
+++ b/testsuite/tomcat8/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat8/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml b/testsuite/tomcat8/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml
index 42a7f77..40dd007 100755
--- a/testsuite/tomcat8/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml
+++ b/testsuite/tomcat8/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>Error Servlet</servlet-name>

diff --git a/testsuite/tomcat8/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml b/testsuite/tomcat8/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat8/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml
+++ b/testsuite/tomcat8/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat8/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml b/testsuite/tomcat8/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml
index 124a5ca..8ef9d30 100755
--- a/testsuite/tomcat8/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml
+++ b/testsuite/tomcat8/src/test/resources/keycloak-saml/mappers/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml b/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml
+++ b/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml b/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml
index 42a7f77..40dd007 100755
--- a/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml
+++ b/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-get/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>Error Servlet</servlet-name>

diff --git a/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml b/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml
+++ b/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml b/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml
+++ b/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml b/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml
+++ b/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml b/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml
+++ b/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml b/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml
+++ b/testsuite/tomcat8/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat8/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml b/testsuite/tomcat8/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml
index 0be7a74..86b6e6e 100755
--- a/testsuite/tomcat8/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml
+++ b/testsuite/tomcat8/src/test/resources/keycloak-saml/simple-input/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.InputServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.adapter.servlet.InputServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat8/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml b/testsuite/tomcat8/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat8/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml
+++ b/testsuite/tomcat8/src/test/resources/keycloak-saml/simple-post/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat8/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml b/testsuite/tomcat8/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml
index f1cdbea..fcb90a9 100755
--- a/testsuite/tomcat8/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml
+++ b/testsuite/tomcat8/src/test/resources/keycloak-saml/simple-post2/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsernameServlet</servlet-name>
-        <servlet-class>org.keycloak.testsuite.keycloaksaml.SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SendUsernameServlet</servlet-name>

diff --git a/testsuite/tomcat8/src/test/resources/tomcat-test/webapp/WEB-INF/web.xml b/testsuite/tomcat8/src/test/resources/tomcat-test/webapp/WEB-INF/web.xml
index 36e0c9e..a4b7254 100755
--- a/testsuite/tomcat8/src/test/resources/tomcat-test/webapp/WEB-INF/web.xml
+++ b/testsuite/tomcat8/src/test/resources/tomcat-test/webapp/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <servlet>
         <servlet-name>SendUsername</servlet-name>
-        <servlet-class>org.keycloak.testsuite.TomcatTest$SendUsernameServlet</servlet-class>
+        <servlet-class>org.keycloak.testsuite.helper.adapter.SendUsernameServlet</servlet-class>
     </servlet>
 
     <servlet-mapping>