diff --git a/registry/client/repository.go b/registry/client/repository.go
index d5f75bdaf..0cda0d832 100644
--- a/registry/client/repository.go
+++ b/registry/client/repository.go
@@ -14,8 +14,8 @@ import (
 	"github.com/docker/distribution/digest"
 
 	"github.com/docker/distribution"
+	"github.com/docker/distribution/context"
 	"github.com/docker/distribution/registry/api/v2"
-	"golang.org/x/net/context"
 )
 
 // NewRepository creates a new Repository for the given repository name and endpoint
diff --git a/registry/client/repository_test.go b/registry/client/repository_test.go
index 1674213d6..f53112dc0 100644
--- a/registry/client/repository_test.go
+++ b/registry/client/repository_test.go
@@ -14,10 +14,10 @@ import (
 
 	"code.google.com/p/go-uuid/uuid"
 
+	"github.com/docker/distribution/context"
 	"github.com/docker/distribution/digest"
 	"github.com/docker/distribution/manifest"
 	"github.com/docker/distribution/testutil"
-	"golang.org/x/net/context"
 )
 
 func testServer(rrm testutil.RequestResponseMap) (string, func()) {