@@ -141,7 +141,7 @@ func TestLoadDaemonCliConfigWithoutTLSVerify(t *testing.T) {

 	loadedConfig, err := loadDaemonCliConfig(opts)

 	assert.NilError(t, err)

 	assert.Assert(t, loadedConfig != nil)

-	assert.Check(t, loadedConfig.TLS == nil)

+	assert.Check(t, is.Nil(loadedConfig.TLS))

 }

 func TestLoadDaemonCliConfigWithLogLevel(t *testing.T) {

@@ -7,6 +7,7 @@ import (

 	swarmapi "github.com/moby/swarmkit/v2/api"

 	"gotest.tools/v3/assert"

+	is "gotest.tools/v3/assert/cmp"

 )

 func TestTopologyFromGRPC(t *testing.T) {

@@ -23,7 +24,7 @@ func TestTopologyFromGRPC(t *testing.T) {

 func TestCapacityRangeFromGRPC(t *testing.T) {

 	nilCapacity := capacityRangeFromGRPC(nil)

-	assert.Assert(t, nilCapacity == nil)

+	assert.Assert(t, is.Nil(nilCapacity))

 	swarmZeroCapacity := &swarmapi.CapacityRange{}

 	zeroCapacity := capacityRangeFromGRPC(swarmZeroCapacity)

@@ -35,15 +35,15 @@ func TestSetWindowsCredentialSpecInSpec(t *testing.T) {

 		err := daemon.setWindowsCredentialSpec(&container.Container{}, spec)

 		assert.NilError(t, err)

-		assert.Check(t, spec.Windows == nil)

+		assert.Check(t, is.Nil(spec.Windows))

 		err = daemon.setWindowsCredentialSpec(&container.Container{HostConfig: &containertypes.HostConfig{}}, spec)

 		assert.NilError(t, err)

-		assert.Check(t, spec.Windows == nil)

+		assert.Check(t, is.Nil(spec.Windows))

 		err = daemon.setWindowsCredentialSpec(&container.Container{HostConfig: &containertypes.HostConfig{SecurityOpt: []string{}}}, spec)

 		assert.NilError(t, err)

-		assert.Check(t, spec.Windows == nil)

+		assert.Check(t, is.Nil(spec.Windows))

 	})

 	dummyContainerID := "dummy-container-ID"

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

 		err := daemon.setWindowsCredentialSpec(containerFactory(`file://C:\path\to\my\credspec.json`), spec)

 		assert.ErrorContains(t, err, "invalid credential spec: file:// path cannot be absolute")

-		assert.Check(t, spec.Windows == nil)

+		assert.Check(t, is.Nil(spec.Windows))

 	})

 	t.Run("it's not allowed to use a 'file://' option breaking out of the cred specs' directory", func(t *testing.T) {

@@ -99,7 +99,7 @@ func TestSetWindowsCredentialSpecInSpec(t *testing.T) {

 		err := daemon.setWindowsCredentialSpec(containerFactory(`file://..\credspec.json`), spec)

 		assert.ErrorContains(t, err, fmt.Sprintf("invalid credential spec: file:// path must be under %s", credSpecsDir))

-		assert.Check(t, spec.Windows == nil)

+		assert.Check(t, is.Nil(spec.Windows))

 	})

 	t.Run("when using a 'file://' option pointing to a file that doesn't exist, it fails gracefully", func(t *testing.T) {

@@ -108,7 +108,7 @@ func TestSetWindowsCredentialSpecInSpec(t *testing.T) {

 		err := daemon.setWindowsCredentialSpec(containerFactory("file://i-dont-exist.json"), spec)

 		assert.Check(t, is.ErrorContains(err, fmt.Sprintf("failed to load credential spec for container %s", dummyContainerID)))

 		assert.Check(t, is.ErrorIs(err, os.ErrNotExist))

-		assert.Check(t, spec.Windows == nil)

+		assert.Check(t, is.Nil(spec.Windows))

 	})

 	t.Run("happy path with a 'registry://' option", func(t *testing.T) {

@@ -138,7 +138,7 @@ func TestSetWindowsCredentialSpecInSpec(t *testing.T) {

 		err := daemon.setWindowsCredentialSpec(containerFactory("registry://my-cred-spec"), spec)

 		assert.ErrorContains(t, err, fmt.Sprintf("registry key %s could not be opened: %v", credentialSpecRegistryLocation, dummyError))

-		assert.Check(t, spec.Windows == nil)

+		assert.Check(t, is.Nil(spec.Windows))

 	})

 	t.Run("when using a 'registry://' option pointing to a value that doesn't exist, it fails gracefully", func(t *testing.T) {

@@ -219,7 +219,7 @@ func TestSetWindowsCredentialSpecInSpec(t *testing.T) {

 		err := daemon.setWindowsCredentialSpec(containerFactory("config://whatever"), spec)

 		assert.Equal(t, errInvalidCredentialSpecSecOpt, err)

-		assert.Check(t, spec.Windows == nil)

+		assert.Check(t, is.Nil(spec.Windows))

 	})

 	t.Run("happy path with a 'raw://' option", func(t *testing.T) {

@@ -250,7 +250,7 @@ func TestSetWindowsCredentialSpecInSpec(t *testing.T) {

 		err := daemon.setWindowsCredentialSpec(containerFactory("credentialspe=config://whatever"), spec)

 		assert.ErrorContains(t, err, "security option not supported: credentialspe")

-		assert.Check(t, spec.Windows == nil)

+		assert.Check(t, is.Nil(spec.Windows))

 	})

 	t.Run("it rejects unsupported credentialspec options", func(t *testing.T) {

@@ -259,7 +259,7 @@ func TestSetWindowsCredentialSpecInSpec(t *testing.T) {

 		err := daemon.setWindowsCredentialSpec(containerFactory("idontexist://whatever"), spec)

 		assert.Equal(t, errInvalidCredentialSpecSecOpt, err)

-		assert.Check(t, spec.Windows == nil)

+		assert.Check(t, is.Nil(spec.Windows))

 	})

 	for _, option := range []string{"file", "registry", "config", "raw"} {

@@ -269,7 +269,7 @@ func TestSetWindowsCredentialSpecInSpec(t *testing.T) {

 			err := daemon.setWindowsCredentialSpec(containerFactory(option+"://"), spec)

 			assert.Equal(t, errInvalidCredentialSpecSecOpt, err)

-			assert.Check(t, spec.Windows == nil)

+			assert.Check(t, is.Nil(spec.Windows))

 		})

 	}

 }

@@ -215,7 +215,7 @@ func (s *DockerAPISuite) TestGetContainerStatsRmRunning(c *testing.T) {

 	assert.NilError(c, err)

 	cli.DockerCmd(c, "rm", "-f", id)

-	assert.Assert(c, <-chErr == nil)

+	assert.Assert(c, is.Nil(<-chErr))

 }

 // ChannelBuffer holds a chan of byte array that can be populate in a goroutine.

@@ -1347,7 +1347,7 @@ func (s *DockerAPISuite) TestPostContainersCreateMemorySwappinessHostConfigOmitt

 	containerJSON, err := apiClient.ContainerInspect(testutil.GetContext(c), ctr.ID)

 	assert.NilError(c, err)

-	assert.Assert(c, containerJSON.HostConfig.MemorySwappiness == nil)

+	assert.Assert(c, is.Nil(containerJSON.HostConfig.MemorySwappiness))

 }

 // check validation is done daemon side and not only in cli

@@ -163,7 +163,7 @@ func (s *DockerAPISuite) TestExecAPIStartValidCommand(c *testing.T) {

 	var inspectJSON struct{ ExecIDs []string }

 	inspectContainer(ctx, c, name, &inspectJSON)

-	assert.Assert(c, inspectJSON.ExecIDs == nil)

+	assert.Assert(c, is.Nil(inspectJSON.ExecIDs))

 }

 // #30311

@@ -179,7 +179,7 @@ func (s *DockerAPISuite) TestExecAPIStartInvalidCommand(c *testing.T) {

 	var inspectJSON struct{ ExecIDs []string }

 	inspectContainer(ctx, c, name, &inspectJSON)

-	assert.Assert(c, inspectJSON.ExecIDs == nil)

+	assert.Assert(c, is.Nil(inspectJSON.ExecIDs))

 }

 func (s *DockerAPISuite) TestExecStateCleanup(c *testing.T) {

@@ -575,7 +575,7 @@ func (s *DockerSwarmSuite) TestAPISwarmServicesStateReporting(c *testing.T) {

 	assert.Assert(c, len(containers2) == instances)

 	for i := range containers {

 		if i == toRemove {

-			assert.Assert(c, containers2[i] == nil)

+			assert.Assert(c, is.Nil(containers2[i]))

 		} else {

 			assert.Assert(c, containers2[i] != nil)

 		}

@@ -601,7 +601,7 @@ func (s *DockerSwarmSuite) TestAPISwarmServicesStateReporting(c *testing.T) {

 	assert.Assert(c, len(containers2) == instances)

 	for i := range containers {

 		if i == toRemove {

-			assert.Assert(c, containers2[i] == nil)

+			assert.Assert(c, is.Nil(containers2[i]))

 		} else {

 			assert.Assert(c, containers2[i] != nil)

 		}

@@ -96,5 +96,5 @@ func TestNetworkStateCleanupOnDaemonStart(t *testing.T) {

 	assert.NilError(t, err)

 	assert.Assert(t, inspect.NetworkSettings.SandboxID == "")

 	assert.Assert(t, inspect.NetworkSettings.SandboxKey == "")

-	assert.Assert(t, inspect.NetworkSettings.Ports["80/tcp"] == nil)

+	assert.Assert(t, is.Nil(inspect.NetworkSettings.Ports["80/tcp"]))

 }

@@ -69,7 +69,7 @@ func TestImageInspectDescriptor(t *testing.T) {

 	assert.NilError(t, err)

 	if !testEnv.UsingSnapshotter() {

-		assert.Check(t, inspect.Descriptor == nil)

+		assert.Check(t, is.Nil(inspect.Descriptor))

 		return

 	}

@@ -50,7 +50,7 @@ func testServiceCreateInit(ctx context.Context, daemonEnabled bool) func(t *test

 		poll.WaitOn(t, swarm.RunningTasksCount(ctx, client, serviceID, 1), swarm.ServicePoll)

 		i := inspectServiceContainer(ctx, t, client, serviceID)

 		// HostConfig.Init == nil means that it delegates to daemon configuration

-		assert.Check(t, i.HostConfig.Init == nil)

+		assert.Check(t, is.Nil(i.HostConfig.Init))

 		serviceID = swarm.CreateService(ctx, t, d, swarm.ServiceWithInit(&booleanTrue))

 		poll.WaitOn(t, swarm.RunningTasksCount(ctx, client, serviceID, 1), swarm.ServicePoll)

@@ -261,7 +261,7 @@ func TestBindHostPortsError(t *testing.T) {

 	}

 	pbs, err := bindHostPorts(context.Background(), cfg, "")

 	assert.Check(t, is.Error(err, "port binding mismatch 80/tcp:8080-8080, 80/tcp:8080-8081"))

-	assert.Check(t, pbs == nil)

+	assert.Check(t, is.Nil(pbs))

 }

 func newIPNet(t *testing.T, cidr string) *net.IPNet {

@@ -132,7 +132,7 @@ func TestServiceGet(t *testing.T) {

 	v, err := service.Get(ctx, "notexist")

 	assert.Assert(t, IsNotExist(err))

-	assert.Check(t, v == nil)

+	assert.Check(t, is.Nil(v))

 	created, err := service.Create(ctx, "test", "d1")

 	assert.NilError(t, err)