@@ -1,7 +1,6 @@

 package containerd

 import (

-	"context"

 	"testing"

 	c8dimages "github.com/containerd/containerd/v2/core/images"

@@ -17,7 +16,7 @@ import (

 )

 func TestImageDelete(t *testing.T) {

-	ctx := namespaces.WithNamespace(context.TODO(), "testing")

+	ctx := namespaces.WithNamespace(t.Context(), "testing")

 	for _, tc := range []struct {

 		ref       string

@@ -1,7 +1,6 @@

 package containerd

 import (

-	"context"

 	"fmt"

 	"path/filepath"

 	"testing"

@@ -17,7 +16,7 @@ import (

 )

 func TestImageInspect(t *testing.T) {

-	ctx := namespaces.WithNamespace(context.TODO(), "testing")

+	ctx := namespaces.WithNamespace(t.Context(), "testing")

 	blobsDir := t.TempDir()

@@ -89,7 +89,7 @@ func BenchmarkImageList(b *testing.B) {

 	for _, count := range []int{10, 100, 1000} {

 		csDir := b.TempDir()

-		ctx := namespaces.WithNamespace(context.TODO(), "testing-"+strconv.Itoa(count))

+		ctx := namespaces.WithNamespace(b.Context(), "testing-"+strconv.Itoa(count))

 		cs := &delayedStore{

 			store:    &blobsDirContentStore{blobs: filepath.Join(csDir, "blobs/sha256")},

@@ -113,7 +113,7 @@ func BenchmarkImageList(b *testing.B) {

 }

 func TestImageListCheckTotalSize(t *testing.T) {

-	ctx := namespaces.WithNamespace(context.TODO(), "testing")

+	ctx := namespaces.WithNamespace(t.Context(), "testing")

 	blobsDir := t.TempDir()

 	cs := &blobsDirContentStore{blobs: filepath.Join(blobsDir, "blobs/sha256")}

@@ -209,7 +209,7 @@ func blobSize(t *testing.T, ctx context.Context, cs content.Store, dgst digest.D

 }

 func TestImageList(t *testing.T) {

-	ctx := namespaces.WithNamespace(context.TODO(), "testing")

+	ctx := namespaces.WithNamespace(t.Context(), "testing")

 	blobsDir := t.TempDir()

@@ -30,7 +30,7 @@ func TestImageLoad(t *testing.T) {

 	linuxArmv5 := ocispec.Platform{OS: "linux", Architecture: "arm", Variant: "v5"}

 	linuxRiscv64 := ocispec.Platform{OS: "linux", Architecture: "riskv64"}

-	ctx := namespaces.WithNamespace(context.TODO(), "testing-"+t.Name())

+	ctx := namespaces.WithNamespace(t.Context(), "testing-"+t.Name())

 	store, err := local.NewLabeledStore(t.TempDir(), &labelstore.InMemory{})

 	assert.NilError(t, err)

@@ -27,7 +27,7 @@ type pushTestCase struct {

 }

 func TestImagePushIndex(t *testing.T) {

-	ctx := namespaces.WithNamespace(context.TODO(), "testing-"+t.Name())

+	ctx := namespaces.WithNamespace(t.Context(), "testing-"+t.Name())

 	csDir := t.TempDir()

 	store := &blobsDirContentStore{blobs: filepath.Join(csDir, "blobs/sha256")}

@@ -1,7 +1,6 @@

 package containerd

 import (

-	"context"

 	"io"

 	"path/filepath"

 	"testing"

@@ -16,7 +15,7 @@ import (

 )

 func TestImageMultiplatformSaveShallowWithNative(t *testing.T) {

-	ctx := namespaces.WithNamespace(context.TODO(), "testing-"+t.Name())

+	ctx := namespaces.WithNamespace(t.Context(), "testing-"+t.Name())

 	contentDir := t.TempDir()

 	store := &blobsDirContentStore{blobs: filepath.Join(contentDir, "blobs/sha256")}

@@ -72,7 +71,7 @@ func TestImageMultiplatformSaveShallowWithNative(t *testing.T) {

 }

 func TestImageMultiplatformSaveShallowWithoutNative(t *testing.T) {

-	ctx := namespaces.WithNamespace(context.TODO(), "testing-"+t.Name())

+	ctx := namespaces.WithNamespace(t.Context(), "testing-"+t.Name())

 	contentDir := t.TempDir()

 	store := &blobsDirContentStore{blobs: filepath.Join(contentDir, "blobs/sha256")}

@@ -24,7 +24,7 @@ import (

 )

 func TestLookup(t *testing.T) {

-	ctx := namespaces.WithNamespace(context.TODO(), "testing")

+	ctx := namespaces.WithNamespace(t.Context(), "testing")

 	ctx = logtest.WithT(ctx, t)

 	mdb := newTestDB(ctx, t)

 	service := &ImageService{