diff --git a/.github/workflows/end-to-end-tests.yaml b/.github/workflows/end-to-end-tests.yaml
index 0a7b8883e45..52c54fc9008 100644
--- a/.github/workflows/end-to-end-tests.yaml
+++ b/.github/workflows/end-to-end-tests.yaml
@@ -216,23 +216,22 @@ jobs:
               uses: actions/download-artifact@v4
               with:
                   pattern: blob-report-*
-                  path: all-blob-reports
 
             # Ideally we'd use merge-multiple=true on download, but it is broken in certain cases
             # https://github.com/microsoft/playwright/issues/29451
             - name: Check report integrity
               if: inputs.skip != true
               run: |
-                  for file in all-blob-reports/**/*.zip; do
+                  for file in blob-report-*/*.zip; do
                       unzip -t $file
                   done
             - name: Merge blob reports
               if: inputs.skip != true
-              run: for z in all-blob-reports/**/*.zip; do unar -r "$z" -o all-blob-reports-merged; done
+              run: for z in blob-report-*/*.zip; do unar -r "$z" -o all-blob-reports; done
 
             - name: Merge into HTML Report
               if: inputs.skip != true
-              run: yarn playwright merge-reports --reporter=html,json,./playwright/flaky-reporter.ts,./playwright/stale-screenshot-reporter.ts ./all-blob-reports-merged
+              run: yarn playwright merge-reports --reporter=html,json,./playwright/flaky-reporter.ts,./playwright/stale-screenshot-reporter.ts ./all-blob-reports
               env:
                   # Only pass creds to the flaky-reporter on main branch runs
                   GITHUB_TOKEN: ${{ github.ref_name == 'develop' && secrets.ELEMENT_BOT_TOKEN || '' }}
diff --git a/knip.ts b/knip.ts
index ed0dac4b278..247f9d97894 100644
--- a/knip.ts
+++ b/knip.ts
@@ -11,11 +11,7 @@ export default {
         "test/**",
         "res/decoder-ring/**",
     ],
-    project: [
-        "**/*.{js,ts,jsx,tsx}",
-        // This throws an error trying to load tenbin - https://knip.dev/reference/known-issues#exceptions-from-config-files
-        "!src/playwright.config.ts",
-    ],
+    project: ["**/*.{js,ts,jsx,tsx}"],
     ignore: [
         "docs/**",
         "res/jitsi_external_api.min.js",
diff --git a/playwright.config.ts b/playwright.config.ts
index a6e94e0cca4..21522711b0d 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -71,9 +71,9 @@ export default defineConfig({
     snapshotDir: "playwright/snapshots",
     snapshotPathTemplate: "{snapshotDir}/{testFilePath}/{arg}-{platform}{ext}",
     forbidOnly: !!process.env.CI,
-    testMatch: process.env.CI
+    testMatch: process.env.SHARD
         ? splitTests({
-              shard: process.env.SHARD ?? "1/1",
+              shard: process.env.SHARD,
               pattern: ["playwright/e2e/**/*.spec.ts"],
               reportFile: "playwright-results.json",
           })