@@ -33,8 +33,8 @@ func TestImagePullPlatformInvalid(t *testing.T) {

 	_, err := client.ImagePull(ctx, "docker.io/library/hello-world:latest", types.ImagePullOptions{Platform: "foobar"})

 	assert.Assert(t, err != nil)

-	assert.ErrorContains(t, err, "unknown operating system or architecture")

-	assert.Assert(t, errdefs.IsInvalidParameter(err))

+	assert.Check(t, is.ErrorContains(err, "unknown operating system or architecture"))

+	assert.Check(t, is.ErrorType(err, errdefs.IsInvalidParameter))

 }

 func createTestImage(ctx context.Context, t testing.TB, store content.Store) ocispec.Descriptor {

@@ -52,7 +52,7 @@ func createTestImage(ctx context.Context, t testing.TB, store content.Store) oci

 	assert.NilError(t, err)

 	layerDigest := w.Digest()

-	w.Close()

+	assert.Check(t, w.Close())

 	img := ocispec.Image{

 		Platform: platforms.DefaultSpec(),

@@ -70,7 +70,7 @@ func createTestImage(ctx context.Context, t testing.TB, store content.Store) oci

 	assert.NilError(t, w.Commit(ctx, int64(len(imgJSON)), digest.FromBytes(imgJSON)))

 	configDigest := w.Digest()

-	w.Close()

+	assert.Check(t, w.Close())

 	info, err := store.Info(ctx, layerDigest)

 	assert.NilError(t, err)

@@ -103,7 +103,7 @@ func createTestImage(ctx context.Context, t testing.TB, store content.Store) oci

 	assert.NilError(t, w.Commit(ctx, int64(len(manifestJSON)), digest.FromBytes(manifestJSON)))

 	manifestDigest := w.Digest()

-	w.Close()

+	assert.Check(t, w.Close())

 	return ocispec.Descriptor{

 		MediaType: images.MediaTypeDockerSchema2Manifest,

@@ -114,7 +114,7 @@ func createTestImage(ctx context.Context, t testing.TB, store content.Store) oci

 // Make sure that pulling by an already cached digest but for a different ref (that should not have that digest)

 // verifies with the remote that the digest exists in that repo.

-func TestImagePullStoredfDigestForOtherRepo(t *testing.T) {

+func TestImagePullStoredDigestForOtherRepo(t *testing.T) {

 	skip.If(t, testEnv.IsRemoteDaemon, "cannot run daemon when remote daemon")

 	skip.If(t, testEnv.DaemonInfo.OSType == "windows", "We don't run a test registry on Windows")

 	skip.If(t, testEnv.IsRootless, "Rootless has a different view of localhost (needed for test registry access)")

@@ -146,15 +146,17 @@ func TestImagePullStoredfDigestForOtherRepo(t *testing.T) {

 	rdr, err := client.ImagePull(ctx, remote, types.ImagePullOptions{})

 	assert.NilError(t, err)

 	defer rdr.Close()

-	io.Copy(io.Discard, rdr)

+	_, err = io.Copy(io.Discard, rdr)

+	assert.Check(t, err)

 	// Now, pull a totally different repo with a the same digest

 	rdr, err = client.ImagePull(ctx, path.Join(registry.DefaultURL, "other:image@"+desc.Digest.String()), types.ImagePullOptions{})

 	if rdr != nil {

-		rdr.Close()

+		assert.Check(t, rdr.Close())

 	}

 	assert.Assert(t, err != nil, "Expected error, got none: %v", err)

 	assert.Assert(t, errdefs.IsNotFound(err), err)

+	assert.Check(t, is.ErrorType(err, errdefs.IsNotFound))

 }

 // TestImagePullNonExisting pulls non-existing images from the central registry, with different

@@ -184,7 +186,7 @@ func TestImagePullNonExisting(t *testing.T) {

 			}

 			expectedMsg := fmt.Sprintf("pull access denied for %s, repository does not exist or may require 'docker login'", "asdfasdf")

-			assert.Assert(t, is.ErrorContains(err, expectedMsg))

+			assert.Check(t, is.ErrorContains(err, expectedMsg))

 			assert.Check(t, is.ErrorType(err, errdefs.IsNotFound))

 			if all {

 				// pull -a on a nonexistent registry should fall back as well