diff --git a/plugin/pkg/client/auth/gcp/gcp.go b/plugin/pkg/client/auth/gcp/gcp.go
index 3a4f8677..193d0c72 100644
--- a/plugin/pkg/client/auth/gcp/gcp.go
+++ b/plugin/pkg/client/auth/gcp/gcp.go
@@ -18,6 +18,7 @@ package gcp
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -27,7 +28,6 @@ import (
 	"time"
 
 	"github.com/golang/glog"
-	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
 	"k8s.io/apimachinery/pkg/util/net"
diff --git a/tools/cache/listwatch.go b/tools/cache/listwatch.go
index 06657a3b..8bf41f51 100644
--- a/tools/cache/listwatch.go
+++ b/tools/cache/listwatch.go
@@ -17,10 +17,9 @@ limitations under the License.
 package cache
 
 import (
+	"context"
 	"time"
 
-	"golang.org/x/net/context"
-
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
diff --git a/tools/pager/pager.go b/tools/pager/pager.go
index 2e0874e0..74ea3586 100644
--- a/tools/pager/pager.go
+++ b/tools/pager/pager.go
@@ -17,10 +17,9 @@ limitations under the License.
 package pager
 
 import (
+	"context"
 	"fmt"
 
-	"golang.org/x/net/context"
-
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
diff --git a/tools/pager/pager_test.go b/tools/pager/pager_test.go
index b905fc1f..ae517cab 100644
--- a/tools/pager/pager_test.go
+++ b/tools/pager/pager_test.go
@@ -17,11 +17,11 @@ limitations under the License.
 package pager
 
 import (
+	"context"
 	"fmt"
 	"reflect"
 	"testing"
 
-	"golang.org/x/net/context"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"