@@ -22,7 +22,7 @@ import (

 )

 func TestBuildWithRemoveAndForceRemove(t *testing.T) {

-	defer setupTest(t)()

+	t.Cleanup(setupTest(t))

 	cases := []struct {

 		name                           string

@@ -577,7 +577,7 @@ COPY --from=intermediate C:\\stuff C:\\stuff

 func TestBuildWithEmptyDockerfile(t *testing.T) {

 	skip.If(t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.40"), "broken in earlier versions")

 	ctx := context.TODO()

-	defer setupTest(t)()

+	t.Cleanup(setupTest(t))

 	tests := []struct {

 		name        string

@@ -13,7 +13,7 @@ import (

 // TestContainerInvalidJSON tests that POST endpoints that expect a body return

 // the correct error when sending invalid JSON requests.

 func TestContainerInvalidJSON(t *testing.T) {

-	defer setupTest(t)()

+	t.Cleanup(setupTest(t))

 	// POST endpoints that accept / expect a JSON body;

 	endpoints := []string{

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

 )

 func TestCreateFailsWhenIdentifierDoesNotExist(t *testing.T) {

-	defer setupTest(t)()

+	t.Cleanup(setupTest(t))

 	client := testEnv.APIClient()

 	testCases := []struct {

@@ -90,7 +90,7 @@ func TestCreateLinkToNonExistingContainer(t *testing.T) {

 }

 func TestCreateWithInvalidEnv(t *testing.T) {

-	defer setupTest(t)()

+	t.Cleanup(setupTest(t))

 	client := testEnv.APIClient()

 	testCases := []struct {

@@ -337,7 +337,7 @@ func TestCreateWithCustomReadonlyPaths(t *testing.T) {

 }

 func TestCreateWithInvalidHealthcheckParams(t *testing.T) {

-	defer setupTest(t)()

+	t.Cleanup(setupTest(t))

 	client := testEnv.APIClient()

 	ctx := context.Background()

@@ -532,7 +532,7 @@ func TestCreatePlatformSpecificImageNoPlatform(t *testing.T) {

 func TestCreateInvalidHostConfig(t *testing.T) {

 	skip.If(t, testEnv.DaemonInfo.OSType == "windows")

-	defer setupTest(t)()

+	t.Cleanup(setupTest(t))

 	apiClient := testEnv.APIClient()

 	ctx := context.Background()

@@ -18,7 +18,7 @@ import (

 // via HostConfig.Devices through to the implementation in hcsshim.

 func TestWindowsDevices(t *testing.T) {

 	skip.If(t, testEnv.DaemonInfo.OSType != "windows")

-	defer setupTest(t)()

+	t.Cleanup(setupTest(t))

 	client := testEnv.APIClient()

 	ctx := context.Background()

@@ -91,7 +91,7 @@ func TestContainerNetworkMountsNoChown(t *testing.T) {

 func TestMountDaemonRoot(t *testing.T) {

 	skip.If(t, testEnv.IsRemoteDaemon)

-	defer setupTest(t)()

+	t.Cleanup(setupTest(t))

 	client := testEnv.APIClient()

 	ctx := context.Background()

 	info, err := client.Info(ctx)

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

 // a timeout works as documented, i.e. in case of negative timeout

 // waiting is not limited (issue #35311).

 func TestStopContainerWithTimeout(t *testing.T) {

-	defer setupTest(t)()

+	t.Cleanup(setupTest(t))

 	client := testEnv.APIClient()

 	ctx := context.Background()

@@ -18,7 +18,7 @@ import (

 // waiting is not limited (issue #35311).

 func TestStopContainerWithTimeout(t *testing.T) {

 	skip.If(t, testEnv.DaemonInfo.OSType == "windows")

-	defer setupTest(t)()

+	t.Cleanup(setupTest(t))

 	client := testEnv.APIClient()

 	ctx := context.Background()

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

 )

 func TestWaitNonBlocked(t *testing.T) {

-	defer setupTest(t)()

+	t.Cleanup(setupTest(t))

 	cli := request.NewAPIClient(t)

 	testCases := []struct {

@@ -59,7 +59,7 @@ func TestWaitBlocked(t *testing.T) {

 	// Windows busybox does not support trap in this way, not sleep with sub-second

 	// granularity. It will always exit 0x40010004.

 	skip.If(t, testEnv.DaemonInfo.OSType != "linux")

-	defer setupTest(t)()

+	t.Cleanup(setupTest(t))

 	cli := request.NewAPIClient(t)

 	testCases := []struct {

@@ -104,7 +104,7 @@ func TestWaitBlocked(t *testing.T) {

 }

 func TestWaitConditions(t *testing.T) {

-	defer setupTest(t)()

+	t.Cleanup(setupTest(t))

 	cli := request.NewAPIClient(t)

 	testCases := []struct {

@@ -179,7 +179,7 @@ func TestWaitConditions(t *testing.T) {

 }

 func TestWaitRestartedContainer(t *testing.T) {

-	defer setupTest(t)()

+	t.Cleanup(setupTest(t))

 	cli := request.NewAPIClient(t)

 	testCases := []struct {

@@ -67,7 +67,7 @@ func TestRunContainerWithBridgeNone(t *testing.T) {

 // TestNetworkInvalidJSON tests that POST endpoints that expect a body return

 // the correct error when sending invalid JSON requests.

 func TestNetworkInvalidJSON(t *testing.T) {

-	defer setupTest(t)()

+	t.Cleanup(setupTest(t))

 	// POST endpoints that accept / expect a JSON body;

 	endpoints := []string{

@@ -126,7 +126,7 @@ func TestNetworkInvalidJSON(t *testing.T) {

 // TestNetworkList verifies that /networks returns a list of networks either

 // with, or without a trailing slash (/networks/). Regression test for https://github.com/moby/moby/issues/24595

 func TestNetworkList(t *testing.T) {

-	defer setupTest(t)()

+	t.Cleanup(setupTest(t))

 	endpoints := []string{

 		"/networks",

@@ -33,7 +33,7 @@ import (

 // TestPluginInvalidJSON tests that POST endpoints that expect a body return

 // the correct error when sending invalid JSON requests.

 func TestPluginInvalidJSON(t *testing.T) {

-	defer setupTest(t)()

+	t.Cleanup(setupTest(t))

 	// POST endpoints that accept / expect a JSON body;

 	endpoints := []string{

@@ -196,7 +196,7 @@ func TestVolumesInspect(t *testing.T) {

 // TestVolumesInvalidJSON tests that POST endpoints that expect a body return

 // the correct error when sending invalid JSON requests.

 func TestVolumesInvalidJSON(t *testing.T) {

-	defer setupTest(t)()

+	t.Cleanup(setupTest(t))

 	// POST endpoints that accept / expect a JSON body;

 	endpoints := []string{"/volumes/create"}