diff --git a/.github/workflows/toolshed.yaml b/.github/workflows/toolshed.yaml
index 21303063345a..4ed604fcc29d 100644
--- a/.github/workflows/toolshed.yaml
+++ b/.github/workflows/toolshed.yaml
@@ -19,24 +19,11 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        include:
-        - test-install-client: 'galaxy_api'
-          python-version: '3.7'
-          shed-api: 'v1'
-          shed-browser: 'twill'
-        - test-install-client: 'standalone'
-          python-version: '3.8'
-          shed-api: 'v1'
-          shed-browser: 'twill'
-        - test-install-client: 'galaxy_api'
-          python-version: '3.9'
-          shed-api: 'v2'
-          shed-browser: 'playwright'
-        - test-install-client: 'standalone'
-          python-version: '3.10'
-          shed-api: 'v2'
-          shed-browser: 'playwright'
+        python-version: ['3.7', '3.11']
+        shed-api: ['v1', 'v2']
+        test-install-client: ['galaxy_api', 'standalone']
     services:
       postgres:
         image: postgres:13
@@ -82,10 +69,10 @@ jobs:
         env:
           TOOL_SHED_TEST_INSTALL_CLIENT: ${{ matrix.test-install-client }}
           TOOL_SHED_API_VERSION: ${{ matrix.shed-api }}
-          TOOL_SHED_TEST_BROWSER: ${{ matrix.shed-browser }}
+          TOOL_SHED_TEST_BROWSER: ${{ matrix.shed-api == 'v1' && 'standalone' || 'playwright' }}
         working-directory: 'galaxy root'
       - uses: actions/upload-artifact@v3
         if: failure()
         with:
-          name: Toolshed test results (${{ matrix.python-version }}, ${{ matrix.test-install-client }})
+          name: Toolshed test results (${{ matrix.python-version }}, ${{ matrix.shed-api }}, ${{ matrix.test-install-client }})
           path: 'galaxy root/run_toolshed_tests.html'