diff --git a/pkg/genericapiserver/registry/generic/rest/streamer_test.go b/pkg/genericapiserver/registry/generic/rest/streamer_test.go
index 25900a959d..4372c62cc6 100644
--- a/pkg/genericapiserver/registry/generic/rest/streamer_test.go
+++ b/pkg/genericapiserver/registry/generic/rest/streamer_test.go
@@ -28,7 +28,7 @@ import (
 	"testing"
 
 	"k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 func TestInputStreamReader(t *testing.T) {
@@ -132,7 +132,7 @@ func TestInputStreamInternalServerErrorTransport(t *testing.T) {
 	streamer := &LocationStreamer{
 		Location:        location,
 		Transport:       fakeInternalServerErrorTransport("text/plain", message),
-		ResponseChecker: NewGenericHttpResponseChecker(api.Resource(""), ""),
+		ResponseChecker: NewGenericHttpResponseChecker(schema.GroupResource{}, ""),
 	}
 	expectedError := errors.NewInternalError(fmt.Errorf("%s", message))
 
diff --git a/pkg/genericapiserver/server/mux/container.go b/pkg/genericapiserver/server/mux/container.go
index 6d9c72dad0..dc6b61b9d5 100644
--- a/pkg/genericapiserver/server/mux/container.go
+++ b/pkg/genericapiserver/server/mux/container.go
@@ -28,7 +28,6 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
 )
 
@@ -82,12 +81,12 @@ func logStackOnRecover(s runtime.NegotiatedSerializer, panicReason interface{},
 	if ct := w.Header().Get("Content-Type"); len(ct) > 0 {
 		headers.Set("Accept", ct)
 	}
-	responsewriters.ErrorNegotiated(apierrors.NewGenericServerResponse(http.StatusInternalServerError, "", api.Resource(""), "", "", 0, false), s, schema.GroupVersion{}, w, &http.Request{Header: headers})
+	responsewriters.ErrorNegotiated(apierrors.NewGenericServerResponse(http.StatusInternalServerError, "", schema.GroupResource{}, "", "", 0, false), s, schema.GroupVersion{}, w, &http.Request{Header: headers})
 }
 
 func serviceErrorHandler(s runtime.NegotiatedSerializer, serviceErr restful.ServiceError, request *restful.Request, resp *restful.Response) {
 	responsewriters.ErrorNegotiated(
-		apierrors.NewGenericServerResponse(serviceErr.Code, "", api.Resource(""), "", serviceErr.Message, 0, false),
+		apierrors.NewGenericServerResponse(serviceErr.Code, "", schema.GroupResource{}, "", serviceErr.Message, 0, false),
 		s,
 		schema.GroupVersion{},
 		resp,