diff --git a/server/test_helpers.go b/server/test_helpers.go
index 0bc6bac801..bb19df695d 100644
--- a/server/test_helpers.go
+++ b/server/test_helpers.go
@@ -13,16 +13,10 @@ func FreeTCPAddr() (addr, port string, err error) {
 		return "", "", err
 	}
 
-	closer := func() {
-		err := l.Close()
-		if err != nil {
-			// TODO: Handle with #870
-			panic(err)
-		}
+	if err := l.Close(); err != nil {
+		return "", "", fmt.Errorf("couldn't close the listener: %w", err)
 	}
 
-	defer closer()
-
 	portI := l.Addr().(*net.TCPAddr).Port
 	port = fmt.Sprintf("%d", portI)
 	addr = fmt.Sprintf("tcp://0.0.0.0:%s", port)