diff --git a/testutil/daemon/daemon.go b/testutil/daemon/daemon.go
index 6c27c23022..e6d52f0d94 100644
--- a/testutil/daemon/daemon.go
+++ b/testutil/daemon/daemon.go
@@ -699,13 +699,13 @@ func (d *Daemon) Stop(t testing.TB) {
 // If it timeouts, a SIGKILL is sent.
 // Stop will not delete the daemon directory. If a purged daemon is needed,
 // instantiate a new one with NewDaemon.
-func (d *Daemon) StopWithError() (err error) {
+func (d *Daemon) StopWithError() (retErr error) {
 	if d.cmd == nil || d.Wait == nil {
 		return errDaemonNotStarted
 	}
 	defer func() {
-		if err != nil {
-			d.log.Logf("[%s] error while stopping daemon: %v", d.id, err)
+		if retErr != nil {
+			d.log.Logf("[%s] error while stopping daemon: %v", d.id, retErr)
 		} else {
 			d.log.Logf("[%s] daemon stopped", d.id)
 			if d.pidFile != "" {