diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 9d856992a7..003f761127 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -37,7 +37,7 @@ jobs:
     # XVFB-RUN merges both STDOUT and STDERR, whereas we need only STDERR
     # Wrap `npm run` in a subshell to redirect STDERR to file.
     # Enable core dumps in the subshell.
-    - run: xvfb-run --auto-servernum -- bash -c "ulimit -c unlimited && npm run coverage 2>./${{ matrix.browser }}-linux-testrun.log"
+    - run: xvfb-run --auto-servernum -- bash -c "ulimit -c unlimited && npm run coverage 2>./testrun.log"
       env:
         BROWSER: ${{ matrix.browser }}
         DEBUG: "*,-pw:wrapped*"
@@ -50,7 +50,7 @@ jobs:
       if: failure()
       with:
         name: ${{ matrix.browser }}-linux-testrun.log
-        path: ${{ matrix.browser }}-linux-testrun.log
+        path: testrun.log
     - uses: actions/upload-artifact@v1
       if: failure()
       with:
@@ -189,7 +189,7 @@ jobs:
     # XVFB-RUN merges both STDOUT and STDERR, whereas we need only STDERR
     # Wrap `npm run` in a subshell to redirect STDERR to file.
     # Enable core dumps in the subshell.
-    - run: xvfb-run --auto-servernum -- bash -c "ulimit -c unlimited && npm run test 2>./channel-linux-testrun.log"
+    - run: xvfb-run --auto-servernum -- bash -c "ulimit -c unlimited && npm run test 2>./testrun.log"
       env:
         BROWSER: ${{ matrix.browser }}
         DEBUG: "*,-pw:wrapped*"
@@ -200,15 +200,15 @@ jobs:
     - uses: actions/upload-artifact@v1
       if: failure()
       with:
-        name: channel-linux-output
-        path: test/output-channel
+        name: rpc-${{ matrix.browser }}-linux-output
+        path: test/output-${{ matrix.browser }}
     - uses: actions/upload-artifact@v1
       if: failure()
       with:
-        name: channel-linux-testrun.log
-        path: channel-linux-testrun.log
+        name: rpc-${{ matrix.browser }}-linux-testrun.log
+        path: testrun.log
     - uses: actions/upload-artifact@v1
       if: failure()
       with:
-        name: channel-linux-coredumps
+        name: rpc-${{ matrix.browser }}-linux-coredumps
         path: coredumps