diff --git a/src/os/removeall_test.go b/src/os/removeall_test.go
index eb9459445c..96e0fc5a55 100644
--- a/src/os/removeall_test.go
+++ b/src/os/removeall_test.go
@@ -412,13 +412,14 @@ func TestRemoveAllWithMoreErrorThanReqSize(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping in short mode")
 	}
-	oldRemoveAllTestHook := RemoveAllTestHook
+
+	defer func(oldHook func(error) error) {
+		*RemoveAllTestHook = oldHook
+	}(*RemoveAllTestHook)
+
 	*RemoveAllTestHook = func(err error) error {
 		return errors.New("error from RemoveAllTestHook")
 	}
-	defer func() {
-		*RemoveAllTestHook = *oldRemoveAllTestHook
-	}()
 
 	tmpDir, err := ioutil.TempDir("", "TestRemoveAll-")
 	if err != nil {