diff --git a/components/cli/cli/config/config_test.go b/components/cli/cli/config/config_test.go
index ca036ea0d6..1314abe666 100644
--- a/components/cli/cli/config/config_test.go
+++ b/components/cli/cli/config/config_test.go
@@ -10,7 +10,6 @@ import (
 
 	"github.com/docker/cli/cli/config/configfile"
 	"github.com/docker/cli/cli/config/credentials"
-	"github.com/docker/cli/internal/test/testutil"
 	"github.com/docker/docker/pkg/homedir"
 	"github.com/gotestyourself/gotestyourself/assert"
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
@@ -78,7 +77,7 @@ func TestEmptyFile(t *testing.T) {
 	assert.NilError(t, err)
 
 	_, err = Load(tmpHome)
-	testutil.ErrorContains(t, err, "EOF")
+	assert.ErrorContains(t, err, "EOF")
 }
 
 func TestEmptyJSON(t *testing.T) {
@@ -122,7 +121,7 @@ email`: "Invalid auth configuration file",
 		assert.NilError(t, err)
 
 		_, err = Load(tmpHome)
-		testutil.ErrorContains(t, err, expectedError)
+		assert.ErrorContains(t, err, expectedError)
 	}
 }
 
@@ -469,7 +468,7 @@ func TestJSONSaveWithNoFile(t *testing.T) {
 	config, err := LoadFromReader(strings.NewReader(js))
 	assert.NilError(t, err)
 	err = config.Save()
-	testutil.ErrorContains(t, err, "with empty filename")
+	assert.ErrorContains(t, err, "with empty filename")
 
 	tmpHome, err := ioutil.TempDir("", "config-test")
 	assert.NilError(t, err)
@@ -500,7 +499,7 @@ func TestLegacyJSONSaveWithNoFile(t *testing.T) {
 	config, err := LegacyLoadFromReader(strings.NewReader(js))
 	assert.NilError(t, err)
 	err = config.Save()
-	testutil.ErrorContains(t, err, "with empty filename")
+	assert.ErrorContains(t, err, "with empty filename")
 
 	tmpHome, err := ioutil.TempDir("", "config-test")
 	assert.NilError(t, err)
diff --git a/components/cli/internal/test/cli.go b/components/cli/internal/test/cli.go
index ad9e1b1489..cac803712c 100644
--- a/components/cli/internal/test/cli.go
+++ b/components/cli/internal/test/cli.go
@@ -40,12 +40,14 @@ func NewFakeCli(client client.APIClient) *FakeCli {
 	outBuffer := new(bytes.Buffer)
 	errBuffer := new(bytes.Buffer)
 	return &FakeCli{
-		client:     client,
-		out:        command.NewOutStream(outBuffer),
-		outBuffer:  outBuffer,
-		err:        errBuffer,
-		in:         command.NewInStream(ioutil.NopCloser(strings.NewReader(""))),
-		configfile: configfile.New("configfile"),
+		client:    client,
+		out:       command.NewOutStream(outBuffer),
+		outBuffer: outBuffer,
+		err:       errBuffer,
+		in:        command.NewInStream(ioutil.NopCloser(strings.NewReader(""))),
+		// Use an empty string for filename so that tests don't create configfiles
+		// Set cli.ConfigFile().Filename to a tempfile to support Save.
+		configfile: configfile.New(""),
 	}
 }