diff --git a/.github/workflow-samples/.gitignore b/.github/workflow-samples/.gitignore
index 1b6985c0..7d8e74ca 100644
--- a/.github/workflow-samples/.gitignore
+++ b/.github/workflow-samples/.gitignore
@@ -3,3 +3,6 @@
 
 # Ignore Gradle build output directory
 build
+
+# Marker file written when the 'test' task is configured
+task-configured.txt
diff --git a/.github/workflows/ci-integ-test-full.yml b/.github/workflows/ci-integ-test-full.yml
index f17f3d16..44a029a2 100644
--- a/.github/workflows/ci-integ-test-full.yml
+++ b/.github/workflows/ci-integ-test-full.yml
@@ -14,6 +14,16 @@ permissions:
   contents: read
 
 jobs:
+  smoke-tests:
+    uses: ./.github/workflows/suite-smoke-test-caching.yml
+    concurrency:
+      group: CI-smoke-test-caching
+      cancel-in-progress: false
+    with:
+      skip-dist: true
+      runner-os: '["ubuntu-latest", "windows-latest"]'
+    secrets: inherit
+
   caching-integ-tests:
     uses: ./.github/workflows/suite-integ-test-caching.yml
     concurrency:
diff --git a/.github/workflows/ci-integ-test.yml b/.github/workflows/ci-integ-test.yml
index e74beadc..d2f9aa78 100644
--- a/.github/workflows/ci-integ-test.yml
+++ b/.github/workflows/ci-integ-test.yml
@@ -21,9 +21,19 @@ jobs:
     - name: Checkout sources
       uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
     - name: Build and upload distribution
-      if: ${{ needs.determine-suite.outputs.suite != 'full' }}
       uses: ./.github/actions/build-dist
 
+  smoke-tests:
+    needs: build-distribution
+    uses: ./.github/workflows/suite-smoke-test-caching.yml
+    concurrency:
+      group: CI-smoke-test-caching-${{ github.ref }}
+      cancel-in-progress: false
+    with:
+      skip-dist: false
+      runner-os: '["ubuntu-latest", "windows-latest"]'
+    secrets: inherit
+
   caching-integ-tests:
     needs: build-distribution
     uses: ./.github/workflows/suite-integ-test-caching.yml
@@ -64,6 +74,7 @@ jobs:
     if: ${{ always() }}
     needs:
     - build-distribution
+    - smoke-tests
     - caching-integ-tests
     - other-integ-tests
     - dependency-submission-integ-tests
@@ -74,6 +85,7 @@ jobs:
       run: |
         echo "One or more integ-test jobs did not succeed:"
         echo "  build-distribution:                ${{ needs.build-distribution.result }}"
+        echo "  smoke-tests:                       ${{ needs.smoke-tests.result }}"
         echo "  caching-integ-tests:               ${{ needs.caching-integ-tests.result }}"
         echo "  other-integ-tests:                 ${{ needs.other-integ-tests.result }}"
         echo "  dependency-submission-integ-tests: ${{ needs.dependency-submission-integ-tests.result }}"
diff --git a/.github/workflows/integ-test-basic-cache-provider.yml b/.github/workflows/smoke-test-basic-cache-provider.yml
similarity index 100%
rename from .github/workflows/integ-test-basic-cache-provider.yml
rename to .github/workflows/smoke-test-basic-cache-provider.yml
diff --git a/.github/workflows/integ-test-restore-gradle-home.yml b/.github/workflows/smoke-test-restore-gradle-home.yml
similarity index 100%
rename from .github/workflows/integ-test-restore-gradle-home.yml
rename to .github/workflows/smoke-test-restore-gradle-home.yml
diff --git a/.github/workflows/suite-integ-test-caching.yml b/.github/workflows/suite-integ-test-caching.yml
index 555aa30e..eb73d27d 100644
--- a/.github/workflows/suite-integ-test-caching.yml
+++ b/.github/workflows/suite-integ-test-caching.yml
@@ -36,11 +36,6 @@ jobs:
     with:
       skip-dist: ${{ inputs.skip-dist }}
 
-  restore-gradle-home:
-    uses: ./.github/workflows/integ-test-restore-gradle-home.yml
-    with:
-      skip-dist: ${{ inputs.skip-dist }}
-
   restore-java-toolchain:
     uses: ./.github/workflows/integ-test-restore-java-toolchain.yml
     with:
@@ -57,9 +52,3 @@ jobs:
     with:
       runner-os: '${{ inputs.runner-os }}'
       skip-dist: ${{ inputs.skip-dist }}
-
-  basic-cache-provider:
-    uses: ./.github/workflows/integ-test-basic-cache-provider.yml
-    with:
-      runner-os: '${{ inputs.runner-os }}'
-      skip-dist: ${{ inputs.skip-dist }}
diff --git a/.github/workflows/suite-smoke-test-caching.yml b/.github/workflows/suite-smoke-test-caching.yml
new file mode 100644
index 00000000..4579c8b4
--- /dev/null
+++ b/.github/workflows/suite-smoke-test-caching.yml
@@ -0,0 +1,27 @@
+name: suite-smoke-test-caching
+
+on:
+  workflow_call:
+    inputs:
+      runner-os:
+        type: string
+        default: '["ubuntu-latest"]'
+      skip-dist:
+        type: boolean
+        default: false
+
+permissions:
+  contents: read
+
+jobs:
+  restore-gradle-home:
+    uses: ./.github/workflows/smoke-test-restore-gradle-home.yml
+    with:
+      runner-os: '${{ inputs.runner-os }}'
+      skip-dist: ${{ inputs.skip-dist }}
+
+  basic-cache-provider:
+    uses: ./.github/workflows/smoke-test-basic-cache-provider.yml
+    with:
+      runner-os: '${{ inputs.runner-os }}'
+      skip-dist: ${{ inputs.skip-dist }}