diff --git a/internal/socket/socket_test.go b/internal/socket/socket_test.go
index 44c196b0..26077a7a 100644
--- a/internal/socket/socket_test.go
+++ b/internal/socket/socket_test.go
@@ -445,11 +445,7 @@ func main() {
 	if runtime.Compiler == "gccgo" {
 		t.Skip("skipping race test when built with gccgo")
 	}
-	dir, err := os.MkdirTemp("", "testrace")
-	if err != nil {
-		t.Fatalf("failed to create temp directory: %v", err)
-	}
-	defer os.RemoveAll(dir)
+	dir := t.TempDir()
 	goBinary := filepath.Join(runtime.GOROOT(), "bin", "go")
 	t.Logf("%s version", goBinary)
 	got, err := exec.Command(goBinary, "version").CombinedOutput()
diff --git a/webdav/file_test.go b/webdav/file_test.go
index 3af53fde..c9313dc5 100644
--- a/webdav/file_test.go
+++ b/webdav/file_test.go
@@ -517,12 +517,7 @@ func TestDir(t *testing.T) {
 		t.Skip("see golang.org/issue/11453")
 	}
 
-	td, err := os.MkdirTemp("", "webdav-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(td)
-	testFS(t, Dir(td))
+	testFS(t, Dir(t.TempDir()))
 }
 
 func TestMemFS(t *testing.T) {