diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 1e1884b355..562cca3b1c 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -99,8 +99,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ windows-latest, ubuntu-latest]
-        suite: ["glassfishAndJetty", "libertyAndTomcat", "tomeeAndWildfly", "other"]
+        os: [ windows-latest, ubuntu-latest ]
+        suite: [ "glassfish", "jetty", "liberty", "tomcat", "tomee", "wildfly", "other" ]
       fail-fast: false
     steps:
       - name: Support longpaths
diff --git a/smoke-tests/smoke-tests.gradle b/smoke-tests/smoke-tests.gradle
index 9b2bf4b4ae..a217d10cde 100644
--- a/smoke-tests/smoke-tests.gradle
+++ b/smoke-tests/smoke-tests.gradle
@@ -46,9 +46,12 @@ test {
   enabled = enabled && (System.getenv("CI") != null || findProperty('runSmokeTests'))
 
   def suites = [
-    "glassfishAndJetty": ["**/GlassFishSmokeTest.*", "**/JettySmokeTest.*"],
-    "libertyAndTomcat": ["**/LibertySmokeTest.*", "**/LibertyServletOnlySmokeTest.*", "**/TomcatSmokeTest.*"],
-    "tomeeAndWildfly": ["**/TomeeSmokeTest.*", "**/WildflySmokeTest.*"]
+    "glassfish": ["**/GlassFishSmokeTest.*"],
+    "jetty"    : ["**/JettySmokeTest.*"],
+    "liberty"  : ["**/LibertySmokeTest.*", "**/LibertyServletOnlySmokeTest.*"],
+    "tomcat"   : ["**/TomcatSmokeTest.*"],
+    "tomee"    : ["**/TomeeSmokeTest.*"],
+    "wildfly"  : ["**/WildflySmokeTest.*"]
   ]
 
   def suite = findProperty('smokeTestSuite')