diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f8e2ecf32..d3d3d9e66 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -273,10 +273,7 @@ jobs:
           Remove-Item -Force
 
   win-tool-go:
-    # windows-8vpu is a 2022 GitHub-managed runner in our
-    # org with 8 cores and 32 GB of RAM:
-    # https://github.com/organizations/tailscale/settings/actions/github-hosted-runners/1
-    runs-on: windows-8vcpu
+    runs-on: windows-latest
     needs: gomod-cache
     name: Windows (win-tool-go)
     steps:
diff --git a/cmd/cigocacher/disk_windows.go b/cmd/cigocacher/disk_windows.go
index 6601c997e..bf001ed49 100644
--- a/cmd/cigocacher/disk_windows.go
+++ b/cmd/cigocacher/disk_windows.go
@@ -20,7 +20,7 @@ func (dc *DiskCache) writeActionFile(b []byte, actionID string) (retErr error) {
 	defer func() {
 		cerr := f.Close()
 		if retErr != nil || cerr != nil {
-			retErr = errors.Join(retErr, cerr, os.Remove(dest))
+			retErr = errors.Join(retErr, cerr)
 		}
 	}()
 
@@ -77,7 +77,7 @@ func (dc *DiskCache) writeOutputFile(r io.Reader, size int64, outputID string) (
 	defer func() {
 		cerr := f.Close()
 		if retErr != nil || cerr != nil {
-			retErr = errors.Join(retErr, cerr, os.Remove(dest))
+			retErr = errors.Join(retErr, cerr)
 		}
 	}()