diff --git a/upup/pkg/fi/files_test.go b/upup/pkg/fi/files_test.go
index 77cf2c12d6af8..399b3d992161a 100644
--- a/upup/pkg/fi/files_test.go
+++ b/upup/pkg/fi/files_test.go
@@ -25,8 +25,17 @@ import (
 )
 
 func TestWriteFile(t *testing.T) {
-	var TempDir, _ = ioutil.TempDir("", "fitest")
-	defer os.RemoveAll(TempDir)
+	TempDir, err := ioutil.TempDir("", "fitest")
+	if err != nil {
+		t.Fatalf("error creating temp dir: %v", err)
+	}
+	defer func() {
+		err := os.RemoveAll(TempDir)
+		if err != nil {
+			t.Errorf("failed to remove temp dir %q: %v", TempDir, err)
+		}
+	}()
+
 	tests := []struct {
 		path     string
 		data     []byte
diff --git a/util/pkg/vfs/fs_test.go b/util/pkg/vfs/fs_test.go
index f0977481d445a..05126bfb72eac 100644
--- a/util/pkg/vfs/fs_test.go
+++ b/util/pkg/vfs/fs_test.go
@@ -25,8 +25,17 @@ import (
 )
 
 func TestCreateFile(t *testing.T) {
-	var TempDir, _ = ioutil.TempDir("", "test")
-	defer os.RemoveAll(TempDir)
+	TempDir, err := ioutil.TempDir("", "test")
+	if err != nil {
+		t.Fatalf("error creating temp dir: %v", err)
+	}
+	defer func() {
+		err := os.RemoveAll(TempDir)
+		if err != nil {
+			t.Errorf("failed to remove temp dir %q: %v", TempDir, err)
+		}
+	}()
+
 	tests := []struct {
 		path string
 		data []byte
@@ -62,8 +71,17 @@ func TestCreateFile(t *testing.T) {
 }
 
 func TestWriteTo(t *testing.T) {
-	var TempDir, _ = ioutil.TempDir("", "test")
-	defer os.RemoveAll(TempDir)
+	TempDir, err := ioutil.TempDir("", "test")
+	if err != nil {
+		t.Fatalf("error creating temp dir: %v", err)
+	}
+	defer func() {
+		err := os.RemoveAll(TempDir)
+		if err != nil {
+			t.Errorf("failed to remove temp dir %q: %v", TempDir, err)
+		}
+	}()
+
 	tests := []struct {
 		path string
 		data []byte