diff --git a/chanbackup/backupfile_test.go b/chanbackup/backupfile_test.go
index 4992b1c68..14747f47b 100644
--- a/chanbackup/backupfile_test.go
+++ b/chanbackup/backupfile_test.go
@@ -52,9 +52,7 @@ func assertFileDeleted(t *testing.T, filePath string) {
 func TestUpdateAndSwap(t *testing.T) {
 	t.Parallel()
 
-	tempTestDir, err := ioutil.TempDir("", "")
-	require.NoError(t, err, "unable to make temp dir")
-	defer os.Remove(tempTestDir)
+	tempTestDir := t.TempDir()
 
 	testCases := []struct {
 		fileName     string
@@ -205,10 +203,13 @@ func TestExtractMulti(t *testing.T) {
 	packedMulti := PackedMulti(b.Bytes())
 
 	// Finally, we'll make a new temporary file, then write out the packed
-	// multi directly to to it.
-	tempFile, err := ioutil.TempFile("", "")
+	// multi directly to it.
+	tempFile, err := os.CreateTemp("", "")
 	require.NoError(t, err, "unable to create temp file")
-	defer os.Remove(tempFile.Name())
+	t.Cleanup(func() {
+		require.NoError(t, tempFile.Close())
+		require.NoError(t, os.Remove(tempFile.Name()))
+	})
 
 	_, err = tempFile.Write(packedMulti)
 	require.NoError(t, err, "unable to write temp file")