diff --git a/.github/workflows/test_web.yml b/.github/workflows/test_web.yml
index e13d8e8a7e5b3..f23663170e7e2 100644
--- a/.github/workflows/test_web.yml
+++ b/.github/workflows/test_web.yml
@@ -94,37 +94,36 @@ jobs:
         run: npm test
 
       - name: Upload artifacts
+        if: matrix.os == 'ubuntu-22.04' && matrix.node_version == '22'
         uses: actions/upload-artifact@v4
         with:
-          name: web-build-${{ runner.os }}-node${{ matrix.node_version }}
-          path: web/packages/selfhosted/dist # TODO: maybe core too?
+          name: selfhosted-dist
+          path: web/packages/selfhosted/dist
 
   browser-tests:
     needs: build
     if: needs.changes.outputs.should_run == 'true'
-    name: Test ${{ matrix.browser }} / Node.js ${{ matrix.node_version }} / ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
+    name: Test in ${{ matrix.browser }}
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
-        node_version: ["20", "22"]
-        os: [ubuntu-22.04, windows-latest] # TODO: Don't run browser tests on Windows because it's flaky for unknown reasons. :-(
         browser: ["chrome", "firefox", "edge"]
 
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup Node.js ${{ matrix.node_version }}
+      - name: Setup Node.js 22
         uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node_version }}
+          node-version: 22
           cache: npm
           cache-dependency-path: web/package-lock.json
 
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
-          name: web-build-${{ runner.os }}-node${{ matrix.node_version }}
+          name: selfhosted-dist
           path: web/packages/selfhosted/dist
 
       - name: Run browser-based tests