diff --git a/.github/workflows/rust.yml b/.github/workflows/build-and-test.yml
similarity index 96%
rename from .github/workflows/rust.yml
rename to .github/workflows/build-and-test.yml
index 363ff545..8cb69deb 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/build-and-test.yml
@@ -13,8 +13,6 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     steps:
-    - name: Set CARGO_TARGET_DIR
-      run: echo "CARGO_TARGET_DIR=$HOME/target" >> $GITHUB_ENV
     - name: Install build tools
       run: sudo apt-get update && sudo apt-get install build-essential binutils-arm-none-eabi libelf-dev zip -y
     - uses: actions/checkout@v2
@@ -25,10 +23,13 @@ jobs:
           ~/.cargo/registry
           ~/.cargo/git
           ~/target
+          mgba-test-runner/target
         key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
     - name: install mgba-test-runner
       run: cargo install --path mgba-test-runner --verbose
+    - name: Set CARGO_TARGET_DIR
+      run: echo "CARGO_TARGET_DIR=$HOME/target" >> $GITHUB_ENV
     - name: Install gbafix
       run: cargo install gbafix
     - name: Build and test all crates