diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3aa0844810..0cb16a841c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -67,7 +67,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Cache SpacemanDMM
+      - name: Restore SpacemanDMM Cache
         uses: actions/cache@v4
         with:
           path: ~/SpacemanDMM
@@ -102,7 +102,7 @@ jobs:
       - name: Ensure +x on CI directory
         run: |
           chmod -R +x ./tools/ci
-      - name: Setup Cache
+      - name: Restore BYOND Cache
         uses: actions/cache@v4
         with:
           path: $HOME/BYOND
@@ -120,24 +120,36 @@ jobs:
         env:
           EXTRA_ARGS: "-DUNIT_TEST -D${{ matrix.map }}"
           RUN: "1"
-      - name: Compile POIs
+
+  extra_map_tests:
+    name: Map Tests
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Ensure +x on CI directory
         run: |
-          tools/ci/install_byond.sh
-          tools/ci/compile_and_run.sh
+          chmod -R +x ./tools/ci
+      - name: Restore BYOND Cache
+        uses: actions/cache@v4
+        with:
+          path: $HOME/BYOND
+          key: ${{ runner.os }}-byond
+      - name: Install BYOND
+        run: tools/ci/install_byond.sh
+      - name: Compile POIs
+        run: tools/ci/compile_and_run.sh
         env:
           EXTRA_ARGS: "-DMAP_TEST"
           RUN: "0"
       - name: Compile away missions
-        run: |
-          tools/ci/install_byond.sh
-          tools/ci/compile_and_run.sh
+        run: tools/ci/compile_and_run.sh
         env:
           EXTRA_ARGS: "-DAWAY_MISSION_TEST -DUSE_MAP_TETHER" # Only Tether has support for all away missions
           RUN: "0"
 
   tests_successful:
     name: Integration Tests
-    needs: ['run_linters', 'dreamchecker', 'unit_tests']
+    needs: ['run_linters', 'dreamchecker', 'unit_tests', 'extra_map_tests']
     runs-on: ubuntu-20.04
     steps:
       - name: Report Success
diff --git a/tools/ci/compile_and_run.sh b/tools/ci/compile_and_run.sh
index 159dabec38..17ab16cb44 100755
--- a/tools/ci/compile_and_run.sh
+++ b/tools/ci/compile_and_run.sh
@@ -5,6 +5,9 @@ NC='\033[0m'
 
 source $HOME/BYOND/byond/bin/byondsetup
 
+# Clean up between steps so Juke doesn't refuse to recompile with different -D options
+rm vorestation.dmb
+
 # Copy example configs
 cp config/example/* config/