diff --git a/Gopkg.toml b/Gopkg.toml
index 36688f34..0dfd2321 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -27,10 +27,6 @@ ignored = ["k8s.io/code-generator"]
   branch = "master"
   name = "github.com/golang/glog"
 
-[[constraint]]
-  branch = "master"
-  name = "golang.org/x/net"
-
 [[constraint]]
   name = "google.golang.org/grpc"
   version = "1.11.0"
diff --git a/internal/deviceplugin/server_test.go b/internal/deviceplugin/server_test.go
index 919b4929..39b1a743 100644
--- a/internal/deviceplugin/server_test.go
+++ b/internal/deviceplugin/server_test.go
@@ -15,6 +15,7 @@
 package deviceplugin
 
 import (
+	"context"
 	"fmt"
 	"net"
 	"os"
@@ -23,7 +24,6 @@ import (
 	"testing"
 	"time"
 
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"