diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 881d4db64a..7c0caa0195 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -160,7 +160,7 @@ jobs:
         run: |
           declare -A PARAMS TESTGROUP
           PARAMS["quarkus"]="-Pauth-server-quarkus"
-          PARAMS["undertow-map"]="-Pauth-server-undertow -Dkeycloak.client.provider=map -Dkeycloak.group.provider=map -Dkeycloak.role.provider=map -Dkeycloak.authSession.provider=map -Dkeycloak.userSession.provider=map -Dkeycloak.loginFailure.provider=map -Dkeycloak.user.provider=map -Dkeycloak.clientScope.provider=map -Dkeycloak.realm.provider=map  -Dkeycloak.authorization.provider=map -Dkeycloak.serverInfo.provider=map"
+          PARAMS["undertow-map"]="-Pauth-server-undertow -Pmap-storage"
           PARAMS["wildfly"]="-Pauth-server-wildfly"
           TESTGROUP["group1"]="-Dtest=!**.crossdc.**,!**.cluster.**,%regex[org.keycloak.testsuite.(a[abc]|ad[a-l]|[^a-q]).*]"   # Tests alphabetically before admin tests and those after "r"
           TESTGROUP["group2"]="-Dtest=!**.crossdc.**,!**.cluster.**,%regex[org.keycloak.testsuite.(ad[^a-l]|a[^a-d]|b).*]"      # Admin tests and those starting with "b"
diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml
index 8055738efa..17275e9b12 100644
--- a/testsuite/integration-arquillian/tests/base/pom.xml
+++ b/testsuite/integration-arquillian/tests/base/pom.xml
@@ -1176,6 +1176,32 @@
                 </pluginManagement>
             </build>
         </profile>
+        <profile>
+            <id>map-storage</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <keycloak.realm.provider>map</keycloak.realm.provider>
+                                <keycloak.client.provider>map</keycloak.client.provider>
+                                <keycloak.clientScope.provider>map</keycloak.clientScope.provider>
+                                <keycloak.group.provider>map</keycloak.group.provider>
+                                <keycloak.role.provider>map</keycloak.role.provider>
+                                <keycloak.user.provider>map</keycloak.user.provider>
+                                <keycloak.serverInfo.provider>map</keycloak.serverInfo.provider>
+                                <keycloak.authSession.provider>map</keycloak.authSession.provider>
+                                <keycloak.userSession.provider>map</keycloak.userSession.provider>
+                                <keycloak.loginFailure.provider>map</keycloak.loginFailure.provider>
+                                <keycloak.authorization.provider>map</keycloak.authorization.provider>
+                          </systemPropertyVariables>
+                      </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
 </project>