diff --git a/cmd/docker/completions.go b/cmd/docker/completions.go
index afa87d7008..95ee737b42 100644
--- a/cmd/docker/completions.go
+++ b/cmd/docker/completions.go
@@ -6,17 +6,15 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func registerCompletionFuncForGlobalFlags(contextStore store.Store, cmd *cobra.Command) error {
-	err := cmd.RegisterFlagCompletionFunc(
-		"context",
-		func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-			names, err := store.Names(contextStore)
-			if err != nil {
-				return nil, cobra.ShellCompDirectiveError
-			}
-			return names, cobra.ShellCompDirectiveNoFileComp
-		},
-	)
+type contextStoreProvider interface {
+	ContextStore() store.Store
+}
+
+func registerCompletionFuncForGlobalFlags(dockerCLI contextStoreProvider, cmd *cobra.Command) error {
+	err := cmd.RegisterFlagCompletionFunc("context", func(*cobra.Command, []string, string) ([]string, cobra.ShellCompDirective) {
+		names, _ := store.Names(dockerCLI.ContextStore())
+		return names, cobra.ShellCompDirectiveNoFileComp
+	})
 	if err != nil {
 		return err
 	}
diff --git a/cmd/docker/docker.go b/cmd/docker/docker.go
index 99f28db80d..4df04923eb 100644
--- a/cmd/docker/docker.go
+++ b/cmd/docker/docker.go
@@ -100,7 +100,7 @@ func newDockerCommand(dockerCli *command.DockerCli) *cli.TopLevelCommand {
 	cmd.SetErr(dockerCli.Err())
 
 	opts, helpCmd = cli.SetupRootCommand(cmd)
-	_ = registerCompletionFuncForGlobalFlags(dockerCli.ContextStore(), cmd)
+	_ = registerCompletionFuncForGlobalFlags(dockerCli, cmd)
 	cmd.Flags().BoolP("version", "v", false, "Print version information and quit")
 	setFlagErrorFunc(dockerCli, cmd)