diff --git a/layer/layer_test.go b/layer/layer_test.go
index 41848576f9..95eda33275 100644
--- a/layer/layer_test.go
+++ b/layer/layer_test.go
@@ -51,13 +51,13 @@ func newTestGraphDriver(t *testing.T) (graphdriver.Driver, func()) {
 		t.Fatal(err)
 	}
 
-	driver, err := newVFSGraphDriver(td)
+	graphDriver, err := newVFSGraphDriver(td)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	return driver, func() {
-		os.RemoveAll(td)
+	return graphDriver, func() {
+		_ = os.RemoveAll(td)
 	}
 }
 
@@ -76,7 +76,7 @@ func newTestStore(t *testing.T) (Store, string, func()) {
 
 	return ls, td, func() {
 		graphcleanup()
-		os.RemoveAll(td)
+		_ = os.RemoveAll(td)
 	}
 }