diff --git a/README.md b/README.md
index c2efec51d52..abb0bc253cb 100755
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ Starting Keycloak
 
 To start Keycloak during development first build as specified above, then run:
 
-    mvn -f testsuite/integration/pom.xml exec:java -Pkeycloak-server 
+    mvn -f testsuite/integration-deprecated/pom.xml exec:java -Pkeycloak-server 
 
 
 To start Keycloak from the server distribution first build the distribution it as specified above, then run:
diff --git a/examples/kerberos/README.md b/examples/kerberos/README.md
index 2c1d335aceb..7aafdacd978 100644
--- a/examples/kerberos/README.md
+++ b/examples/kerberos/README.md
@@ -47,7 +47,7 @@ is in your `/etc/hosts` before other records for the 127.0.0.1 host to avoid iss
 
 **5)** Configure Kerberos client (On linux it's in file `/etc/krb5.conf` ). You need to configure `KEYCLOAK.ORG` realm for host `localhost` and enable `forwardable` flag, which is needed 
 for credential delegation example, as application needs to forward Kerberos ticket and authenticate with it against LDAP server. 
-See [this file](https://github.com/keycloak/keycloak/blob/master/testsuite/integration-arquillian/tests/base/src/test/resources/kerberos/test-krb5.conf) for inspiration.
+See [this file](../../testsuite/integration-arquillian/tests/base/src/test/resources/kerberos/test-krb5.conf) for inspiration.
 On OS X the file to edit (or create) is `/Library/Preferences/edu.mit.Kerberos` with the same syntax as `krb5.conf`.
 On Windows the file to edit (or create) is `c:\Windows\krb5.ini` with the same syntax as `krb5.conf`.
 
diff --git a/misc/Testsuite.md b/misc/Testsuite.md
index 7f5e036d62e..f7b4e8e3838 100644
--- a/misc/Testsuite.md
+++ b/misc/Testsuite.md
@@ -114,10 +114,10 @@ But additionally you can enable Kerberos authentication in LDAP provider with th
 
 * Kerberos realm: KEYCLOAK.ORG
 * Server Principal: HTTP/localhost@KEYCLOAK.ORG
-* KeyTab: $KEYCLOAK_SOURCES/testsuite/integration/src/test/resources/kerberos/http.keytab (Replace $KEYCLOAK_SOURCES with correct absolute path of your sources)
+* KeyTab: $KEYCLOAK_SOURCES/testsuite/integration-arquillian/tests/base/src/test/resources/kerberos/http.keytab (Replace $KEYCLOAK_SOURCES with correct absolute path of your sources)
 
 Once you do this, you should also ensure that your Kerberos client configuration file is properly configured with KEYCLOAK.ORG domain. 
-See [../testsuite/integration/src/test/resources/kerberos/test-krb5.conf](../testsuite/integration/src/test/resources/kerberos/test-krb5.conf) for inspiration. The location of Kerberos configuration file 
+See [../testsuite/integration-arquillian/src/test/resources/kerberos/test-krb5.conf](../testsuite/integration-arquillian/src/test/resources/kerberos/test-krb5.conf) for inspiration. The location of Kerberos configuration file 
 is platform dependent (In linux it's file `/etc/krb5.conf` )
 
 Then you need to configure your browser to allow SPNEGO/Kerberos login from `localhost` .
diff --git a/misc/UpdatingDatabaseSchema.md b/misc/UpdatingDatabaseSchema.md
index 363d1099f5b..d9dc9c2bdb1 100644
--- a/misc/UpdatingDatabaseSchema.md
+++ b/misc/UpdatingDatabaseSchema.md
@@ -35,7 +35,7 @@ You can also have Liquibase and Hibernate create one for you. To do this follow
 3. Make a copy of the database:  
    `cp keycloak.h2.db keycloak-old.h2.db`    
 3. Run KeycloakServer to make Hibernate update the schema:  
-   `mvn -f testsuite/integration/pom.xml exec:java -Pkeycloak-server -Dkeycloak.connectionsJpa.url='jdbc:h2:keycloak' -Dkeycloak.connectionsJpa.databaseSchema='development-update'`
+   `mvn -f testsuite/integration-deprecated/pom.xml exec:java -Pkeycloak-server -Dkeycloak.connectionsJpa.url='jdbc:h2:keycloak' -Dkeycloak.connectionsJpa.databaseSchema='development-update'`
 4. Wait until server is completely started, then stop it
 5. View the difference:                                       
    `mvn -f connections/jpa-liquibase/pom.xml liquibase:diff -Durl=jdbc:h2:keycloak-old -DreferenceUrl=jdbc:h2:keycloak`
@@ -50,11 +50,11 @@ add entries to the `change-set` to update existing data if required.
 When you have update the change-set Hibernate can validate the schema for you. First run:
 
     rm -rf keycloak*h2.db
-    mvn -f testsuite/integration exec:java -Pkeycloak-server -Dkeycloak.connectionsJpa.url='jdbc:h2:keycloak' -Dkeycloak.connectionsJpa.databaseSchema='update'
+    mvn -f testsuite/integration-deprecated exec:java -Pkeycloak-server -Dkeycloak.connectionsJpa.url='jdbc:h2:keycloak' -Dkeycloak.connectionsJpa.databaseSchema='update'
     
 Once the server has started fully, stop it and run:
     
-    mvn -f testsuite/integration exec:java -Pkeycloak-server -Dkeycloak.connectionsJpa.url='jdbc:h2:keycloak' -Dkeycloak.connectionsJpa.databaseSchema='development-validate'
+    mvn -f testsuite/integration-deprecated exec:java -Pkeycloak-server -Dkeycloak.connectionsJpa.url='jdbc:h2:keycloak' -Dkeycloak.connectionsJpa.databaseSchema='development-validate'
 
 
 Testing database migration
diff --git a/pom.xml b/pom.xml
index 582f941e7f0..f5e1ab96a42 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1308,12 +1308,12 @@
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-testsuite-integration</artifactId>
+                <artifactId>keycloak-testsuite-integration-deprecated</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-testsuite-integration</artifactId>
+                <artifactId>keycloak-testsuite-integration-deprecated</artifactId>
                 <version>${project.version}</version>
                 <type>test-jar</type>
             </dependency>
diff --git a/testsuite/integration/pom.xml b/testsuite/integration-deprecated/pom.xml
similarity index 98%
rename from testsuite/integration/pom.xml
rename to testsuite/integration-deprecated/pom.xml
index 2f7cee04c1e..4cb51e324f4 100755
--- a/testsuite/integration/pom.xml
+++ b/testsuite/integration-deprecated/pom.xml
@@ -25,9 +25,9 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>keycloak-testsuite-integration</artifactId>
-    <name>Keycloak Integration TestSuite</name>
-    <description />
+    <artifactId>keycloak-testsuite-integration-deprecated</artifactId>
+    <name>Keycloak Integration TestSuite - deprecated</name>
+    <description>This testsuite is deprecated. Use testsuite/integration-arquillian instead</description>
 
     <properties>
         <maven.compiler.target>1.8</maven.compiler.target>
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/ApiUtil.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/ApiUtil.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/ApiUtil.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/ApiUtil.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/ApplicationServlet.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/ApplicationServlet.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/ApplicationServlet.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/ApplicationServlet.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/AssertEvents.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/AssertEvents.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/AssertEvents.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/AssertEvents.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/Constants.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/Constants.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/Constants.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/Constants.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/KeycloakServer.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/KeycloakServer.java
similarity index 99%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/KeycloakServer.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/KeycloakServer.java
index f9813770646..95ecd7ea3b1 100755
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/KeycloakServer.java
+++ b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/KeycloakServer.java
@@ -165,11 +165,11 @@ public class KeycloakServer {
             String resources = System.getProperty("resources");
             if (resources == null || resources.equals("") || resources.equals("true")) {
                 if (System.getProperties().containsKey("maven.home")) {
-                    resources = System.getProperty("user.dir").replaceFirst("testsuite.integration.*", "");
+                    resources = System.getProperty("user.dir").replaceFirst("testsuite.integration-deprecated.*", "");
                 } else {
                     for (String c : System.getProperty("java.class.path").split(File.pathSeparator)) {
-                        if (c.contains(File.separator + "testsuite" + File.separator + "integration")) {
-                            resources = c.replaceFirst("testsuite.integration.*", "");
+                        if (c.contains(File.separator + "testsuite" + File.separator + "integration-deprecated")) {
+                            resources = c.replaceFirst("testsuite.integration-deprecated.*", "");
                         }
                     }
                 }
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/MailServer.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/MailServer.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/MailServer.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/MailServer.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/MailUtil.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/MailUtil.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/MailUtil.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/MailUtil.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/OAuthClient.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/OAuthClient.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/OAuthClient.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/OAuthClient.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/Retry.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/Retry.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/Retry.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/Retry.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/TotpGenerator.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/TotpGenerator.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/TotpGenerator.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/TotpGenerator.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/AdapterTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/AdapterTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/AdapterTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/AdapterTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/AdapterTestStrategy.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/AdapterTestStrategy.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/AdapterTestStrategy.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/AdapterTestStrategy.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/CallAuthenticatedServlet.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/CallAuthenticatedServlet.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/CallAuthenticatedServlet.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/CallAuthenticatedServlet.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/CookieTokenStoreAdapterTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/CookieTokenStoreAdapterTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/CookieTokenStoreAdapterTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/CookieTokenStoreAdapterTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/CustomerDatabaseServlet.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/CustomerDatabaseServlet.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/CustomerDatabaseServlet.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/CustomerDatabaseServlet.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/CustomerServlet.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/CustomerServlet.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/CustomerServlet.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/CustomerServlet.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/FilterAdapterTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/FilterAdapterTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/FilterAdapterTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/FilterAdapterTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/InputPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/InputPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/InputPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/InputPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/InputServlet.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/InputServlet.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/InputServlet.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/InputServlet.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/MultiTenancyTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/MultiTenancyTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/MultiTenancyTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/MultiTenancyTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/MultiTenantResolver.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/MultiTenantResolver.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/MultiTenantResolver.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/MultiTenantResolver.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/MultiTenantServlet.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/MultiTenantServlet.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/MultiTenantServlet.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/MultiTenantServlet.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/ProductServlet.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/ProductServlet.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/ProductServlet.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/ProductServlet.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/RelativeUriAdapterTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/RelativeUriAdapterTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/RelativeUriAdapterTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/RelativeUriAdapterTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/SessionServlet.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/SessionServlet.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/SessionServlet.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/SessionServlet.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adduser/AddUserTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adduser/AddUserTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/adduser/AddUserTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adduser/AddUserTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/authorization/AbstractAuthorizationTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/authorization/AbstractAuthorizationTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/authorization/AbstractAuthorizationTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/authorization/AbstractAuthorizationTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/authorization/AbstractPhotozAdminTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/authorization/AbstractPhotozAdminTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/authorization/AbstractPhotozAdminTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/authorization/AbstractPhotozAdminTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/authorization/AttributeTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/authorization/AttributeTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/authorization/AttributeTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/authorization/AttributeTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/authorization/AuthorizationClientTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/authorization/AuthorizationClientTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/authorization/AuthorizationClientTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/authorization/AuthorizationClientTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/authorization/KeycloakAuthorizationServerRule.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/authorization/KeycloakAuthorizationServerRule.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/authorization/KeycloakAuthorizationServerRule.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/authorization/KeycloakAuthorizationServerRule.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/authorization/ResourceManagementTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/authorization/ResourceManagementTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/authorization/ResourceManagementTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/authorization/ResourceManagementTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/authorization/ResourcePermissionManagementTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/authorization/ResourcePermissionManagementTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/authorization/ResourcePermissionManagementTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/authorization/ResourcePermissionManagementTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/authorization/ScopeManagementTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/authorization/ScopeManagementTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/authorization/ScopeManagementTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/authorization/ScopeManagementTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/AbstractIdentityProviderModelTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/AbstractIdentityProviderModelTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/broker/AbstractIdentityProviderModelTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/AbstractIdentityProviderModelTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/AbstractIdentityProviderTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/AbstractIdentityProviderTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/broker/AbstractIdentityProviderTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/AbstractIdentityProviderTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/AbstractKeycloakIdentityProviderTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/AbstractKeycloakIdentityProviderTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/broker/AbstractKeycloakIdentityProviderTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/AbstractKeycloakIdentityProviderTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/BrokerKeyCloakRule.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/BrokerKeyCloakRule.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/broker/BrokerKeyCloakRule.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/BrokerKeyCloakRule.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/IdentityProviderHintTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/IdentityProviderHintTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/broker/IdentityProviderHintTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/IdentityProviderHintTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/IdentityProviderRegistrationTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/IdentityProviderRegistrationTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/broker/IdentityProviderRegistrationTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/IdentityProviderRegistrationTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/ImportIdentityProviderTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/ImportIdentityProviderTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/broker/ImportIdentityProviderTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/ImportIdentityProviderTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/OIDCBrokerUserPropertyTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/OIDCBrokerUserPropertyTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/broker/OIDCBrokerUserPropertyTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/OIDCBrokerUserPropertyTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/OIDCFirstBrokerLoginTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/OIDCFirstBrokerLoginTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/broker/OIDCFirstBrokerLoginTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/OIDCFirstBrokerLoginTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/OIDCKeyCloakServerBrokerBasicTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/OIDCKeyCloakServerBrokerBasicTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/broker/OIDCKeyCloakServerBrokerBasicTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/OIDCKeyCloakServerBrokerBasicTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/OIDCKeycloakServerBrokerWithConsentTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/OIDCKeycloakServerBrokerWithConsentTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/broker/OIDCKeycloakServerBrokerWithConsentTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/OIDCKeycloakServerBrokerWithConsentTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/PostBrokerFlowTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/PostBrokerFlowTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/broker/PostBrokerFlowTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/PostBrokerFlowTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/SAMLBrokerUserPropertyTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/SAMLBrokerUserPropertyTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/broker/SAMLBrokerUserPropertyTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/SAMLBrokerUserPropertyTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/SAMLFirstBrokerLoginTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/SAMLFirstBrokerLoginTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/broker/SAMLFirstBrokerLoginTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/SAMLFirstBrokerLoginTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/SAMLKeyCloakServerBrokerBasicTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/SAMLKeyCloakServerBrokerBasicTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/broker/SAMLKeyCloakServerBrokerBasicTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/SAMLKeyCloakServerBrokerBasicTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/SAMLKeyCloakServerBrokerWithSignatureTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/SAMLKeyCloakServerBrokerWithSignatureTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/broker/SAMLKeyCloakServerBrokerWithSignatureTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/SAMLKeyCloakServerBrokerWithSignatureTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/provider/CustomIdentityProvider.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/provider/CustomIdentityProvider.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/broker/provider/CustomIdentityProvider.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/provider/CustomIdentityProvider.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/provider/CustomIdentityProviderFactory.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/provider/CustomIdentityProviderFactory.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/broker/provider/CustomIdentityProviderFactory.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/provider/CustomIdentityProviderFactory.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/provider/social/CustomSocialProvider.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/provider/social/CustomSocialProvider.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/broker/provider/social/CustomSocialProvider.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/provider/social/CustomSocialProvider.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/provider/social/CustomSocialProviderFactory.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/provider/social/CustomSocialProviderFactory.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/broker/provider/social/CustomSocialProviderFactory.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/provider/social/CustomSocialProviderFactory.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/util/UserSessionStatusServlet.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/util/UserSessionStatusServlet.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/broker/util/UserSessionStatusServlet.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/broker/util/UserSessionStatusServlet.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPTestConfiguration.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPTestConfiguration.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPTestConfiguration.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPTestConfiguration.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/BrokenUserStorageTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/BrokenUserStorageTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/BrokenUserStorageTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/BrokenUserStorageTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ComponentExportImportTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ComponentExportImportTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ComponentExportImportTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ComponentExportImportTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/FederatedStorageExportImportTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/FederatedStorageExportImportTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/FederatedStorageExportImportTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/FederatedStorageExportImportTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/UserMapStorage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/UserMapStorage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/UserMapStorage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/UserMapStorage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/UserMapStorageFactory.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/UserMapStorageFactory.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/UserMapStorageFactory.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/UserMapStorageFactory.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/UserPropertyFileStorage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/UserPropertyFileStorage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/UserPropertyFileStorage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/UserPropertyFileStorage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/UserPropertyFileStorageFactory.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/UserPropertyFileStorageFactory.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/UserPropertyFileStorageFactory.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/UserPropertyFileStorageFactory.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPBinaryAttributesTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPBinaryAttributesTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPBinaryAttributesTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPBinaryAttributesTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPExampleServlet.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPExampleServlet.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPExampleServlet.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPExampleServlet.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPGroupMapper2WaySyncTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPGroupMapper2WaySyncTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPGroupMapper2WaySyncTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPGroupMapper2WaySyncTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPGroupMapperSyncTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPGroupMapperSyncTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPGroupMapperSyncTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPGroupMapperSyncTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPGroupMapperTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPGroupMapperTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPGroupMapperTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPGroupMapperTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPLegacyImportTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPLegacyImportTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPLegacyImportTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPLegacyImportTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPMSADFullNameTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPMSADFullNameTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPMSADFullNameTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPMSADFullNameTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPMSADMapperTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPMSADMapperTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPMSADMapperTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPMSADMapperTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPMultipleAttributesTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPMultipleAttributesTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPMultipleAttributesTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPMultipleAttributesTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPNoMSADTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPNoMSADTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPNoMSADTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPNoMSADTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPProvidersIntegrationTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPProvidersIntegrationTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPProvidersIntegrationTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPProvidersIntegrationTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPRoleMappingsTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPRoleMappingsTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPRoleMappingsTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPRoleMappingsTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPSpecialCharsTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPSpecialCharsTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPSpecialCharsTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPSpecialCharsTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPSyncTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPSyncTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPSyncTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPSyncTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPTestUtils.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPTestUtils.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPTestUtils.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPTestUtils.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/noimport/LDAPGroupMapperNoImportTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/noimport/LDAPGroupMapperNoImportTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/noimport/LDAPGroupMapperNoImportTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/noimport/LDAPGroupMapperNoImportTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/noimport/LDAPMultipleAttributesNoImportTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/noimport/LDAPMultipleAttributesNoImportTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/noimport/LDAPMultipleAttributesNoImportTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/noimport/LDAPMultipleAttributesNoImportTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/noimport/LDAPProvidersIntegrationNoImportTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/noimport/LDAPProvidersIntegrationNoImportTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/noimport/LDAPProvidersIntegrationNoImportTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/noimport/LDAPProvidersIntegrationNoImportTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/noimport/LDAPRoleMappingsNoImportTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/noimport/LDAPRoleMappingsNoImportTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/noimport/LDAPRoleMappingsNoImportTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/storage/ldap/noimport/LDAPRoleMappingsNoImportTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/sync/SyncDummyUserFederationProviderFactory.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/sync/SyncDummyUserFederationProviderFactory.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/sync/SyncDummyUserFederationProviderFactory.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/sync/SyncDummyUserFederationProviderFactory.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/sync/SyncFederationTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/sync/SyncFederationTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/federation/sync/SyncFederationTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/federation/sync/SyncFederationTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsBasicAuthTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsBasicAuthTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsBasicAuthTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsBasicAuthTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsFilterTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsFilterTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsFilterTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsFilterTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsTestApplication.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsTestApplication.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsTestApplication.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsTestApplication.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsTestResource.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsTestResource.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsTestResource.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsTestResource.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/keycloaksaml/InputPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/keycloaksaml/InputPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/keycloaksaml/InputPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/keycloaksaml/InputPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/keycloaksaml/InputServlet.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/keycloaksaml/InputServlet.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/keycloaksaml/InputServlet.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/keycloaksaml/InputServlet.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/keycloaksaml/SamlAdapterTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/keycloaksaml/SamlAdapterTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/keycloaksaml/SamlAdapterTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/keycloaksaml/SamlAdapterTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/keycloaksaml/SamlAdapterTestStrategy.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/keycloaksaml/SamlAdapterTestStrategy.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/keycloaksaml/SamlAdapterTestStrategy.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/keycloaksaml/SamlAdapterTestStrategy.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/keycloaksaml/SamlKeycloakRule.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/keycloaksaml/SamlKeycloakRule.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/keycloaksaml/SamlKeycloakRule.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/keycloaksaml/SamlKeycloakRule.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/keycloaksaml/SamlSPFacade.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/keycloaksaml/SamlSPFacade.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/keycloaksaml/SamlSPFacade.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/keycloaksaml/SamlSPFacade.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/keycloaksaml/SendUsernameServlet.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/keycloaksaml/SendUsernameServlet.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/keycloaksaml/SendUsernameServlet.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/keycloaksaml/SendUsernameServlet.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/AbstractModelTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/AbstractModelTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/model/AbstractModelTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/AbstractModelTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/AuthenticationSessionProviderTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/AuthenticationSessionProviderTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/model/AuthenticationSessionProviderTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/AuthenticationSessionProviderTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/CacheTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/CacheTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/model/CacheTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/CacheTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/ClientModelTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/ClientModelTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/model/ClientModelTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/ClientModelTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/ClusterInvalidationTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/ClusterInvalidationTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/model/ClusterInvalidationTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/ClusterInvalidationTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/ClusterSessionCleanerTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/ClusterSessionCleanerTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/model/ClusterSessionCleanerTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/ClusterSessionCleanerTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/CompositeRolesModelTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/CompositeRolesModelTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/model/CompositeRolesModelTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/CompositeRolesModelTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/ConcurrentTransactionsTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/ConcurrentTransactionsTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/model/ConcurrentTransactionsTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/ConcurrentTransactionsTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/DBLockTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/DBLockTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/model/DBLockTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/DBLockTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/ImportTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/ImportTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/model/ImportTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/ImportTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/MigrationVersionTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/MigrationVersionTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/model/MigrationVersionTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/MigrationVersionTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/MultipleRealmsTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/MultipleRealmsTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/model/MultipleRealmsTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/MultipleRealmsTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/SimplePerfTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/SimplePerfTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/model/SimplePerfTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/SimplePerfTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/TransactionsTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/TransactionsTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/model/TransactionsTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/TransactionsTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserConsentModelTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/UserConsentModelTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserConsentModelTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/UserConsentModelTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserConsentWithUserStorageModelTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/UserConsentWithUserStorageModelTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserConsentWithUserStorageModelTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/UserConsentWithUserStorageModelTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserModelTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/UserModelTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserModelTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/UserModelTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionInitializerTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/UserSessionInitializerTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionInitializerTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/UserSessionInitializerTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionPersisterProviderTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/UserSessionPersisterProviderTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionPersisterProviderTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/UserSessionPersisterProviderTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionProviderOfflineTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/UserSessionProviderOfflineTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionProviderOfflineTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/UserSessionProviderOfflineTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AbstractAccountPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/AbstractAccountPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AbstractAccountPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/AbstractAccountPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AbstractPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/AbstractPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AbstractPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/AbstractPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AccountApplicationsPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/AccountApplicationsPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AccountApplicationsPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/AccountApplicationsPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AccountFederatedIdentityPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/AccountFederatedIdentityPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AccountFederatedIdentityPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/AccountFederatedIdentityPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AccountLogPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/AccountLogPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AccountLogPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/AccountLogPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AccountPasswordPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/AccountPasswordPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AccountPasswordPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/AccountPasswordPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AccountSessionsPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/AccountSessionsPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AccountSessionsPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/AccountSessionsPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AccountTotpPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/AccountTotpPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AccountTotpPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/AccountTotpPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AccountUpdateProfilePage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/AccountUpdateProfilePage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AccountUpdateProfilePage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/AccountUpdateProfilePage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AppPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/AppPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AppPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/AppPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/BypassKerberosPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/BypassKerberosPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/BypassKerberosPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/BypassKerberosPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/ErrorPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/ErrorPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/ErrorPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/ErrorPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/IdpConfirmLinkPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/IdpConfirmLinkPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/IdpConfirmLinkPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/IdpConfirmLinkPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/IdpLinkEmailPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/IdpLinkEmailPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/IdpLinkEmailPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/IdpLinkEmailPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/InfoPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/InfoPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/InfoPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/InfoPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginConfigTotpPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/LoginConfigTotpPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginConfigTotpPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/LoginConfigTotpPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginExpiredPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/LoginExpiredPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginExpiredPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/LoginExpiredPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/LoginPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/LoginPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginPasswordResetPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/LoginPasswordResetPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginPasswordResetPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/LoginPasswordResetPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginPasswordUpdatePage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/LoginPasswordUpdatePage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginPasswordUpdatePage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/LoginPasswordUpdatePage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginRecoverUsernamePage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/LoginRecoverUsernamePage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginRecoverUsernamePage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/LoginRecoverUsernamePage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginTotpPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/LoginTotpPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginTotpPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/LoginTotpPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginUpdateProfileEditUsernameAllowedPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/LoginUpdateProfileEditUsernameAllowedPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginUpdateProfileEditUsernameAllowedPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/LoginUpdateProfileEditUsernameAllowedPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginUpdateProfilePage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/LoginUpdateProfilePage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginUpdateProfilePage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/LoginUpdateProfilePage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/OAuthGrantPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/OAuthGrantPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/OAuthGrantPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/OAuthGrantPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/ProceedPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/ProceedPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/ProceedPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/ProceedPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/RegisterPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/RegisterPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/RegisterPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/RegisterPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/TermsAndConditionsPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/TermsAndConditionsPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/TermsAndConditionsPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/TermsAndConditionsPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/ValidatePassworrdEmailResetPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/ValidatePassworrdEmailResetPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/ValidatePassworrdEmailResetPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/ValidatePassworrdEmailResetPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/VerifyEmailPage.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/VerifyEmailPage.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/pages/VerifyEmailPage.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/pages/VerifyEmailPage.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/AbstractKeycloakRule.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/rule/AbstractKeycloakRule.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/rule/AbstractKeycloakRule.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/rule/AbstractKeycloakRule.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/ErrorServlet.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/rule/ErrorServlet.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/rule/ErrorServlet.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/rule/ErrorServlet.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/GreenMailRule.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/rule/GreenMailRule.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/rule/GreenMailRule.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/rule/GreenMailRule.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/KeycloakRule.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/rule/KeycloakRule.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/rule/KeycloakRule.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/rule/KeycloakRule.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/LDAPRule.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/rule/LDAPRule.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/rule/LDAPRule.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/rule/LDAPRule.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/LoggingRule.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/rule/LoggingRule.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/rule/LoggingRule.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/rule/LoggingRule.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/WebResource.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/rule/WebResource.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/rule/WebResource.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/rule/WebResource.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/WebRule.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/rule/WebRule.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/rule/WebRule.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/rule/WebRule.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/saml/SamlEcpProfileTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/saml/SamlEcpProfileTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/saml/SamlEcpProfileTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/saml/SamlEcpProfileTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/saml/SamlKeycloakRule.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/saml/SamlKeycloakRule.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/saml/SamlKeycloakRule.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/saml/SamlKeycloakRule.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/saml/SamlPicketlinkSPTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/saml/SamlPicketlinkSPTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/saml/SamlPicketlinkSPTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/saml/SamlPicketlinkSPTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/saml/ValidationTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/saml/ValidationTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/saml/ValidationTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/saml/ValidationTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/samlfilter/SamlAdapterTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/samlfilter/SamlAdapterTest.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/samlfilter/SamlAdapterTest.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/samlfilter/SamlAdapterTest.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/samlfilter/SamlKeycloakRule.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/samlfilter/SamlKeycloakRule.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/samlfilter/SamlKeycloakRule.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/samlfilter/SamlKeycloakRule.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/util/cli/AbstractCommand.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/AbstractCommand.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/util/cli/AbstractCommand.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/AbstractCommand.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/util/cli/AbstractSessionCacheCommand.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/AbstractSessionCacheCommand.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/util/cli/AbstractSessionCacheCommand.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/AbstractSessionCacheCommand.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/util/cli/BatchTaskRunner.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/BatchTaskRunner.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/util/cli/BatchTaskRunner.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/BatchTaskRunner.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/util/cli/CacheCommands.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/CacheCommands.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/util/cli/CacheCommands.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/CacheCommands.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/util/cli/ClusterProviderTaskCommand.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/ClusterProviderTaskCommand.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/util/cli/ClusterProviderTaskCommand.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/ClusterProviderTaskCommand.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/util/cli/LoadPersistentSessionsCommand.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/LoadPersistentSessionsCommand.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/util/cli/LoadPersistentSessionsCommand.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/LoadPersistentSessionsCommand.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/util/cli/PersistSessionsCommand.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/PersistSessionsCommand.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/util/cli/PersistSessionsCommand.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/PersistSessionsCommand.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/util/cli/RoleCommands.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/RoleCommands.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/util/cli/RoleCommands.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/RoleCommands.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/util/cli/SyncDummyFederationProviderCommand.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/SyncDummyFederationProviderCommand.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/util/cli/SyncDummyFederationProviderCommand.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/SyncDummyFederationProviderCommand.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/util/cli/TestCacheUtils.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/TestCacheUtils.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/util/cli/TestCacheUtils.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/TestCacheUtils.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/util/cli/TestsuiteCLI.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/TestsuiteCLI.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/util/cli/TestsuiteCLI.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/TestsuiteCLI.java
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/util/cli/UserCommands.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/UserCommands.java
similarity index 100%
rename from testsuite/integration/src/test/java/org/keycloak/testsuite/util/cli/UserCommands.java
rename to testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/UserCommands.java
diff --git a/testsuite/integration/src/test/resources/META-INF/keycloak-server.json b/testsuite/integration-deprecated/src/test/resources/META-INF/keycloak-server.json
similarity index 100%
rename from testsuite/integration/src/test/resources/META-INF/keycloak-server.json
rename to testsuite/integration-deprecated/src/test/resources/META-INF/keycloak-server.json
diff --git a/testsuite/integration/src/test/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderFactory b/testsuite/integration-deprecated/src/test/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderFactory
similarity index 100%
rename from testsuite/integration/src/test/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderFactory
rename to testsuite/integration-deprecated/src/test/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderFactory
diff --git a/testsuite/integration/src/test/resources/META-INF/services/org.keycloak.broker.social.SocialIdentityProviderFactory b/testsuite/integration-deprecated/src/test/resources/META-INF/services/org.keycloak.broker.social.SocialIdentityProviderFactory
similarity index 100%
rename from testsuite/integration/src/test/resources/META-INF/services/org.keycloak.broker.social.SocialIdentityProviderFactory
rename to testsuite/integration-deprecated/src/test/resources/META-INF/services/org.keycloak.broker.social.SocialIdentityProviderFactory
diff --git a/testsuite/integration/src/test/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory b/testsuite/integration-deprecated/src/test/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory
similarity index 100%
rename from testsuite/integration/src/test/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory
rename to testsuite/integration-deprecated/src/test/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory
diff --git a/testsuite/integration/src/test/resources/META-INF/services/org.keycloak.storage.UserStorageProviderFactory b/testsuite/integration-deprecated/src/test/resources/META-INF/services/org.keycloak.storage.UserStorageProviderFactory
similarity index 100%
rename from testsuite/integration/src/test/resources/META-INF/services/org.keycloak.storage.UserStorageProviderFactory
rename to testsuite/integration-deprecated/src/test/resources/META-INF/services/org.keycloak.storage.UserStorageProviderFactory
diff --git a/testsuite/integration/src/test/resources/adapter-test/cust-app-cookie-keycloak.json b/testsuite/integration-deprecated/src/test/resources/adapter-test/cust-app-cookie-keycloak.json
similarity index 100%
rename from testsuite/integration/src/test/resources/adapter-test/cust-app-cookie-keycloak.json
rename to testsuite/integration-deprecated/src/test/resources/adapter-test/cust-app-cookie-keycloak.json
diff --git a/testsuite/integration/src/test/resources/adapter-test/cust-app-keycloak-relative.json b/testsuite/integration-deprecated/src/test/resources/adapter-test/cust-app-keycloak-relative.json
similarity index 100%
rename from testsuite/integration/src/test/resources/adapter-test/cust-app-keycloak-relative.json
rename to testsuite/integration-deprecated/src/test/resources/adapter-test/cust-app-keycloak-relative.json
diff --git a/testsuite/integration/src/test/resources/adapter-test/cust-app-keycloak.json b/testsuite/integration-deprecated/src/test/resources/adapter-test/cust-app-keycloak.json
similarity index 100%
rename from testsuite/integration/src/test/resources/adapter-test/cust-app-keycloak.json
rename to testsuite/integration-deprecated/src/test/resources/adapter-test/cust-app-keycloak.json
diff --git a/testsuite/integration/src/test/resources/adapter-test/customer-db-keycloak-relative.json b/testsuite/integration-deprecated/src/test/resources/adapter-test/customer-db-keycloak-relative.json
similarity index 100%
rename from testsuite/integration/src/test/resources/adapter-test/customer-db-keycloak-relative.json
rename to testsuite/integration-deprecated/src/test/resources/adapter-test/customer-db-keycloak-relative.json
diff --git a/testsuite/integration/src/test/resources/adapter-test/customer-db-keycloak.json b/testsuite/integration-deprecated/src/test/resources/adapter-test/customer-db-keycloak.json
similarity index 100%
rename from testsuite/integration/src/test/resources/adapter-test/customer-db-keycloak.json
rename to testsuite/integration-deprecated/src/test/resources/adapter-test/customer-db-keycloak.json
diff --git a/testsuite/integration/src/test/resources/adapter-test/demorealm-relative.json b/testsuite/integration-deprecated/src/test/resources/adapter-test/demorealm-relative.json
similarity index 100%
rename from testsuite/integration/src/test/resources/adapter-test/demorealm-relative.json
rename to testsuite/integration-deprecated/src/test/resources/adapter-test/demorealm-relative.json
diff --git a/testsuite/integration/src/test/resources/adapter-test/demorealm.json b/testsuite/integration-deprecated/src/test/resources/adapter-test/demorealm.json
similarity index 100%
rename from testsuite/integration/src/test/resources/adapter-test/demorealm.json
rename to testsuite/integration-deprecated/src/test/resources/adapter-test/demorealm.json
diff --git a/testsuite/integration/src/test/resources/adapter-test/input-keycloak.json b/testsuite/integration-deprecated/src/test/resources/adapter-test/input-keycloak.json
similarity index 100%
rename from testsuite/integration/src/test/resources/adapter-test/input-keycloak.json
rename to testsuite/integration-deprecated/src/test/resources/adapter-test/input-keycloak.json
diff --git a/testsuite/integration/src/test/resources/adapter-test/no-access-token.json b/testsuite/integration-deprecated/src/test/resources/adapter-test/no-access-token.json
similarity index 100%
rename from testsuite/integration/src/test/resources/adapter-test/no-access-token.json
rename to testsuite/integration-deprecated/src/test/resources/adapter-test/no-access-token.json
diff --git a/testsuite/integration/src/test/resources/adapter-test/product-autodetect-bearer-only-keycloak.json b/testsuite/integration-deprecated/src/test/resources/adapter-test/product-autodetect-bearer-only-keycloak.json
similarity index 100%
rename from testsuite/integration/src/test/resources/adapter-test/product-autodetect-bearer-only-keycloak.json
rename to testsuite/integration-deprecated/src/test/resources/adapter-test/product-autodetect-bearer-only-keycloak.json
diff --git a/testsuite/integration/src/test/resources/adapter-test/product-keycloak-relative.json b/testsuite/integration-deprecated/src/test/resources/adapter-test/product-keycloak-relative.json
similarity index 100%
rename from testsuite/integration/src/test/resources/adapter-test/product-keycloak-relative.json
rename to testsuite/integration-deprecated/src/test/resources/adapter-test/product-keycloak-relative.json
diff --git a/testsuite/integration/src/test/resources/adapter-test/product-keycloak.json b/testsuite/integration-deprecated/src/test/resources/adapter-test/product-keycloak.json
similarity index 100%
rename from testsuite/integration/src/test/resources/adapter-test/product-keycloak.json
rename to testsuite/integration-deprecated/src/test/resources/adapter-test/product-keycloak.json
diff --git a/testsuite/integration/src/test/resources/adapter-test/secure-portal-keycloak.json b/testsuite/integration-deprecated/src/test/resources/adapter-test/secure-portal-keycloak.json
similarity index 100%
rename from testsuite/integration/src/test/resources/adapter-test/secure-portal-keycloak.json
rename to testsuite/integration-deprecated/src/test/resources/adapter-test/secure-portal-keycloak.json
diff --git a/testsuite/integration/src/test/resources/adapter-test/secure-portal-keystore.jks b/testsuite/integration-deprecated/src/test/resources/adapter-test/secure-portal-keystore.jks
similarity index 100%
rename from testsuite/integration/src/test/resources/adapter-test/secure-portal-keystore.jks
rename to testsuite/integration-deprecated/src/test/resources/adapter-test/secure-portal-keystore.jks
diff --git a/testsuite/integration/src/test/resources/adapter-test/session-keycloak.json b/testsuite/integration-deprecated/src/test/resources/adapter-test/session-keycloak.json
similarity index 100%
rename from testsuite/integration/src/test/resources/adapter-test/session-keycloak.json
rename to testsuite/integration-deprecated/src/test/resources/adapter-test/session-keycloak.json
diff --git a/testsuite/integration/src/test/resources/adapter-test/tenant1-keycloak.json b/testsuite/integration-deprecated/src/test/resources/adapter-test/tenant1-keycloak.json
similarity index 100%
rename from testsuite/integration/src/test/resources/adapter-test/tenant1-keycloak.json
rename to testsuite/integration-deprecated/src/test/resources/adapter-test/tenant1-keycloak.json
diff --git a/testsuite/integration/src/test/resources/adapter-test/tenant1-realm.json b/testsuite/integration-deprecated/src/test/resources/adapter-test/tenant1-realm.json
similarity index 100%
rename from testsuite/integration/src/test/resources/adapter-test/tenant1-realm.json
rename to testsuite/integration-deprecated/src/test/resources/adapter-test/tenant1-realm.json
diff --git a/testsuite/integration/src/test/resources/adapter-test/tenant2-keycloak.json b/testsuite/integration-deprecated/src/test/resources/adapter-test/tenant2-keycloak.json
similarity index 100%
rename from testsuite/integration/src/test/resources/adapter-test/tenant2-keycloak.json
rename to testsuite/integration-deprecated/src/test/resources/adapter-test/tenant2-keycloak.json
diff --git a/testsuite/integration/src/test/resources/adapter-test/tenant2-realm.json b/testsuite/integration-deprecated/src/test/resources/adapter-test/tenant2-realm.json
similarity index 100%
rename from testsuite/integration/src/test/resources/adapter-test/tenant2-realm.json
rename to testsuite/integration-deprecated/src/test/resources/adapter-test/tenant2-realm.json
diff --git a/testsuite/integration/src/test/resources/authorization-test/keycloak.json b/testsuite/integration-deprecated/src/test/resources/authorization-test/keycloak.json
similarity index 100%
rename from testsuite/integration/src/test/resources/authorization-test/keycloak.json
rename to testsuite/integration-deprecated/src/test/resources/authorization-test/keycloak.json
diff --git a/testsuite/integration/src/test/resources/authorization-test/test-photoz-realm.json b/testsuite/integration-deprecated/src/test/resources/authorization-test/test-photoz-realm.json
similarity index 100%
rename from testsuite/integration/src/test/resources/authorization-test/test-photoz-realm.json
rename to testsuite/integration-deprecated/src/test/resources/authorization-test/test-photoz-realm.json
diff --git a/testsuite/integration/src/test/resources/broker-test/realm-with-oidc-property-mappers.json b/testsuite/integration-deprecated/src/test/resources/broker-test/realm-with-oidc-property-mappers.json
similarity index 100%
rename from testsuite/integration/src/test/resources/broker-test/realm-with-oidc-property-mappers.json
rename to testsuite/integration-deprecated/src/test/resources/broker-test/realm-with-oidc-property-mappers.json
diff --git a/testsuite/integration/src/test/resources/broker-test/realm-with-saml-property-mappers.json b/testsuite/integration-deprecated/src/test/resources/broker-test/realm-with-saml-property-mappers.json
similarity index 100%
rename from testsuite/integration/src/test/resources/broker-test/realm-with-saml-property-mappers.json
rename to testsuite/integration-deprecated/src/test/resources/broker-test/realm-with-saml-property-mappers.json
diff --git a/testsuite/integration/src/test/resources/broker-test/test-app-keycloak.json b/testsuite/integration-deprecated/src/test/resources/broker-test/test-app-keycloak.json
similarity index 100%
rename from testsuite/integration/src/test/resources/broker-test/test-app-keycloak.json
rename to testsuite/integration-deprecated/src/test/resources/broker-test/test-app-keycloak.json
diff --git a/testsuite/integration/src/test/resources/broker-test/test-broker-realm-with-kc-oidc.json b/testsuite/integration-deprecated/src/test/resources/broker-test/test-broker-realm-with-kc-oidc.json
similarity index 100%
rename from testsuite/integration/src/test/resources/broker-test/test-broker-realm-with-kc-oidc.json
rename to testsuite/integration-deprecated/src/test/resources/broker-test/test-broker-realm-with-kc-oidc.json
diff --git a/testsuite/integration/src/test/resources/broker-test/test-broker-realm-with-saml-with-signature.json b/testsuite/integration-deprecated/src/test/resources/broker-test/test-broker-realm-with-saml-with-signature.json
similarity index 100%
rename from testsuite/integration/src/test/resources/broker-test/test-broker-realm-with-saml-with-signature.json
rename to testsuite/integration-deprecated/src/test/resources/broker-test/test-broker-realm-with-saml-with-signature.json
diff --git a/testsuite/integration/src/test/resources/broker-test/test-broker-realm-with-saml.json b/testsuite/integration-deprecated/src/test/resources/broker-test/test-broker-realm-with-saml.json
similarity index 100%
rename from testsuite/integration/src/test/resources/broker-test/test-broker-realm-with-saml.json
rename to testsuite/integration-deprecated/src/test/resources/broker-test/test-broker-realm-with-saml.json
diff --git a/testsuite/integration/src/test/resources/broker-test/test-realm-with-broker.json b/testsuite/integration-deprecated/src/test/resources/broker-test/test-realm-with-broker.json
similarity index 100%
rename from testsuite/integration/src/test/resources/broker-test/test-realm-with-broker.json
rename to testsuite/integration-deprecated/src/test/resources/broker-test/test-realm-with-broker.json
diff --git a/testsuite/integration/src/test/resources/client-auth-test/keystore-client1.jks b/testsuite/integration-deprecated/src/test/resources/client-auth-test/keystore-client1.jks
similarity index 100%
rename from testsuite/integration/src/test/resources/client-auth-test/keystore-client1.jks
rename to testsuite/integration-deprecated/src/test/resources/client-auth-test/keystore-client1.jks
diff --git a/testsuite/integration/src/test/resources/client-auth-test/keystore-client2.jks b/testsuite/integration-deprecated/src/test/resources/client-auth-test/keystore-client2.jks
similarity index 100%
rename from testsuite/integration/src/test/resources/client-auth-test/keystore-client2.jks
rename to testsuite/integration-deprecated/src/test/resources/client-auth-test/keystore-client2.jks
diff --git a/testsuite/integration/src/test/resources/client-auth-test/keystore-client2.p12 b/testsuite/integration-deprecated/src/test/resources/client-auth-test/keystore-client2.p12
similarity index 100%
rename from testsuite/integration/src/test/resources/client-auth-test/keystore-client2.p12
rename to testsuite/integration-deprecated/src/test/resources/client-auth-test/keystore-client2.p12
diff --git a/testsuite/integration/src/test/resources/jaxrs-test/jaxrs-keycloak-basicauth.json b/testsuite/integration-deprecated/src/test/resources/jaxrs-test/jaxrs-keycloak-basicauth.json
similarity index 100%
rename from testsuite/integration/src/test/resources/jaxrs-test/jaxrs-keycloak-basicauth.json
rename to testsuite/integration-deprecated/src/test/resources/jaxrs-test/jaxrs-keycloak-basicauth.json
diff --git a/testsuite/integration/src/test/resources/jaxrs-test/jaxrs-keycloak-relative.json b/testsuite/integration-deprecated/src/test/resources/jaxrs-test/jaxrs-keycloak-relative.json
similarity index 100%
rename from testsuite/integration/src/test/resources/jaxrs-test/jaxrs-keycloak-relative.json
rename to testsuite/integration-deprecated/src/test/resources/jaxrs-test/jaxrs-keycloak-relative.json
diff --git a/testsuite/integration/src/test/resources/jaxrs-test/jaxrs-keycloak-resource-mappings.json b/testsuite/integration-deprecated/src/test/resources/jaxrs-test/jaxrs-keycloak-resource-mappings.json
similarity index 100%
rename from testsuite/integration/src/test/resources/jaxrs-test/jaxrs-keycloak-resource-mappings.json
rename to testsuite/integration-deprecated/src/test/resources/jaxrs-test/jaxrs-keycloak-resource-mappings.json
diff --git a/testsuite/integration/src/test/resources/jaxrs-test/jaxrs-keycloak-ssl.json b/testsuite/integration-deprecated/src/test/resources/jaxrs-test/jaxrs-keycloak-ssl.json
similarity index 100%
rename from testsuite/integration/src/test/resources/jaxrs-test/jaxrs-keycloak-ssl.json
rename to testsuite/integration-deprecated/src/test/resources/jaxrs-test/jaxrs-keycloak-ssl.json
diff --git a/testsuite/integration/src/test/resources/jaxrs-test/jaxrs-keycloak.json b/testsuite/integration-deprecated/src/test/resources/jaxrs-test/jaxrs-keycloak.json
similarity index 100%
rename from testsuite/integration/src/test/resources/jaxrs-test/jaxrs-keycloak.json
rename to testsuite/integration-deprecated/src/test/resources/jaxrs-test/jaxrs-keycloak.json
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/bad-assertion-signed-post/WEB-INF/keycloak-saml.xml b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/bad-assertion-signed-post/WEB-INF/keycloak-saml.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/bad-assertion-signed-post/WEB-INF/keycloak-saml.xml
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/bad-assertion-signed-post/WEB-INF/keycloak-saml.xml
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/bad-assertion-signed-post/WEB-INF/keystore.jks b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/bad-assertion-signed-post/WEB-INF/keystore.jks
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/bad-assertion-signed-post/WEB-INF/keystore.jks
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/bad-assertion-signed-post/WEB-INF/keystore.jks
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/keycloak-saml.xml b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/keycloak-saml.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/keycloak-saml.xml
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/keycloak-saml.xml
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/keystore.jks b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/keystore.jks
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/keystore.jks
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/keystore.jks
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/keycloak-saml.xml b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/keycloak-saml.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/keycloak-saml.xml
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/keycloak-saml.xml
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/keystore.jks b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/keystore.jks
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/keystore.jks
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/keystore.jks
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/ecp/ecp-sp/WEB-INF/keycloak-saml.xml b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/ecp/ecp-sp/WEB-INF/keycloak-saml.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/ecp/ecp-sp/WEB-INF/keycloak-saml.xml
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/ecp/ecp-sp/WEB-INF/keycloak-saml.xml
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/ecp/ecp-sp/WEB-INF/keystore.jks b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/ecp/ecp-sp/WEB-INF/keystore.jks
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/ecp/ecp-sp/WEB-INF/keystore.jks
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/ecp/ecp-sp/WEB-INF/keystore.jks
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/ecp/testsamlecp.json b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/ecp/testsamlecp.json
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/ecp/testsamlecp.json
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/ecp/testsamlecp.json
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/keycloak-saml.xml b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/keycloak-saml.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/keycloak-saml.xml
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/keycloak-saml.xml
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/keystore.jks b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/keystore.jks
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/keystore.jks
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/keystore.jks
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/mappers/WEB-INF/keycloak-saml.xml b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/mappers/WEB-INF/keycloak-saml.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/mappers/WEB-INF/keycloak-saml.xml
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/mappers/WEB-INF/keycloak-saml.xml
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/missing-assertion-sig/WEB-INF/keycloak-saml.xml b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/missing-assertion-sig/WEB-INF/keycloak-saml.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/missing-assertion-sig/WEB-INF/keycloak-saml.xml
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/missing-assertion-sig/WEB-INF/keycloak-saml.xml
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/missing-assertion-sig/WEB-INF/keystore.jks b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/missing-assertion-sig/WEB-INF/keystore.jks
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/missing-assertion-sig/WEB-INF/keystore.jks
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/missing-assertion-sig/WEB-INF/keystore.jks
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/sales-post-assertion-and-response-sig/WEB-INF/keycloak-saml.xml b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/sales-post-assertion-and-response-sig/WEB-INF/keycloak-saml.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/sales-post-assertion-and-response-sig/WEB-INF/keycloak-saml.xml
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/sales-post-assertion-and-response-sig/WEB-INF/keycloak-saml.xml
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/sales-post-assertion-and-response-sig/WEB-INF/keystore.jks b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/sales-post-assertion-and-response-sig/WEB-INF/keystore.jks
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/sales-post-assertion-and-response-sig/WEB-INF/keystore.jks
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/sales-post-assertion-and-response-sig/WEB-INF/keystore.jks
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/keycloak-saml.xml b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/keycloak-saml.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/keycloak-saml.xml
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/keycloak-saml.xml
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/keystore.jks b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/keystore.jks
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/keystore.jks
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/keystore.jks
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/signed-get/WEB-INF/keycloak-saml.xml b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-get/WEB-INF/keycloak-saml.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/signed-get/WEB-INF/keycloak-saml.xml
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-get/WEB-INF/keycloak-saml.xml
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/signed-get/WEB-INF/keystore.jks b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-get/WEB-INF/keystore.jks
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/signed-get/WEB-INF/keystore.jks
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-get/WEB-INF/keystore.jks
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/keycloak-saml.xml b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/keycloak-saml.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/keycloak-saml.xml
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/keycloak-saml.xml
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/keystore.jks b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/keystore.jks
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/keystore.jks
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/keystore.jks
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/keycloak-saml.xml b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/keycloak-saml.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/keycloak-saml.xml
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/keycloak-saml.xml
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/keystore.jks b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/keystore.jks
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/keystore.jks
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/keystore.jks
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/keycloak-saml.xml b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/keycloak-saml.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/keycloak-saml.xml
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/keycloak-saml.xml
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/keystore.jks b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/keystore.jks
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/keystore.jks
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/keystore.jks
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/keycloak-saml.xml b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/keycloak-saml.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/keycloak-saml.xml
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/keycloak-saml.xml
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/keystore.jks b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/keystore.jks
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/keystore.jks
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/keystore.jks
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/signed-post/WEB-INF/keycloak-saml.xml b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-post/WEB-INF/keycloak-saml.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/signed-post/WEB-INF/keycloak-saml.xml
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-post/WEB-INF/keycloak-saml.xml
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/signed-post/WEB-INF/keystore.jks b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-post/WEB-INF/keystore.jks
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/signed-post/WEB-INF/keystore.jks
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/signed-post/WEB-INF/keystore.jks
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/simple-input/WEB-INF/keycloak-saml.xml b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/simple-input/WEB-INF/keycloak-saml.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/simple-input/WEB-INF/keycloak-saml.xml
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/simple-input/WEB-INF/keycloak-saml.xml
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/simple-post-passive/WEB-INF/keycloak-saml.xml b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/simple-post-passive/WEB-INF/keycloak-saml.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/simple-post-passive/WEB-INF/keycloak-saml.xml
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/simple-post-passive/WEB-INF/keycloak-saml.xml
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/simple-post/WEB-INF/keycloak-saml.xml b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/simple-post/WEB-INF/keycloak-saml.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/simple-post/WEB-INF/keycloak-saml.xml
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/simple-post/WEB-INF/keycloak-saml.xml
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/simple-post2/WEB-INF/keycloak-saml.xml b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/simple-post2/WEB-INF/keycloak-saml.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/simple-post2/WEB-INF/keycloak-saml.xml
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/simple-post2/WEB-INF/keycloak-saml.xml
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/sp-metadata-email-nameid.xml b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/sp-metadata-email-nameid.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/sp-metadata-email-nameid.xml
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/sp-metadata-email-nameid.xml
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/sp-metadata.xml b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/sp-metadata.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/sp-metadata.xml
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/sp-metadata.xml
diff --git a/testsuite/integration/src/test/resources/keycloak-saml/testsaml.json b/testsuite/integration-deprecated/src/test/resources/keycloak-saml/testsaml.json
similarity index 100%
rename from testsuite/integration/src/test/resources/keycloak-saml/testsaml.json
rename to testsuite/integration-deprecated/src/test/resources/keycloak-saml/testsaml.json
diff --git a/testsuite/integration/src/test/resources/ldap/fed-provider-export.json b/testsuite/integration-deprecated/src/test/resources/ldap/fed-provider-export.json
similarity index 99%
rename from testsuite/integration/src/test/resources/ldap/fed-provider-export.json
rename to testsuite/integration-deprecated/src/test/resources/ldap/fed-provider-export.json
index 4bbe374dbb7..9fdd5c088a8 100644
--- a/testsuite/integration/src/test/resources/ldap/fed-provider-export.json
+++ b/testsuite/integration-deprecated/src/test/resources/ldap/fed-provider-export.json
@@ -97,7 +97,7 @@
         "serverPrincipal": "HTTP/localhost@KEYCLOAK.ORG",
         "debug": "true",
         "pagination": "true",
-        "keyTab": "/Users/williamburke/jboss/keycloak/p1b-repo/keycloak/testsuite/integration/target/test-classes/kerberos/http.keytab",
+        "keyTab": "/Users/williamburke/jboss/keycloak/p1b-repo/keycloak/testsuite/integration-deprecated/target/test-classes/kerberos/http.keytab",
         "connectionPooling": "true",
         "usersDn": "ou=People,dc=keycloak,dc=org",
         "useKerberosForPasswordAuthentication": "false",
diff --git a/testsuite/integration/src/test/resources/ldap/ldap-app-keycloak.json b/testsuite/integration-deprecated/src/test/resources/ldap/ldap-app-keycloak.json
similarity index 100%
rename from testsuite/integration/src/test/resources/ldap/ldap-app-keycloak.json
rename to testsuite/integration-deprecated/src/test/resources/ldap/ldap-app-keycloak.json
diff --git a/testsuite/integration/src/test/resources/ldap/ldap-connection.properties b/testsuite/integration-deprecated/src/test/resources/ldap/ldap-connection.properties
similarity index 100%
rename from testsuite/integration/src/test/resources/ldap/ldap-connection.properties
rename to testsuite/integration-deprecated/src/test/resources/ldap/ldap-connection.properties
diff --git a/testsuite/integration/src/test/resources/ldap/users.ldif b/testsuite/integration-deprecated/src/test/resources/ldap/users.ldif
similarity index 100%
rename from testsuite/integration/src/test/resources/ldap/users.ldif
rename to testsuite/integration-deprecated/src/test/resources/ldap/users.ldif
diff --git a/testsuite/integration/src/test/resources/log4j.properties b/testsuite/integration-deprecated/src/test/resources/log4j.properties
similarity index 100%
rename from testsuite/integration/src/test/resources/log4j.properties
rename to testsuite/integration-deprecated/src/test/resources/log4j.properties
diff --git a/testsuite/integration/src/test/resources/model/testcomposites.json b/testsuite/integration-deprecated/src/test/resources/model/testcomposites.json
similarity index 100%
rename from testsuite/integration/src/test/resources/model/testcomposites.json
rename to testsuite/integration-deprecated/src/test/resources/model/testcomposites.json
diff --git a/testsuite/integration/src/test/resources/model/testrealm-demo.json b/testsuite/integration-deprecated/src/test/resources/model/testrealm-demo.json
similarity index 100%
rename from testsuite/integration/src/test/resources/model/testrealm-demo.json
rename to testsuite/integration-deprecated/src/test/resources/model/testrealm-demo.json
diff --git a/testsuite/integration/src/test/resources/model/testrealm-noclient-id.json b/testsuite/integration-deprecated/src/test/resources/model/testrealm-noclient-id.json
similarity index 100%
rename from testsuite/integration/src/test/resources/model/testrealm-noclient-id.json
rename to testsuite/integration-deprecated/src/test/resources/model/testrealm-noclient-id.json
diff --git a/testsuite/integration/src/test/resources/model/testrealm.json b/testsuite/integration-deprecated/src/test/resources/model/testrealm.json
similarity index 100%
rename from testsuite/integration/src/test/resources/model/testrealm.json
rename to testsuite/integration-deprecated/src/test/resources/model/testrealm.json
diff --git a/testsuite/integration/src/test/resources/model/testrealm2.json b/testsuite/integration-deprecated/src/test/resources/model/testrealm2.json
similarity index 100%
rename from testsuite/integration/src/test/resources/model/testrealm2.json
rename to testsuite/integration-deprecated/src/test/resources/model/testrealm2.json
diff --git a/testsuite/integration/src/test/resources/oidc/offline-client-keycloak.json b/testsuite/integration-deprecated/src/test/resources/oidc/offline-client-keycloak.json
similarity index 100%
rename from testsuite/integration/src/test/resources/oidc/offline-client-keycloak.json
rename to testsuite/integration-deprecated/src/test/resources/oidc/offline-client-keycloak.json
diff --git a/testsuite/integration/src/test/resources/org/keycloak/testsuite/excluded/keycloak.json b/testsuite/integration-deprecated/src/test/resources/org/keycloak/testsuite/excluded/keycloak.json
similarity index 100%
rename from testsuite/integration/src/test/resources/org/keycloak/testsuite/excluded/keycloak.json
rename to testsuite/integration-deprecated/src/test/resources/org/keycloak/testsuite/excluded/keycloak.json
diff --git a/testsuite/integration/src/test/resources/saml/bad-client-signed-post/WEB-INF/keystore.jks b/testsuite/integration-deprecated/src/test/resources/saml/bad-client-signed-post/WEB-INF/keystore.jks
similarity index 100%
rename from testsuite/integration/src/test/resources/saml/bad-client-signed-post/WEB-INF/keystore.jks
rename to testsuite/integration-deprecated/src/test/resources/saml/bad-client-signed-post/WEB-INF/keystore.jks
diff --git a/testsuite/integration/src/test/resources/saml/bad-client-signed-post/WEB-INF/picketlink.xml b/testsuite/integration-deprecated/src/test/resources/saml/bad-client-signed-post/WEB-INF/picketlink.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/saml/bad-client-signed-post/WEB-INF/picketlink.xml
rename to testsuite/integration-deprecated/src/test/resources/saml/bad-client-signed-post/WEB-INF/picketlink.xml
diff --git a/testsuite/integration/src/test/resources/saml/bad-realm-signed-post/WEB-INF/keystore.jks b/testsuite/integration-deprecated/src/test/resources/saml/bad-realm-signed-post/WEB-INF/keystore.jks
similarity index 100%
rename from testsuite/integration/src/test/resources/saml/bad-realm-signed-post/WEB-INF/keystore.jks
rename to testsuite/integration-deprecated/src/test/resources/saml/bad-realm-signed-post/WEB-INF/keystore.jks
diff --git a/testsuite/integration/src/test/resources/saml/bad-realm-signed-post/WEB-INF/picketlink.xml b/testsuite/integration-deprecated/src/test/resources/saml/bad-realm-signed-post/WEB-INF/picketlink.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/saml/bad-realm-signed-post/WEB-INF/picketlink.xml
rename to testsuite/integration-deprecated/src/test/resources/saml/bad-realm-signed-post/WEB-INF/picketlink.xml
diff --git a/testsuite/integration/src/test/resources/saml/encrypted-post/WEB-INF/keystore.jks b/testsuite/integration-deprecated/src/test/resources/saml/encrypted-post/WEB-INF/keystore.jks
similarity index 100%
rename from testsuite/integration/src/test/resources/saml/encrypted-post/WEB-INF/keystore.jks
rename to testsuite/integration-deprecated/src/test/resources/saml/encrypted-post/WEB-INF/keystore.jks
diff --git a/testsuite/integration/src/test/resources/saml/encrypted-post/WEB-INF/picketlink.xml b/testsuite/integration-deprecated/src/test/resources/saml/encrypted-post/WEB-INF/picketlink.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/saml/encrypted-post/WEB-INF/picketlink.xml
rename to testsuite/integration-deprecated/src/test/resources/saml/encrypted-post/WEB-INF/picketlink.xml
diff --git a/testsuite/integration/src/test/resources/saml/signed-front-get/WEB-INF/keystore.jks b/testsuite/integration-deprecated/src/test/resources/saml/signed-front-get/WEB-INF/keystore.jks
similarity index 100%
rename from testsuite/integration/src/test/resources/saml/signed-front-get/WEB-INF/keystore.jks
rename to testsuite/integration-deprecated/src/test/resources/saml/signed-front-get/WEB-INF/keystore.jks
diff --git a/testsuite/integration/src/test/resources/saml/signed-front-get/WEB-INF/picketlink.xml b/testsuite/integration-deprecated/src/test/resources/saml/signed-front-get/WEB-INF/picketlink.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/saml/signed-front-get/WEB-INF/picketlink.xml
rename to testsuite/integration-deprecated/src/test/resources/saml/signed-front-get/WEB-INF/picketlink.xml
diff --git a/testsuite/integration/src/test/resources/saml/signed-get/WEB-INF/keystore.jks b/testsuite/integration-deprecated/src/test/resources/saml/signed-get/WEB-INF/keystore.jks
similarity index 100%
rename from testsuite/integration/src/test/resources/saml/signed-get/WEB-INF/keystore.jks
rename to testsuite/integration-deprecated/src/test/resources/saml/signed-get/WEB-INF/keystore.jks
diff --git a/testsuite/integration/src/test/resources/saml/signed-get/WEB-INF/picketlink.xml b/testsuite/integration-deprecated/src/test/resources/saml/signed-get/WEB-INF/picketlink.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/saml/signed-get/WEB-INF/picketlink.xml
rename to testsuite/integration-deprecated/src/test/resources/saml/signed-get/WEB-INF/picketlink.xml
diff --git a/testsuite/integration/src/test/resources/saml/signed-metadata/WEB-INF/keystore.jks b/testsuite/integration-deprecated/src/test/resources/saml/signed-metadata/WEB-INF/keystore.jks
similarity index 100%
rename from testsuite/integration/src/test/resources/saml/signed-metadata/WEB-INF/keystore.jks
rename to testsuite/integration-deprecated/src/test/resources/saml/signed-metadata/WEB-INF/keystore.jks
diff --git a/testsuite/integration/src/test/resources/saml/signed-metadata/WEB-INF/picketlink.xml b/testsuite/integration-deprecated/src/test/resources/saml/signed-metadata/WEB-INF/picketlink.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/saml/signed-metadata/WEB-INF/picketlink.xml
rename to testsuite/integration-deprecated/src/test/resources/saml/signed-metadata/WEB-INF/picketlink.xml
diff --git a/testsuite/integration/src/test/resources/saml/signed-post-email/WEB-INF/keystore.jks b/testsuite/integration-deprecated/src/test/resources/saml/signed-post-email/WEB-INF/keystore.jks
similarity index 100%
rename from testsuite/integration/src/test/resources/saml/signed-post-email/WEB-INF/keystore.jks
rename to testsuite/integration-deprecated/src/test/resources/saml/signed-post-email/WEB-INF/keystore.jks
diff --git a/testsuite/integration/src/test/resources/saml/signed-post-email/WEB-INF/picketlink.xml b/testsuite/integration-deprecated/src/test/resources/saml/signed-post-email/WEB-INF/picketlink.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/saml/signed-post-email/WEB-INF/picketlink.xml
rename to testsuite/integration-deprecated/src/test/resources/saml/signed-post-email/WEB-INF/picketlink.xml
diff --git a/testsuite/integration/src/test/resources/saml/signed-post-persistent/WEB-INF/keystore.jks b/testsuite/integration-deprecated/src/test/resources/saml/signed-post-persistent/WEB-INF/keystore.jks
similarity index 100%
rename from testsuite/integration/src/test/resources/saml/signed-post-persistent/WEB-INF/keystore.jks
rename to testsuite/integration-deprecated/src/test/resources/saml/signed-post-persistent/WEB-INF/keystore.jks
diff --git a/testsuite/integration/src/test/resources/saml/signed-post-persistent/WEB-INF/picketlink.xml b/testsuite/integration-deprecated/src/test/resources/saml/signed-post-persistent/WEB-INF/picketlink.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/saml/signed-post-persistent/WEB-INF/picketlink.xml
rename to testsuite/integration-deprecated/src/test/resources/saml/signed-post-persistent/WEB-INF/picketlink.xml
diff --git a/testsuite/integration/src/test/resources/saml/signed-post-transient/WEB-INF/keystore.jks b/testsuite/integration-deprecated/src/test/resources/saml/signed-post-transient/WEB-INF/keystore.jks
similarity index 100%
rename from testsuite/integration/src/test/resources/saml/signed-post-transient/WEB-INF/keystore.jks
rename to testsuite/integration-deprecated/src/test/resources/saml/signed-post-transient/WEB-INF/keystore.jks
diff --git a/testsuite/integration/src/test/resources/saml/signed-post-transient/WEB-INF/picketlink.xml b/testsuite/integration-deprecated/src/test/resources/saml/signed-post-transient/WEB-INF/picketlink.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/saml/signed-post-transient/WEB-INF/picketlink.xml
rename to testsuite/integration-deprecated/src/test/resources/saml/signed-post-transient/WEB-INF/picketlink.xml
diff --git a/testsuite/integration/src/test/resources/saml/signed-post/WEB-INF/keystore.jks b/testsuite/integration-deprecated/src/test/resources/saml/signed-post/WEB-INF/keystore.jks
similarity index 100%
rename from testsuite/integration/src/test/resources/saml/signed-post/WEB-INF/keystore.jks
rename to testsuite/integration-deprecated/src/test/resources/saml/signed-post/WEB-INF/keystore.jks
diff --git a/testsuite/integration/src/test/resources/saml/signed-post/WEB-INF/picketlink.xml b/testsuite/integration-deprecated/src/test/resources/saml/signed-post/WEB-INF/picketlink.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/saml/signed-post/WEB-INF/picketlink.xml
rename to testsuite/integration-deprecated/src/test/resources/saml/signed-post/WEB-INF/picketlink.xml
diff --git a/testsuite/integration/src/test/resources/saml/simple-get/WEB-INF/picketlink.xml b/testsuite/integration-deprecated/src/test/resources/saml/simple-get/WEB-INF/picketlink.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/saml/simple-get/WEB-INF/picketlink.xml
rename to testsuite/integration-deprecated/src/test/resources/saml/simple-get/WEB-INF/picketlink.xml
diff --git a/testsuite/integration/src/test/resources/saml/simple-post/WEB-INF/picketlink.xml b/testsuite/integration-deprecated/src/test/resources/saml/simple-post/WEB-INF/picketlink.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/saml/simple-post/WEB-INF/picketlink.xml
rename to testsuite/integration-deprecated/src/test/resources/saml/simple-post/WEB-INF/picketlink.xml
diff --git a/testsuite/integration/src/test/resources/saml/sp-metadata.xml b/testsuite/integration-deprecated/src/test/resources/saml/sp-metadata.xml
similarity index 100%
rename from testsuite/integration/src/test/resources/saml/sp-metadata.xml
rename to testsuite/integration-deprecated/src/test/resources/saml/sp-metadata.xml
diff --git a/testsuite/integration/src/test/resources/saml/testsaml.json b/testsuite/integration-deprecated/src/test/resources/saml/testsaml.json
similarity index 100%
rename from testsuite/integration/src/test/resources/saml/testsaml.json
rename to testsuite/integration-deprecated/src/test/resources/saml/testsaml.json
diff --git a/testsuite/integration/src/test/resources/storage-test/read-only-user-password.properties b/testsuite/integration-deprecated/src/test/resources/storage-test/read-only-user-password.properties
similarity index 100%
rename from testsuite/integration/src/test/resources/storage-test/read-only-user-password.properties
rename to testsuite/integration-deprecated/src/test/resources/storage-test/read-only-user-password.properties
diff --git a/testsuite/integration/src/test/resources/storage-test/user-password.properties b/testsuite/integration-deprecated/src/test/resources/storage-test/user-password.properties
similarity index 100%
rename from testsuite/integration/src/test/resources/storage-test/user-password.properties
rename to testsuite/integration-deprecated/src/test/resources/storage-test/user-password.properties
diff --git a/testsuite/integration/src/test/resources/testcomposite.json b/testsuite/integration-deprecated/src/test/resources/testcomposite.json
similarity index 100%
rename from testsuite/integration/src/test/resources/testcomposite.json
rename to testsuite/integration-deprecated/src/test/resources/testcomposite.json
diff --git a/testsuite/integration/src/test/resources/testrealm.json b/testsuite/integration-deprecated/src/test/resources/testrealm.json
similarity index 100%
rename from testsuite/integration/src/test/resources/testrealm.json
rename to testsuite/integration-deprecated/src/test/resources/testrealm.json
diff --git a/testsuite/jetty/jetty81/pom.xml b/testsuite/jetty/jetty81/pom.xml
index 9b42a06aabb..5c6ef1d27c9 100755
--- a/testsuite/jetty/jetty81/pom.xml
+++ b/testsuite/jetty/jetty81/pom.xml
@@ -209,12 +209,12 @@
         </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-           <artifactId>keycloak-testsuite-integration</artifactId>
+           <artifactId>keycloak-testsuite-integration-deprecated</artifactId>
            <scope>test</scope>
        </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-           <artifactId>keycloak-testsuite-integration</artifactId>
+           <artifactId>keycloak-testsuite-integration-deprecated</artifactId>
            <type>test-jar</type>
            <scope>test</scope>
        </dependency>
diff --git a/testsuite/jetty/jetty91/pom.xml b/testsuite/jetty/jetty91/pom.xml
index 9bf3bb049c5..61dd1924dc3 100755
--- a/testsuite/jetty/jetty91/pom.xml
+++ b/testsuite/jetty/jetty91/pom.xml
@@ -209,12 +209,12 @@
         </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-           <artifactId>keycloak-testsuite-integration</artifactId>
+           <artifactId>keycloak-testsuite-integration-deprecated</artifactId>
            <scope>test</scope>
        </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-           <artifactId>keycloak-testsuite-integration</artifactId>
+           <artifactId>keycloak-testsuite-integration-deprecated</artifactId>
            <type>test-jar</type>
            <scope>test</scope>
        </dependency>
diff --git a/testsuite/jetty/jetty92/pom.xml b/testsuite/jetty/jetty92/pom.xml
index b837fb74949..ae100a187ea 100755
--- a/testsuite/jetty/jetty92/pom.xml
+++ b/testsuite/jetty/jetty92/pom.xml
@@ -209,12 +209,12 @@
         </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-           <artifactId>keycloak-testsuite-integration</artifactId>
+           <artifactId>keycloak-testsuite-integration-deprecated</artifactId>
            <scope>test</scope>
        </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-           <artifactId>keycloak-testsuite-integration</artifactId>
+           <artifactId>keycloak-testsuite-integration-deprecated</artifactId>
            <type>test-jar</type>
            <scope>test</scope>
        </dependency>
diff --git a/testsuite/jetty/jetty93/pom.xml b/testsuite/jetty/jetty93/pom.xml
index efdbcb4bd8e..00131cf8a99 100644
--- a/testsuite/jetty/jetty93/pom.xml
+++ b/testsuite/jetty/jetty93/pom.xml
@@ -209,12 +209,12 @@
         </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-           <artifactId>keycloak-testsuite-integration</artifactId>
+           <artifactId>keycloak-testsuite-integration-deprecated</artifactId>
            <scope>test</scope>
        </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-           <artifactId>keycloak-testsuite-integration</artifactId>
+           <artifactId>keycloak-testsuite-integration-deprecated</artifactId>
            <type>test-jar</type>
            <scope>test</scope>
        </dependency>
diff --git a/testsuite/jetty/jetty94/pom.xml b/testsuite/jetty/jetty94/pom.xml
index a015c31dff2..c768e4bfc49 100644
--- a/testsuite/jetty/jetty94/pom.xml
+++ b/testsuite/jetty/jetty94/pom.xml
@@ -209,12 +209,12 @@
         </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-           <artifactId>keycloak-testsuite-integration</artifactId>
+           <artifactId>keycloak-testsuite-integration-deprecated</artifactId>
            <scope>test</scope>
        </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-           <artifactId>keycloak-testsuite-integration</artifactId>
+           <artifactId>keycloak-testsuite-integration-deprecated</artifactId>
            <type>test-jar</type>
            <scope>test</scope>
        </dependency>
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index 633587a8b6e..d734b9c0032 100755
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -50,7 +50,7 @@
         </plugins>
     </build>
     <modules>
-        <module>integration</module>
+        <module>integration-deprecated</module>
         <module>tomcat8</module>
         <module>integration-arquillian</module>
         <module>utils</module>
diff --git a/testsuite/proxy/pom.xml b/testsuite/proxy/pom.xml
index f2cbe39553c..03b4c2cbc5b 100755
--- a/testsuite/proxy/pom.xml
+++ b/testsuite/proxy/pom.xml
@@ -200,12 +200,12 @@
         </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-           <artifactId>keycloak-testsuite-integration</artifactId>
+           <artifactId>keycloak-testsuite-integration-deprecated</artifactId>
            <scope>test</scope>
        </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-           <artifactId>keycloak-testsuite-integration</artifactId>
+           <artifactId>keycloak-testsuite-integration-deprecated</artifactId>
            <type>test-jar</type>
            <scope>test</scope>
        </dependency>
diff --git a/testsuite/tomcat6/pom.xml b/testsuite/tomcat6/pom.xml
index e27ed7b2927..e955839d3f7 100755
--- a/testsuite/tomcat6/pom.xml
+++ b/testsuite/tomcat6/pom.xml
@@ -203,12 +203,12 @@
         </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-           <artifactId>keycloak-testsuite-integration</artifactId>
+           <artifactId>keycloak-testsuite-integration-deprecated</artifactId>
            <scope>test</scope>
        </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-           <artifactId>keycloak-testsuite-integration</artifactId>
+           <artifactId>keycloak-testsuite-integration-deprecated</artifactId>
            <type>test-jar</type>
            <scope>test</scope>
        </dependency>
diff --git a/testsuite/tomcat7/pom.xml b/testsuite/tomcat7/pom.xml
index fc516d489b3..0e0b623eb90 100755
--- a/testsuite/tomcat7/pom.xml
+++ b/testsuite/tomcat7/pom.xml
@@ -235,12 +235,12 @@
         </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-           <artifactId>keycloak-testsuite-integration</artifactId>
+           <artifactId>keycloak-testsuite-integration-deprecated</artifactId>
            <scope>test</scope>
        </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-           <artifactId>keycloak-testsuite-integration</artifactId>
+           <artifactId>keycloak-testsuite-integration-deprecated</artifactId>
            <type>test-jar</type>
            <scope>test</scope>
        </dependency>
diff --git a/testsuite/tomcat8/pom.xml b/testsuite/tomcat8/pom.xml
index b86c52f610e..f515d1b31a8 100755
--- a/testsuite/tomcat8/pom.xml
+++ b/testsuite/tomcat8/pom.xml
@@ -207,12 +207,12 @@
         </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-           <artifactId>keycloak-testsuite-integration</artifactId>
+           <artifactId>keycloak-testsuite-integration-deprecated</artifactId>
            <scope>test</scope>
        </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-           <artifactId>keycloak-testsuite-integration</artifactId>
+           <artifactId>keycloak-testsuite-integration-deprecated</artifactId>
            <type>test-jar</type>
            <scope>test</scope>
        </dependency>
diff --git a/travis-run-tests.sh b/travis-run-tests.sh
index 4d4f905bdb3..e3506cf2d12 100755
--- a/travis-run-tests.sh
+++ b/travis-run-tests.sh
@@ -13,7 +13,7 @@ mvn install -B -nsu -Pdistribution -DskipTests -Dorg.slf4j.simpleLogger.log.org.
 
 if [ $1 == "old" ]; then
     cd testsuite
-    mvn test -B -nsu -f integration
+    mvn test -B -nsu -f integration-deprecated
     mvn test -B -nsu -f jetty
     mvn test -B -nsu -f tomcat7
     mvn test -B -nsu -f tomcat8