diff --git a/command/secret/create.go b/command/secret/create.go
index 9800048341..da1cb9275e 100644
--- a/command/secret/create.go
+++ b/command/secret/create.go
@@ -1,7 +1,6 @@
 package secret
 
 import (
-	"context"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -12,6 +11,7 @@ import (
 	"github.com/docker/docker/opts"
 	runconfigopts "github.com/docker/docker/runconfig/opts"
 	"github.com/spf13/cobra"
+	"golang.org/x/net/context"
 )
 
 type createOptions struct {
diff --git a/command/secret/inspect.go b/command/secret/inspect.go
index 25da79f16d..ad61706b35 100644
--- a/command/secret/inspect.go
+++ b/command/secret/inspect.go
@@ -1,12 +1,11 @@
 package secret
 
 import (
-	"context"
-
 	"github.com/docker/docker/cli"
 	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/cli/command/inspect"
 	"github.com/spf13/cobra"
+	"golang.org/x/net/context"
 )
 
 type inspectOptions struct {
diff --git a/command/secret/ls.go b/command/secret/ls.go
index 67fc1daff6..7471f08b19 100644
--- a/command/secret/ls.go
+++ b/command/secret/ls.go
@@ -1,7 +1,6 @@
 package secret
 
 import (
-	"context"
 	"fmt"
 	"text/tabwriter"
 	"time"
@@ -11,6 +10,7 @@ import (
 	"github.com/docker/docker/cli/command"
 	"github.com/docker/go-units"
 	"github.com/spf13/cobra"
+	"golang.org/x/net/context"
 )
 
 type listOptions struct {
diff --git a/command/secret/remove.go b/command/secret/remove.go
index d277eceba2..0ee6d9f574 100644
--- a/command/secret/remove.go
+++ b/command/secret/remove.go
@@ -1,12 +1,12 @@
 package secret
 
 import (
-	"context"
 	"fmt"
 
 	"github.com/docker/docker/cli"
 	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
+	"golang.org/x/net/context"
 )
 
 type removeOptions struct {
diff --git a/command/secret/utils.go b/command/secret/utils.go
index d1a7d97c44..621e60aaaa 100644
--- a/command/secret/utils.go
+++ b/command/secret/utils.go
@@ -1,12 +1,11 @@
 package secret
 
 import (
-	"context"
-
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/client"
+	"golang.org/x/net/context"
 )
 
 func getSecretsByName(client client.APIClient, ctx context.Context, names []string) ([]swarm.Secret, error) {