@@ -56,7 +56,7 @@ func (s *DockerSuite) TestBuildResourceConstraintsAreUsed(c *testing.T) {

 	var c1 hostConfig

 	err := json.Unmarshal([]byte(cfg), &c1)

-	assert.Assert(c, err == nil, check.Commentf(cfg))

+	assert.Assert(c, err == nil, cfg)

 	assert.Equal(c, c1.Memory, int64(64*1024*1024), "resource constraints not set properly for Memory")

 	assert.Equal(c, c1.MemorySwap, int64(-1), "resource constraints not set properly for MemorySwap")

@@ -74,7 +74,7 @@ func (s *DockerSuite) TestBuildResourceConstraintsAreUsed(c *testing.T) {

 	var c2 hostConfig

 	err = json.Unmarshal([]byte(cfg), &c2)

-	assert.Assert(c, err == nil, check.Commentf(cfg))

+	assert.Assert(c, err == nil, cfg)

 	assert.Assert(c, c2.Memory != int64(64*1024*1024), "resource leaked from build for Memory")

 	assert.Assert(c, c2.MemorySwap != int64(-1), "resource leaked from build for MemorySwap")

@@ -1104,7 +1104,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkMultipleNetworksUngracefulDaemonRe

 func (s *DockerNetworkSuite) TestDockerNetworkRunNetByID(c *testing.T) {

 	out, _ := dockerCmd(c, "network", "create", "one")

 	containerOut, _, err := dockerCmdWithError("run", "-d", "--net", strings.TrimSpace(out), "busybox", "top")

-	assert.Assert(c, err == nil, check.Commentf(containerOut))

+	assert.Assert(c, err == nil, containerOut)

 }

 func (s *DockerNetworkSuite) TestDockerNetworkHostModeUngracefulDaemonRestart(c *testing.T) {

@@ -451,7 +451,7 @@ func (s *DockerSuite) TestPluginMetricsCollector(c *testing.T) {

 	name := "cpuguy83/docker-metrics-plugin-test:latest"

 	r := cli.Docker(cli.Args("plugin", "install", "--grant-all-permissions", name), cli.Daemon(d))

-	assert.Assert(c, r.Error == nil, check.Commentf(r.Combined()))

+	assert.Assert(c, r.Error == nil, r.Combined())

 	// plugin lisens on localhost:19393 and proxies the metrics

 	resp, err := http.Get("http://localhost:19393/metrics")

@@ -3633,7 +3633,7 @@ func (s *DockerSuite) TestRunStdinBlockedAfterContainerExit(c *testing.T) {

 	select {

 	case err := <-waitChan:

-		assert.Assert(c, err == nil, check.Commentf(stdout.String()))

+		assert.Assert(c, err == nil, stdout.String())

 	case <-time.After(30 * time.Second):

 		c.Fatal("timeout waiting for command to exit")

 	}