diff --git a/.github/actions/setup-go/action.yml b/.github/actions/setup-go/action.yml
index 2d157acc..321995dc 100644
--- a/.github/actions/setup-go/action.yml
+++ b/.github/actions/setup-go/action.yml
@@ -1,5 +1,10 @@
 name: 'Setup the Go environment'
 description: 'Installs go and restores/saves the build/module cache'
+inputs:
+  git-dir:
+    description: "Git repository directory (for mtime-restoration). Note that this requires cloning the repo's full history"
+    required: false
+    default: '.'
 runs:
   using: "composite"
   steps:
@@ -17,9 +22,12 @@ runs:
     # Restore original modification time of files based on the date of the most
     # recent commit that modified them as mtimes affect the Go test cache.
     # See https://github.com/golang/go/issues/58571 for details
-    - name: Restore modification time of checkout files
-      uses: chetan/git-restore-mtime-action@075f9bc9d159805603419d50f794bd9f33252ebe
-
+    # Note that this requires checking out the repos with fetch-depth: 0
+    - if: inputs.git-dir != ''
+      name: Restore modification time of checkout files
+      uses: chetan/git-restore-mtime-action@301991bb840275c304501780b55c4cc0ba7450ba
+      with:
+        working-directory: ${{ inputs.git-dir }}
 
     # KEY_PREFIX must uniquely identify the specific instance of a job executing.
     - shell: bash
diff --git a/.github/workflows/required_status_check.yml b/.github/workflows/required-status-check.yml
similarity index 100%
rename from .github/workflows/required_status_check.yml
rename to .github/workflows/required-status-check.yml
diff --git a/.github/workflows/e2e.yml b/.github/workflows/system-test.yml
similarity index 96%
rename from .github/workflows/e2e.yml
rename to .github/workflows/system-test.yml
index f14121e9..15b58ccb 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/system-test.yml
@@ -1,4 +1,4 @@
-name: Soroban Tools e2e
+name: System test
 
 on:
   push:
@@ -6,8 +6,8 @@ on:
   pull_request:
 
 jobs:
-  integration:
-    name: System tests
+  test:
+    name: "Test"
     strategy:
       matrix:
         scenario-filter: [ "^TestDappDevelop$/^.*$" ]
@@ -86,7 +86,11 @@ jobs:
           repository: ${{ env.SYSTEM_TEST_JS_STELLAR_SDK_GH_REPO }}
           ref: ${{ env.SYSTEM_TEST_JS_STELLAR_SDK_GH_REF }}
           path: system-test/js-stellar-sdk
+      - run: rustup update
       - uses: stellar/actions/rust-cache@main
+      - uses: ./soroban-rpc/.github/actions/setup-go
+        with:
+          git-dir: ./soroban-rpc/
       - name: Build system test with component versions
         run: |
           cd $GITHUB_WORKSPACE/system-test