diff --git a/network/p2p/testing/httpNode.go b/network/p2p/testing/httpNode.go
index ff226d7b55..8a538173e4 100644
--- a/network/p2p/testing/httpNode.go
+++ b/network/p2p/testing/httpNode.go
@@ -67,7 +67,9 @@ func (p *HTTPNode) RegisterHandlers(dispatch []network.TaggedMessageHandler) {}
 func (p *HTTPNode) Start() error {
 	go func() {
 		err := p.httpServer.Serve()
-		require.NoError(p.tb, err)
+		if err != nil {
+			require.ErrorIs(p.tb, err, http.ErrServerClosed)
+		}
 	}()
 	return nil
 }
diff --git a/network/p2pNetwork.go b/network/p2pNetwork.go
index 711f7d92a9..9078a85bce 100644
--- a/network/p2pNetwork.go
+++ b/network/p2pNetwork.go
@@ -593,9 +593,9 @@ func (n *P2PNetwork) httpdThread() {
 	defer n.wg.Done()
 
 	err := n.httpServer.Serve()
-	if err != nil {
+	if err == http.ErrServerClosed {
+	} else if err != nil {
 		n.log.Errorf("Error serving libp2phttp: %v", err)
-		return
 	}
 }