diff --git a/testutil/daemon/daemon.go b/testutil/daemon/daemon.go
index 0c1ecc19b2..943e6b7cb9 100644
--- a/testutil/daemon/daemon.go
+++ b/testutil/daemon/daemon.go
@@ -465,8 +465,13 @@ func (d *Daemon) StopWithError() (err error) {
 			d.log.Logf("[%s] error while stopping daemon: %v", d.id, err)
 		} else {
 			d.log.Logf("[%s] daemon stopped", d.id)
+			if d.pidFile != "" {
+				_ = os.Remove(d.pidFile)
+			}
+		}
+		if err := d.logFile.Close(); err != nil {
+			d.log.Logf("[%s] failed to close daemon logfile: %v", d.id, err)
 		}
-		d.logFile.Close()
 		d.cmd = nil
 	}()
 
@@ -519,12 +524,7 @@ out2:
 		return err
 	}
 
-	d.cmd.Wait()
-
-	if d.pidFile != "" {
-		_ = os.Remove(d.pidFile)
-	}
-	return nil
+	return d.cmd.Wait()
 }
 
 // Restart will restart the daemon by first stopping it and the starting it.