diff --git a/integration/apply_test.go b/integration/apply_test.go
index 91f9c2d31d78427e1086f3fcc2bd6553cb2c45ef..c64f23cfdfbac486b095adf4d0dbe0a8585ed455 100644
--- a/integration/apply_test.go
+++ b/integration/apply_test.go
@@ -5,7 +5,7 @@ package integration
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
-	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/api/core/v1"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/integration/delete_test.go b/integration/delete_test.go
index 785675e981bf2d628e41fb4cfff64c42eba7a483..97183e58a2526e5876193e0f5a0730c8a55bdc02 100644
--- a/integration/delete_test.go
+++ b/integration/delete_test.go
@@ -6,7 +6,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/api/core/v1"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/integration/integration_suite_test.go b/integration/integration_suite_test.go
index fe13ef06755c0618bd46d3854927fc8ef5c3d7ea..ab3112b3d980f062c0a9b57f952869a5fc32fc3b 100644
--- a/integration/integration_suite_test.go
+++ b/integration/integration_suite_test.go
@@ -15,8 +15,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
-	"k8s.io/client-go/pkg/api"
-	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 
@@ -25,9 +25,6 @@ import (
 
 	// For client auth plugins
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
-
-	// For apimachinery serialisation magic
-	_ "k8s.io/client-go/pkg/api/install"
 )
 
 var kubeconfig = flag.String("kubeconfig", "", "absolute path to the kubeconfig file")
@@ -35,7 +32,11 @@ var ksonnetBin = flag.String("ksonnet-bin", "ks", "path to ksonnet executable un
 var ksonnetData = flag.String("fixtures", "integration/fixtures", "path to ksonnet test data")
 
 func init() {
-	if missingVersions := api.Registry.ValidateEnvRequestedVersions(); len(missingVersions) != 0 {
+	registrationManager, err := registered.NewAPIRegistrationManager("")
+	if err != nil {
+		panic(err.Error())
+	}
+	if missingVersions := registrationManager.ValidateEnvRequestedVersions(); len(missingVersions) != 0 {
 		panic(fmt.Sprintf("KUBE_API_VERSIONS contains versions that are not installed: %q.", missingVersions))
 	}
 }
diff --git a/utils/client.go b/utils/client.go
index db67a1b45b4f31d3b4de708d59269a47f635ed7d..9bb34b872a0641bbd46cdb7be12ee3f12883313d 100644
--- a/utils/client.go
+++ b/utils/client.go
@@ -19,8 +19,9 @@ import (
 	"fmt"
 	"sync"
 
+	"github.com/googleapis/gnostic/OpenAPIv2"
+
 	"github.com/emicklei/go-restful-swagger12"
-	"github.com/go-openapi/spec"
 	log "github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -38,7 +39,7 @@ type memcachedDiscoveryClient struct {
 	servergroups    *metav1.APIGroupList
 	serverresources map[string]*metav1.APIResourceList
 	schemas         map[string]*swagger.ApiDeclaration
-	schema          *spec.Swagger
+	schema          *openapi_v2.Document
 }
 
 // NewMemcachedDiscoveryClient creates a new DiscoveryClient that
@@ -125,7 +126,7 @@ func (c *memcachedDiscoveryClient) SwaggerSchema(version schema.GroupVersion) (*
 	return schema, nil
 }
 
-func (c *memcachedDiscoveryClient) OpenAPISchema() (*spec.Swagger, error) {
+func (c *memcachedDiscoveryClient) OpenAPISchema() (*openapi_v2.Document, error) {
 	c.lock.Lock()
 	defer c.lock.Unlock()
 
@@ -145,7 +146,7 @@ func (c *memcachedDiscoveryClient) OpenAPISchema() (*spec.Swagger, error) {
 var _ discovery.CachedDiscoveryInterface = &memcachedDiscoveryClient{}
 
 // ClientForResource returns the ResourceClient for a given object
-func ClientForResource(pool dynamic.ClientPool, disco discovery.DiscoveryInterface, obj runtime.Object, defNs string) (*dynamic.ResourceClient, error) {
+func ClientForResource(pool dynamic.ClientPool, disco discovery.DiscoveryInterface, obj runtime.Object, defNs string) (dynamic.ResourceInterface, error) {
 	gvk := obj.GetObjectKind().GroupVersionKind()
 
 	client, err := pool.ClientForGroupVersionKind(gvk)