diff --git a/api/types/filters/parse_test.go b/api/types/filters/parse_test.go
index 6c8b5dc291..f2d26169b2 100644
--- a/api/types/filters/parse_test.go
+++ b/api/types/filters/parse_test.go
@@ -567,7 +567,7 @@ func TestGetBoolOrDefault(t *testing.T) {
 				assert.Check(t, is.DeepEqual(expected.Value, actual.Value))
 
 				wrappedErr := fmt.Errorf("something went wrong: %w", err)
-				assert.Check(t, errors.Is(wrappedErr, err), "Expected a wrapped error to be detected as invalidFilter")
+				assert.Check(t, is.ErrorIs(wrappedErr, err), "Expected a wrapped error to be detected as invalidFilter")
 			}
 
 			assert.Check(t, is.Equal(tc.expectedValue, value))
diff --git a/client/request_test.go b/client/request_test.go
index 69a1266bce..30de71382a 100644
--- a/client/request_test.go
+++ b/client/request_test.go
@@ -3,7 +3,6 @@ package client // import "github.com/docker/docker/client"
 import (
 	"bytes"
 	"context"
-	"errors"
 	"fmt"
 	"io"
 	"math/rand"
@@ -125,7 +124,7 @@ func TestCanceledContext(t *testing.T) {
 
 	_, err := client.sendRequest(ctx, http.MethodGet, testEndpoint, nil, nil, nil)
 	assert.Check(t, is.ErrorType(err, errdefs.IsCancelled))
-	assert.Check(t, errors.Is(err, context.Canceled))
+	assert.Check(t, is.ErrorIs(err, context.Canceled))
 }
 
 func TestDeadlineExceededContext(t *testing.T) {
@@ -145,5 +144,5 @@ func TestDeadlineExceededContext(t *testing.T) {
 
 	_, err := client.sendRequest(ctx, http.MethodGet, testEndpoint, nil, nil, nil)
 	assert.Check(t, is.ErrorType(err, errdefs.IsDeadline))
-	assert.Check(t, errors.Is(err, context.DeadlineExceeded))
+	assert.Check(t, is.ErrorIs(err, context.DeadlineExceeded))
 }
diff --git a/daemon/logger/local/read_test.go b/daemon/logger/local/read_test.go
index 23dac2ac68..4a510e465c 100644
--- a/daemon/logger/local/read_test.go
+++ b/daemon/logger/local/read_test.go
@@ -6,7 +6,6 @@ import (
 	"testing"
 
 	"github.com/docker/docker/daemon/logger"
-	"github.com/pkg/errors"
 	"gotest.tools/v3/assert"
 )
 
@@ -36,7 +35,7 @@ func testDecode(t *testing.T, buf []byte, split int) {
 		assert.NilError(t, err)
 
 		_, err = d.Decode()
-		assert.Assert(t, errors.Is(err, io.EOF))
+		assert.ErrorIs(t, err, io.EOF)
 
 		_, err = fw.Write(buf[split:])
 		assert.NilError(t, err)
diff --git a/daemon/logger/loggerutils/sharedtemp_test.go b/daemon/logger/loggerutils/sharedtemp_test.go
index ac959d2107..f8c1efe400 100644
--- a/daemon/logger/loggerutils/sharedtemp_test.go
+++ b/daemon/logger/loggerutils/sharedtemp_test.go
@@ -181,7 +181,7 @@ func TestSharedTempFileConverter(t *testing.T) {
 				defer t.Logf("goroutine %v: exit", i)
 				start.Done()
 				_, err := uut.Do(src)
-				assert.Check(t, errors.Is(err, fakeErr), "in goroutine %v", i)
+				assert.Check(t, is.ErrorIs(err, fakeErr), "in goroutine %v", i)
 			}()
 		}
 		done.Wait()
@@ -190,7 +190,7 @@ func TestSharedTempFileConverter(t *testing.T) {
 		// request should retry from scratch.
 		fakeErr = errors.New("another fake error")
 		_, err = uut.Do(src)
-		assert.Check(t, errors.Is(err, fakeErr))
+		assert.Check(t, is.ErrorIs(err, fakeErr))
 
 		fakeErr = nil
 		f, err := uut.Do(src)
diff --git a/pkg/archive/archive_test.go b/pkg/archive/archive_test.go
index 06bea0e2c0..e11b9ea507 100644
--- a/pkg/archive/archive_test.go
+++ b/pkg/archive/archive_test.go
@@ -4,7 +4,6 @@ import (
 	"archive/tar"
 	"bytes"
 	"compress/gzip"
-	"errors"
 	"fmt"
 	"io"
 	"io/fs"
@@ -1255,7 +1254,7 @@ func TestXGlobalNoParent(t *testing.T) {
 
 	_, err = os.Lstat(filepath.Join(tmpDir, "foo"))
 	assert.Check(t, err != nil)
-	assert.Check(t, errors.Is(err, os.ErrNotExist))
+	assert.Check(t, is.ErrorIs(err, os.ErrNotExist))
 }
 
 // TestImpliedDirectoryPermissions ensures that directories implied by paths in the tar file, but without their own