diff --git a/.github/workflows/integration_selenium.yaml b/.github/workflows/integration_selenium.yaml
index 8e73ba98f2b..710221926b8 100644
--- a/.github/workflows/integration_selenium.yaml
+++ b/.github/workflows/integration_selenium.yaml
@@ -21,8 +21,11 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 jobs:
+  setup-selenium:
+    uses: ./.github/workflows/setup_selenium.yaml
   test:
     name: Test
+    needs: setup-selenium
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -66,7 +69,6 @@ jobs:
       - uses: mvdbeek/gha-yarn-cache@master
         with:
           yarn-lock-file: 'galaxy root/client/yarn.lock'
-      - uses: nanasess/setup-chromedriver@v1
       - name: Run tests
         run: ./run_tests.sh --coverage -integration test/integration_selenium
         working-directory: 'galaxy root'
diff --git a/.github/workflows/selenium_beta.yaml b/.github/workflows/selenium_beta.yaml
index 511d0d375b3..58a1825cee1 100644
--- a/.github/workflows/selenium_beta.yaml
+++ b/.github/workflows/selenium_beta.yaml
@@ -23,8 +23,11 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 jobs:
+  setup-selenium:
+    uses: ./.github/workflows/setup_selenium.yaml
   test:
     name: Test
+    needs: setup-selenium
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -68,7 +71,6 @@ jobs:
       - uses: mvdbeek/gha-yarn-cache@master
         with:
           yarn-lock-file: 'galaxy root/client/yarn.lock'
-      - uses: nanasess/setup-chromedriver@v2
       - name: Run tests
         run: ./run_tests.sh --coverage -selenium lib/galaxy_test/selenium -- --num-shards=3 --shard-id=${{ matrix.chunk }}
         working-directory: 'galaxy root'