diff --git a/components/metrics/http.go b/components/metrics/http.go
index eb5d7e73f..3d5c1cbdb 100644
--- a/components/metrics/http.go
+++ b/components/metrics/http.go
@@ -1,6 +1,7 @@
 package metrics
 
 import (
+	"errors"
 	"net/http"
 
 	"github.com/go-chi/chi/v5"
@@ -31,7 +32,7 @@ func ServeHTTP(addr string, registry *prometheus.Registry) (cancel func()) {
 
 	go func() {
 		err := server.ListenAndServe()
-		if err != http.ErrServerClosed {
+		if !errors.Is(err, http.ErrServerClosed) {
 			panic(err)
 		}
 	}()
diff --git a/log.go b/log.go
index 55f332867..ee3b14a93 100644
--- a/log.go
+++ b/log.go
@@ -1,6 +1,7 @@
 package watermill
 
 import (
+	"errors"
 	"fmt"
 	"io"
 	"log"
@@ -216,7 +217,7 @@ func (c *CaptureLoggerAdapter) HasError(err error) bool {
 	defer c.lock.Unlock()
 
 	for _, capturedMsg := range c.captured[ErrorLogLevel] {
-		if capturedMsg.Err == err {
+		if errors.Is(err, capturedMsg.Err) {
 			return true
 		}
 	}
diff --git a/message/router/middleware/poison_test.go b/message/router/middleware/poison_test.go
index 41bfc2c9e..7153ac6b4 100644
--- a/message/router/middleware/poison_test.go
+++ b/message/router/middleware/poison_test.go
@@ -2,21 +2,20 @@ package middleware_test
 
 import (
 	"context"
+	stdErrors "errors"
 	"testing"
 	"time"
 
-	"github.com/ThreeDotsLabs/watermill"
-	"github.com/ThreeDotsLabs/watermill/message/subscriber"
-	"github.com/ThreeDotsLabs/watermill/pubsub/gochannel"
-
 	"github.com/hashicorp/go-multierror"
-
-	"github.com/ThreeDotsLabs/watermill/message"
-
-	"github.com/ThreeDotsLabs/watermill/message/router/middleware"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/ThreeDotsLabs/watermill"
+	"github.com/ThreeDotsLabs/watermill/message"
+	"github.com/ThreeDotsLabs/watermill/message/router/middleware"
+	"github.com/ThreeDotsLabs/watermill/message/subscriber"
+	"github.com/ThreeDotsLabs/watermill/pubsub/gochannel"
 )
 
 const topic = "testing_poison_queue_topic"
@@ -213,7 +212,7 @@ func TestPoisonQueueWithFilter_poison_queue(t *testing.T) {
 	msg := message.NewMessage("uuid", []byte("payload"))
 
 	poisonQueue, err := middleware.PoisonQueueWithFilter(&poisonPublisher, topic, func(err error) bool {
-		return err == poisonQueueErr
+		return stdErrors.Is(err, poisonQueueErr)
 	})
 	require.NoError(t, err)
 
@@ -232,7 +231,7 @@ func TestPoisonQueueWithFilter_non_poison_queue(t *testing.T) {
 	msg := message.NewMessage("uuid", []byte("payload"))
 
 	poisonQueue, err := middleware.PoisonQueueWithFilter(&poisonPublisher, topic, func(err error) bool {
-		return err != nonPoisonQueueErr
+		return !stdErrors.Is(err, nonPoisonQueueErr)
 	})
 	require.NoError(t, err)