diff --git a/pkg/endpoints/request/context.go b/pkg/endpoints/request/context.go
index b6e7d0dba..cc64aa194 100644
--- a/pkg/endpoints/request/context.go
+++ b/pkg/endpoints/request/context.go
@@ -63,7 +63,7 @@ const (
 	// userAgentKey is the context key for the request user agent.
 	userAgentKey
 
-	namespaceDefault = "default" // TODO(sttts): solve import cycle when using api.NamespaceDefault
+	namespaceDefault = "default" // TODO(sttts): solve import cycle when using metav1.NamespaceDefault
 )
 
 // NewContext instantiates a base context object for request flows.
diff --git a/pkg/endpoints/request/context_test.go b/pkg/endpoints/request/context_test.go
index c5e56564a..365cb114e 100644
--- a/pkg/endpoints/request/context_test.go
+++ b/pkg/endpoints/request/context_test.go
@@ -19,10 +19,10 @@ package request_test
 import (
 	"testing"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apiserver/pkg/authentication/user"
 	genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
-	"k8s.io/kubernetes/pkg/api"
 )
 
 // TestNamespaceContext validates that a namespace can be get/set on a context object
@@ -32,8 +32,8 @@ func TestNamespaceContext(t *testing.T) {
 	if !ok {
 		t.Fatalf("Error getting namespace")
 	}
-	if api.NamespaceDefault != result {
-		t.Fatalf("Expected: %s, Actual: %s", api.NamespaceDefault, result)
+	if metav1.NamespaceDefault != result {
+		t.Fatalf("Expected: %s, Actual: %s", metav1.NamespaceDefault, result)
 	}
 
 	ctx = genericapirequest.NewContext()
diff --git a/pkg/endpoints/request/requestinfo.go b/pkg/endpoints/request/requestinfo.go
index 4f231319e..bbfc547af 100644
--- a/pkg/endpoints/request/requestinfo.go
+++ b/pkg/endpoints/request/requestinfo.go
@@ -176,7 +176,7 @@ func (r *RequestInfoFactory) NewRequestInfo(req *http.Request) (*RequestInfo, er
 			}
 		}
 	} else {
-		requestInfo.Namespace = "" // TODO(sttts): solve import cycle when using api.NamespaceNone
+		requestInfo.Namespace = "" // TODO(sttts): solve import cycle when using metav1.NamespaceNone
 	}
 
 	// parsing successful, so we now know the proper value for .Parts
diff --git a/pkg/endpoints/request/requestinfo_test.go b/pkg/endpoints/request/requestinfo_test.go
index 6e8550f42..20ddb4b48 100644
--- a/pkg/endpoints/request/requestinfo_test.go
+++ b/pkg/endpoints/request/requestinfo_test.go
@@ -31,7 +31,7 @@ func (f fakeRL) TryAccept() bool { return bool(f) }
 func (f fakeRL) Accept()         {}
 
 func TestGetAPIRequestInfo(t *testing.T) {
-	namespaceAll := "" // TODO(sttts): solve import cycle when using api.NamespaceAll
+	namespaceAll := "" // TODO(sttts): solve import cycle when using metav1.NamespaceAll
 	successCases := []struct {
 		method              string
 		url                 string