diff --git a/physical/etcd/etcd3.go b/physical/etcd/etcd3.go
index 4c9a008f4b..94e617997e 100644
--- a/physical/etcd/etcd3.go
+++ b/physical/etcd/etcd3.go
@@ -1,6 +1,7 @@
 package etcd
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"os"
@@ -18,7 +19,6 @@ import (
 	log "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/vault/helper/strutil"
 	"github.com/hashicorp/vault/physical"
-	"golang.org/x/net/context"
 )
 
 // EtcdBackend is a physical backend that stores data at specific
diff --git a/physical/etcd/etcd_test.go b/physical/etcd/etcd_test.go
index c8b28b97dd..bbff4e8d87 100644
--- a/physical/etcd/etcd_test.go
+++ b/physical/etcd/etcd_test.go
@@ -1,6 +1,7 @@
 package etcd
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"testing"
@@ -11,7 +12,6 @@ import (
 	"github.com/hashicorp/vault/physical"
 
 	"github.com/coreos/etcd/client"
-	"golang.org/x/net/context"
 )
 
 func TestEtcdBackend(t *testing.T) {