diff --git a/.github/actions/test-setup/action.yml b/.github/actions/test-setup/action.yml
index cb9cbfa9df45..da7e68a51730 100644
--- a/.github/actions/test-setup/action.yml
+++ b/.github/actions/test-setup/action.yml
@@ -120,10 +120,3 @@ runs:
         # no targets or there may only be non-test targets that we want to
         # build, so simply inject an explicit no-op test target.
         echo "//scripts:no_op_test" >> $TARGETS_FILE
-
-    # See "Disk space before build".
-    - name: Disk space at end
-      uses: gacts/run-and-post-run@4683764dd706df847f57b9bed39d08164bcd2690 # v1.4.1
-      if: steps.test-setup.outputs.has_code == 'true'
-      with:
-        post: df -h
diff --git a/.github/workflows/clang_tidy.yaml b/.github/workflows/clang_tidy.yaml
index f7b13f027449..760ce84b28a8 100644
--- a/.github/workflows/clang_tidy.yaml
+++ b/.github/workflows/clang_tidy.yaml
@@ -55,7 +55,6 @@ jobs:
             ${{ github.event_name == 'pull_request' &&
             github.event.pull_request.base.sha ||
             github.event.merge_group.base_sha }}
-          remote_cache_upload: ${{ env.remote_cache_upload }}
           remote_cache_key: ${{ secrets.CARBON_BUILDS_GITHUB }}
           targets_file: ${{ runner.temp }}/targets
 
@@ -72,3 +71,8 @@ jobs:
             --attempts=5 \
             build --config=clang-tidy -k \
             --target_pattern_file=$TARGETS_FILE
+
+      # See "Disk space before build" in `test-setup`.
+      - name: Disk space after build
+        if: steps.test-setup.outputs.has_code == 'true'
+        run: df -h
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 10efb3735cd4..bf53d7f5eac7 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -61,7 +61,6 @@ jobs:
             ${{ github.event_name == 'pull_request' &&
             github.event.pull_request.base.sha ||
             github.event.merge_group.base_sha }}
-          remote_cache_upload: ${{ env.remote_cache_upload }}
           remote_cache_key: ${{ secrets.CARBON_BUILDS_GITHUB }}
           targets_file: ${{ runner.temp }}/targets
 
@@ -82,3 +81,8 @@ jobs:
             --attempts=5 --jobs-on-last-attempt=4 \
             test -c ${{ matrix.build_mode }} \
             --target_pattern_file=$TARGETS_FILE
+
+      # See "Disk space before build" in `test-setup`.
+      - name: Disk space after build
+        if: steps.test-setup.outputs.has_code == 'true'
+        run: df -h