diff --git a/.github/workflows/chipyard-run-tests.yml b/.github/workflows/chipyard-run-tests.yml
index 28dee8b2..2efac52d 100644
--- a/.github/workflows/chipyard-run-tests.yml
+++ b/.github/workflows/chipyard-run-tests.yml
@@ -140,11 +140,7 @@ jobs:
           key: ${{ needs.make-keys.outputs.extra-tests-cache-key }}
           restore-keys: ${{ needs.make-keys.outputs.extra-tests-cache-key }}
       - name: Build extra tests if not cached
-        run: |
-          export RISCV="/__w/chipyard/chipyard/riscv-tools-install"
-          export LD_LIBRARY_PATH="$RISCV/lib"
-          export PATH="$RISCV/bin:$PATH"
-          .github/scripts/build-extra-tests.sh
+        run: .github/scripts/build-extra-tests.sh
 
   install-verilator:
     name: install-verilator