diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ada5dd74f08..1b46646b92d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -891,6 +891,9 @@ jobs:
     needs:
       - build
     timeout-minutes: 45
+    strategy:
+      matrix:
+        suite: [Base1TestSuite, Base2TestSuite]
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
@@ -904,7 +907,7 @@ jobs:
         run: ./mvnw package -pl quarkus/server/,quarkus/dist/
 
       - name: Run tests
-        run: ./mvnw package -f tests/pom.xml
+        run: ./mvnw package -f tests/pom.xml -Dtest=${{ matrix.suite }}
 
   admin-v2-tests:
     name: Admin v2
diff --git a/tests/base/src/test/java/org/keycloak/tests/suites/Base1TestSuite.java b/tests/base/src/test/java/org/keycloak/tests/suites/Base1TestSuite.java
new file mode 100644
index 00000000000..64263c88143
--- /dev/null
+++ b/tests/base/src/test/java/org/keycloak/tests/suites/Base1TestSuite.java
@@ -0,0 +1,11 @@
+package org.keycloak.tests.suites;
+
+import org.junit.platform.suite.api.SelectPackages;
+import org.junit.platform.suite.api.Suite;
+
+@Suite
+@SelectPackages({
+        "org.keycloak.tests.admin"
+})
+public class Base1TestSuite {
+}
diff --git a/tests/base/src/test/java/org/keycloak/tests/suites/Base2TestSuite.java b/tests/base/src/test/java/org/keycloak/tests/suites/Base2TestSuite.java
new file mode 100644
index 00000000000..30dba866726
--- /dev/null
+++ b/tests/base/src/test/java/org/keycloak/tests/suites/Base2TestSuite.java
@@ -0,0 +1,19 @@
+package org.keycloak.tests.suites;
+
+import org.junit.platform.suite.api.SelectPackages;
+import org.junit.platform.suite.api.Suite;
+
+@Suite
+@SelectPackages({
+        "org.keycloak.tests.client",
+        "org.keycloak.tests.common",
+        "org.keycloak.tests.cors",
+        "org.keycloak.tests.db",
+        "org.keycloak.tests.forms",
+        "org.keycloak.tests.infinispan",
+        "org.keycloak.tests.oauth",
+        "org.keycloak.tests.tracing",
+        "org.keycloak.tests.welcomepage"
+})
+public class Base2TestSuite {
+}