diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 684eae6361b..a5c81413ae4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -341,6 +341,9 @@ jobs:
       - name: Prepare Quarkus distribution with current JDK
         run: ./mvnw install -e -pl testsuite/integration-arquillian/servers/auth-server/quarkus
 
+      - name: Run new base tests
+        run: ./mvnw test -f tests/pom.xml -Dtest=JDKTestSuite
+
       - name: Run base tests
         run: |
           TESTS=`testsuite/integration-arquillian/tests/base/testsuites/suite.sh jdk`
diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/server/KeycloakServerConfigBuilder.java b/test-framework/core/src/main/java/org/keycloak/testframework/server/KeycloakServerConfigBuilder.java
index d16e3d2ad99..e73b078ae33 100644
--- a/test-framework/core/src/main/java/org/keycloak/testframework/server/KeycloakServerConfigBuilder.java
+++ b/test-framework/core/src/main/java/org/keycloak/testframework/server/KeycloakServerConfigBuilder.java
@@ -147,22 +147,12 @@ public class KeycloakServerConfigBuilder {
                 option("log-console-format", format);
             }
 
-            StringBuilder logLevel = new StringBuilder();
             if (rootLevel != null) {
-                logLevel.append(rootLevel);
+                option("log-level", rootLevel);
             }
 
             for (Map.Entry<String, String> e : categoryLevels.entrySet()) {
-                if (!logLevel.isEmpty()) {
-                    logLevel.append(",");
-                }
-                logLevel.append(e.getKey());
-                logLevel.append(":");
-                logLevel.append(e.getValue());
-            }
-
-            if (!logLevel.isEmpty()) {
-                option("log-level", logLevel.toString());
+                option("log-level-" + e.getKey(), e.getValue());
             }
 
             if (color != null) {
diff --git a/tests/base/src/test/java/org/keycloak/tests/suites/JDKTestSuite.java b/tests/base/src/test/java/org/keycloak/tests/suites/JDKTestSuite.java
new file mode 100644
index 00000000000..bb952522eb2
--- /dev/null
+++ b/tests/base/src/test/java/org/keycloak/tests/suites/JDKTestSuite.java
@@ -0,0 +1,11 @@
+package org.keycloak.tests.suites;
+
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+import org.keycloak.tests.admin.AdminHeadersTest;
+
+@Suite
+// TODO: Select relevant test classes or packages once they have been migrated
+@SelectClasses(AdminHeadersTest.class)
+public class JDKTestSuite {
+}