diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 1b0d40eed..0b086f699 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -119,12 +119,50 @@ jobs:
         name: Run tests
         run: bundle exec rake ci:local_transport:windows
 
+  winrm_transport:
+    needs: rubocop_and_matrix
+    env:
+      BOLT_WINRM_USER: roddypiper
+      BOLT_WINRM_HOST: localhost
+      BOLT_WINRM_PORT: 5985
+      BOLT_WINRM_SSL_PORT: 5986
+      BOLT_WINRM_SMB_PORT: 445
+    name: WinRM Transport
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        ruby: ${{ fromJSON(needs.rubocop_and_matrix.outputs.ruby) }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Cache modules
+        id: modules
+        uses: actions/cache@v4
+        with:
+          path: modules
+          key: ${{ runner.os }}-modules-${{ hashFiles('**/Puppetfile') }}
+      - name: Install modules
+        if: steps.modules.outputs.cache-hit != 'true'
+        run: bundle exec r10k puppetfile install
+      - name: Configure WinRM and use Puppet's Ruby
+        shell: powershell
+        run: |
+          . scripts\ci.ps1
+          Set-ActiveRubyFromPuppet
+      - name: WinRM transport tests
+        run: bundle exec rake ci:winrm_transport
   tests:
     needs:
       - rubocop_and_matrix
       - unit
       - run-dita
       - local_transports
+      - winrm_transport
     runs-on: ubuntu-24.04
     name: Test suite
     steps:
diff --git a/.github/workflows/winrm_transport.yaml b/.github/workflows/winrm_transport.yaml
deleted file mode 100644
index 29e498df8..000000000
--- a/.github/workflows/winrm_transport.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
----
-name: WinRM Transport
-
-on:
-  pull_request: {}
-  push:
-    branches:
-      - main
-
-permissions:
-  contents: read
-
-env:
-  BOLT_WINRM_USER: roddypiper
-  BOLT_WINRM_HOST: localhost
-  BOLT_WINRM_PORT: 5985
-  BOLT_WINRM_SSL_PORT: 5986
-  BOLT_WINRM_SMB_PORT: 445
-
-jobs:
-  winrm_transport:
-    name: WinRM Transport
-    runs-on: windows-latest
-    strategy:
-      matrix:
-        ruby: [3.2]
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-      - name: Cache modules
-        id: modules
-        uses: actions/cache@v4
-        with:
-          path: modules
-          key: ${{ runner.os }}-modules-${{ hashFiles('**/Puppetfile') }}
-      - name: Install modules
-        if: steps.modules.outputs.cache-hit != 'true'
-        run: bundle exec r10k puppetfile install
-      - name: Configure WinRM and use Puppet's Ruby
-        shell: powershell
-        run: |
-          . scripts\ci.ps1
-          Set-ActiveRubyFromPuppet
-      - name: WinRM transport tests
-        run: bundle exec rake ci:winrm_transport