diff --git a/pkg/daemon/daemon_test.go b/pkg/daemon/daemon_test.go
index b9cb77c6444707971ef47be9e09b80b2f7e689c4..8326e3023f988323610f5a8c8219fcec33915cfb 100644
--- a/pkg/daemon/daemon_test.go
+++ b/pkg/daemon/daemon_test.go
@@ -58,11 +58,7 @@ func TestMain(m *testing.M) {
 		log.Fatal(err)
 	}
 	testDaemon = d
-	go func() {
-		if err := d.ListenAndServe(); err != ErrServerClosed {
-			log.Fatal(err)
-		}
-	}()
+	go d.ListenAndServe() //nolint:errcheck
 	code := m.Run()
 	os.Unsetenv("SOFT_SERVE_DATA_PATH")
 	os.Unsetenv("SOFT_SERVE_GIT_MAX_CONNECTIONS")
@@ -81,7 +77,7 @@ func TestIdleTimeout(t *testing.T) {
 	for {
 		c, err = net.Dial("tcp", testDaemon.addr)
 		if err != nil && tries >= 3 {
-			t.Fatal(err)
+			t.Fatalf("failed to connect to daemon after %d tries: %v", tries, err)
 		}
 		tries++
 		if testDaemon.conns.Size() != 0 {
@@ -99,7 +95,7 @@ func TestIdleTimeout(t *testing.T) {
 func TestInvalidRepo(t *testing.T) {
 	c, err := net.Dial("tcp", testDaemon.addr)
 	if err != nil {
-		t.Fatal(err)
+		t.Fatalf("failed to connect to daemon: %v", err)
 	}
 	if err := pktline.NewEncoder(c).EncodeString("git-upload-pack /test.git\x00"); err != nil {
 		t.Fatalf("expected nil, got error: %v", err)