diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f261835ef9d8..a6bd4b2b6147 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -207,21 +207,26 @@ jobs:
   quarkus-integration-tests:
     name: Quarkus IT
     needs: [build, conditional]
-    if: needs.conditional.outputs.ci-quarkus == 'true'
     timeout-minutes: 115
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
-        server: [sanity-check-zip, zip, container, storage]
-        exclude:
+        os: [ubuntu-latest]
+        suite: [zip, container, storage, smoke]
+        full-testsuite: [${{ needs.conditional.outputs.ci-quarkus == 'true' }}]
+        # Win runs always
+        include:
           - os: windows-latest
-            server: zip
-          - os: windows-latest
-            server: container
-          - os: windows-latest
-            server: storage
-          - os: ubuntu-latest
-            server: sanity-check-zip
+            suite: win
+        # Either run smoke tests, or full testsuite
+        exclude:
+          - full-testsuite: false
+            suite: zip
+          - full-testsuite: false
+            suite: container
+          - full-testsuite: false
+            suite: storage
+          - full-testsuite: true
+            suite: smoke
       fail-fast: false
     runs-on: ${{ matrix.os }}
     env:
@@ -234,16 +239,18 @@ jobs:
         uses: ./.github/actions/unit-test-setup
 
       # Not sure why, but needs to re-build otherwise there's some failures starting up
+      # Smoke tests should cover scenarios that could be broken by changes in other modules that quarkus
       - name: Run Quarkus integration Tests
         run: |
           declare -A PARAMS
-          PARAMS["sanity-check-zip"]="-Dtest=StartCommandDistTest,StartDevCommandDistTest,BuildAndStartDistTest,ImportAtStartupDistTest"
+          PARAMS["win"]="-Dtest=StartCommandDistTest,StartDevCommandDistTest,BuildAndStartDistTest,ImportAtStartupDistTest"
           PARAMS["zip"]=""
           PARAMS["container"]="-Dkc.quarkus.tests.dist=docker"
           PARAMS["storage"]="-Ptest-database -Dtest=PostgreSQLDistTest,MariaDBDistTest#testSuccessful,MySQLDistTest#testSuccessful,DatabaseOptionsDistTest,JPAStoreDistTest,HotRodStoreDistTest,MixedStoreDistTest,TransactionConfigurationDistTest,ExternalInfinispanTest"
+          PARAMS["smoke"]="-Dtest=ClusterConfigDistTest,CustomJpaEntityProviderDistTest,ExportDistTest,FeaturesDistTest,ImportAtStartupDistTest,ImportDistTest,JaxRsDistTest,TruststoreDistTest"
 
           ./mvnw install -pl quarkus/tests/integration -am -DskipTests
-          ./mvnw test -pl quarkus/tests/integration ${PARAMS["${{ matrix.server }}"]} 2>&1 | misc/log/trimmer.sh
+          ./mvnw test -pl quarkus/tests/integration ${PARAMS["${{ matrix.suite }}"]} 2>&1 | misc/log/trimmer.sh
 
       - name: Upload JVM Heapdumps
         if: always()