diff --git a/.github/workflows/daily-tests.yaml b/.github/workflows/daily-tests.yaml
index 2c34cacf6a..bfee29908b 100644
--- a/.github/workflows/daily-tests.yaml
+++ b/.github/workflows/daily-tests.yaml
@@ -18,6 +18,11 @@ jobs:
         timeout-minutes: 60
         steps:
             - uses: actions/checkout@v4
+            - name: Cache build/ALL
+              uses: actions/cache@v4
+              with:
+                  path: build/ALL
+                  key: testlib-build-all
             - name: ALL/unittests.${{ matrix.type }} UnitTests
               run: scons build/ALL/unittests.${{ matrix.type }} -j $(nproc)
 
@@ -26,7 +31,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                test-type: [arm_boot_tests, fs, gpu, insttest_se, learning_gem5, m5threads_test_atomic, memory, multi_isa, replacement_policies, riscv_boot_tests,
+                test-type: [arm_boot_tests, fs, gpu, insttest_se, learning_gem5, m5threads_test_atomic, memory, replacement_policies, riscv_boot_tests,
                     stdlib, x86_boot_tests]
         runs-on: [self-hosted, linux, x64]
         container: ghcr.io/gem5/ubuntu-24.04_all-dependencies:latest
@@ -36,9 +41,15 @@ jobs:
               run: rm -rf ./* || true rm -rf ./.??* || true rm -rf ~/.cache || true
             - uses: actions/checkout@v4
 
+            - name: Cache build/NULL
+              uses: actions/cache@v4
+              with:
+                  path: build/NULL
+                  key: testlib-build-null
+
             - name: long ${{ matrix.test-type }} tests
               working-directory: ${{ github.workspace }}/tests
-              run: ./main.py run gem5/${{ matrix.test-type }} --length=long -vv -t $(nproc)
+              run: ./main.py run gem5/${{ matrix.test-type }} -j$(nproc) --length=long -vv -t $(nproc)
             - name: upload results
               if: success() || failure()
               uses: actions/upload-artifact@v4
@@ -65,10 +76,17 @@ jobs:
             - name: Clean runner
               run: rm -rf ./* || true rm -rf ./.??* || true rm -rf ~/.cache || true
             - uses: actions/checkout@v4
+
+            - name: Cache build/ALL
+              uses: actions/cache@v4
+              with:
+                  path: build/ALL
+                  key: testlib-build-all
+
             - name: long ${{ matrix.test-type }} gem5_library_example_tests
               working-directory: ${{ github.workspace }}/tests
-              run: ./main.py run --uid SuiteUID:tests/gem5/gem5_library_example_tests/test_gem5_library_examples.py:test-${{ matrix.test-type }} --length=long
-                  -vv
+              run: ./main.py run --uid SuiteUID:tests/gem5/gem5_library_example_tests/test_gem5_library_examples.py:test-${{ matrix.test-type }} -j $(nproc)
+                  --length=long -vv
             - name: upload results
               if: success() || failure()
               uses: actions/upload-artifact@v4
@@ -89,12 +107,16 @@ jobs:
             - uses: actions/checkout@v4
               with:
                   ref: develop
-            - name: Build VEGA_X86/gem5.opt
-              run: scons build/VEGA_X86/gem5.opt -j`nproc`
+
+            - name: Cache build/VEGA_X86
+              uses: actions/cache@v4
+              with:
+                  path: build/VEGA_X86
+                  key: testlib-build-vega
 
             - name: Run Testlib GPU Tests
               working-directory: ${{ github.workspace }}/tests
-              run: ./main.py run --length=long --skip-build -vvv -t $(nproc) --host gcn_gpu  gem5/gpu
+              run: ./main.py run --length=long -vvv -t $(nproc) -j $(nproc) --host gcn_gpu  gem5/gpu
 
             - name: Upload results
               if: success() || failure()
diff --git a/.github/workflows/weekly-tests.yaml b/.github/workflows/weekly-tests.yaml
index b51381dbee..ef20cab5ea 100644
--- a/.github/workflows/weekly-tests.yaml
+++ b/.github/workflows/weekly-tests.yaml
@@ -8,54 +8,30 @@ on:
     workflow_dispatch:
 
 jobs:
-    build-gem5:
-        runs-on: [self-hosted, linux, x64]
-        container: ghcr.io/gem5/ubuntu-24.04_all-dependencies:latest
-        outputs:
-            build-name: ${{ steps.artifact-name.outputs.name }}
-        steps:
-            - uses: actions/checkout@v4
-
-            - name: Cache build/ALL
-              uses: actions/cache@v4
-              with:
-                  path: build/ALL
-                  key: weekly-build-all
-
-            - id: artifact-name
-              run: echo "name=$(date +"%Y-%m-%d_%H.%M.%S")-ALL" >> $GITHUB_OUTPUT
-            - name: Build gem5
-              run: |
-                  scons build/ALL/gem5.opt -j $(nproc)
-            - uses: actions/upload-artifact@v4
-              with:
-                  name: ${{ steps.artifact-name.outputs.name }}
-                  path: build/ALL/gem5.opt
-                  retention-days: 5
-            - run: echo "This job's status is ${{ job.status }}."
 
     # start running the very-long tests
     testlib-very-long-tests:
         strategy:
             fail-fast: false
             matrix:
-                test-type: [gem5_library_example_tests, gem5_resources, parsec_benchmarks, x86_boot_tests]
+                test-type: [gem5_library_example_tests, gem5_resources, stdlib, parsec_benchmarks, x86_boot_tests]
         runs-on: [self-hosted, linux, x64]
         container: ghcr.io/gem5/ubuntu-24.04_all-dependencies:latest
-        needs: [build-gem5]
         timeout-minutes: 4320 # 3 days
         steps:
             - name: Clean runner
               run: rm -rf ./* || true rm -rf ./.??* || true rm -rf ~/.cache || true
             - uses: actions/checkout@v4
-            - uses: actions/download-artifact@v4
+
+            - name: Cache build/ALL
+              uses: actions/cache@v4
               with:
-                  name: ${{needs.build-gem5.outputs.build-name}}
                   path: build/ALL
-            - run: chmod u+x build/ALL/gem5.opt
+                  key: testlib-build-all
+
             - name: very-long ${{ matrix.test-type }}
               working-directory: ${{ github.workspace }}/tests
-              run: ./main.py run gem5/${{ matrix.test-type }} --length very-long --skip-build -vv
+              run: ./main.py run gem5/${{ matrix.test-type }} --length very-long -j$(nproc) -vv
             - name: upload results
               if: success() || failure()
               uses: actions/upload-artifact@v4
@@ -76,12 +52,16 @@ jobs:
             - uses: actions/checkout@v4
               with:
                   ref: develop
-            - name: Build VEGA_X86/gem5.opt
-              run: scons build/VEGA_X86/gem5.opt -j`nproc`
+
+            - name: Cache build/VEGA_X86
+              uses: actions/cache@v4
+              with:
+                  path: build/VEGA_X86
+                  key: testlib-build-vega
 
             - name: Run Testlib GPU Tests
               working-directory: ${{ github.workspace }}/tests
-              run: ./main.py run --length=very-long --skip-build -vvv -t $(nproc) --host gcn_gpu  gem5/gpu
+              run: ./main.py run --length=very-long -vvv -j $(nproc) -t $(nproc) --host gcn_gpu  gem5/gpu
 
             - name: Upload results
               if: success() || failure()
@@ -101,6 +81,13 @@ jobs:
               working-directory: ${{ github.workspace }}/ext/dramsys
               run: git clone https://github.com/tukl-msd/DRAMSys --branch v5.0 --depth 1 DRAMSys
 
+            - name: Cache build/ALL
+               # Just restore as we don't want to cache the DRAMSys library most of the time.
+              uses: actions/cache/restore@v4
+              with:
+                  path: build/ALL
+                  key: testlib-build-all
+
               # gem5 is built separately because it depends on the DRAMSys library
             - name: Build gem5
               working-directory: ${{ github.workspace }}