diff --git a/api/templates/server/operation.gotmpl b/api/templates/server/operation.gotmpl
index 8bed59d920..cf24aacc5f 100644
--- a/api/templates/server/operation.gotmpl
+++ b/api/templates/server/operation.gotmpl
@@ -8,10 +8,8 @@ package {{ .Package }}
 // ----------------------------------------------------------------------------
 
 import (
+	"context"
 	"net/http"
-
-	context "golang.org/x/net/context"
-
   {{ range .DefaultImports }}{{ printf "%q" . }}
   {{ end }}
   {{ range $key, $value := .Imports }}{{ $key }} {{ printf "%q" $value }}
diff --git a/client/build_cancel.go b/client/build_cancel.go
index 4cf8c980a9..74df495089 100644
--- a/client/build_cancel.go
+++ b/client/build_cancel.go
@@ -1,9 +1,8 @@
 package client // import "github.com/docker/docker/client"
 
 import (
+	"context"
 	"net/url"
-
-	"golang.org/x/net/context"
 )
 
 // BuildCancel requests the daemon to cancel ongoing build request
diff --git a/client/hijack_test.go b/client/hijack_test.go
index 823bf344f5..d71dc9ea38 100644
--- a/client/hijack_test.go
+++ b/client/hijack_test.go
@@ -1,6 +1,7 @@
 package client
 
 import (
+	"context"
 	"fmt"
 	"io/ioutil"
 	"net"
@@ -12,7 +13,6 @@ import (
 	"github.com/docker/docker/api/server/httputils"
 	"github.com/docker/docker/api/types"
 	"github.com/pkg/errors"
-	"golang.org/x/net/context"
 	"gotest.tools/assert"
 )