diff --git a/pkg/registry/storage/csidriver/storage/BUILD b/pkg/registry/storage/csidriver/storage/BUILD
index bdbddb61343..ab66d6d8b1b 100644
--- a/pkg/registry/storage/csidriver/storage/BUILD
+++ b/pkg/registry/storage/csidriver/storage/BUILD
@@ -33,10 +33,8 @@ go_test(
     srcs = ["storage_test.go"],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/api/testapi:go_default_library",
         "//pkg/apis/storage:go_default_library",
         "//pkg/registry/registrytest:go_default_library",
-        "//staging/src/k8s.io/api/storage/v1beta1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
diff --git a/pkg/registry/storage/csidriver/storage/storage_test.go b/pkg/registry/storage/csidriver/storage/storage_test.go
index ea0ae5636a2..715b8063ca9 100644
--- a/pkg/registry/storage/csidriver/storage/storage_test.go
+++ b/pkg/registry/storage/csidriver/storage/storage_test.go
@@ -19,7 +19,6 @@ package storage
 import (
 	"testing"
 
-	storageapiv1beta1 "k8s.io/api/storage/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/labels"
@@ -27,7 +26,6 @@ import (
 	"k8s.io/apiserver/pkg/registry/generic"
 	genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
 	etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
-	"k8s.io/kubernetes/pkg/api/testapi"
 	storageapi "k8s.io/kubernetes/pkg/apis/storage"
 	"k8s.io/kubernetes/pkg/registry/registrytest"
 )
@@ -59,11 +57,6 @@ func validNewCSIDriver(name string) *storageapi.CSIDriver {
 }
 
 func TestCreate(t *testing.T) {
-	if *testapi.Storage.GroupVersion() != storageapiv1beta1.SchemeGroupVersion {
-		// skip the test for all versions exception v1beta1
-		return
-	}
-
 	storage, server := newStorage(t)
 	defer server.Terminate(t)
 	defer storage.Store.DestroyFunc()
@@ -87,11 +80,6 @@ func TestCreate(t *testing.T) {
 }
 
 func TestUpdate(t *testing.T) {
-	if *testapi.Storage.GroupVersion() != storageapiv1beta1.SchemeGroupVersion {
-		// skip the test for all versions exception v1beta1
-		return
-	}
-
 	storage, server := newStorage(t)
 	defer server.Terminate(t)
 	defer storage.Store.DestroyFunc()
@@ -117,11 +105,6 @@ func TestUpdate(t *testing.T) {
 }
 
 func TestDelete(t *testing.T) {
-	if *testapi.Storage.GroupVersion() != storageapiv1beta1.SchemeGroupVersion {
-		// skip the test for all versions exception v1beta1
-		return
-	}
-
 	storage, server := newStorage(t)
 	defer server.Terminate(t)
 	defer storage.Store.DestroyFunc()
@@ -130,11 +113,6 @@ func TestDelete(t *testing.T) {
 }
 
 func TestGet(t *testing.T) {
-	if *testapi.Storage.GroupVersion() != storageapiv1beta1.SchemeGroupVersion {
-		// skip the test for all versions exception v1beta1
-		return
-	}
-
 	storage, server := newStorage(t)
 	defer server.Terminate(t)
 	defer storage.Store.DestroyFunc()
@@ -143,11 +121,6 @@ func TestGet(t *testing.T) {
 }
 
 func TestList(t *testing.T) {
-	if *testapi.Storage.GroupVersion() != storageapiv1beta1.SchemeGroupVersion {
-		// skip the test for all versions exception v1beta1
-		return
-	}
-
 	storage, server := newStorage(t)
 	defer server.Terminate(t)
 	defer storage.Store.DestroyFunc()
@@ -156,11 +129,6 @@ func TestList(t *testing.T) {
 }
 
 func TestWatch(t *testing.T) {
-	if *testapi.Storage.GroupVersion() != storageapiv1beta1.SchemeGroupVersion {
-		// skip the test for all versions exception v1beta1
-		return
-	}
-
 	storage, server := newStorage(t)
 	defer server.Terminate(t)
 	defer storage.Store.DestroyFunc()
diff --git a/pkg/registry/storage/csinode/storage/BUILD b/pkg/registry/storage/csinode/storage/BUILD
index a3daa50f0a2..b4e0663d103 100644
--- a/pkg/registry/storage/csinode/storage/BUILD
+++ b/pkg/registry/storage/csinode/storage/BUILD
@@ -33,10 +33,8 @@ go_test(
     srcs = ["storage_test.go"],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/api/testapi:go_default_library",
         "//pkg/apis/storage:go_default_library",
         "//pkg/registry/registrytest:go_default_library",
-        "//staging/src/k8s.io/api/storage/v1beta1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
diff --git a/pkg/registry/storage/csinode/storage/storage_test.go b/pkg/registry/storage/csinode/storage/storage_test.go
index 5cfb5756d4a..0fe43a8b3db 100644
--- a/pkg/registry/storage/csinode/storage/storage_test.go
+++ b/pkg/registry/storage/csinode/storage/storage_test.go
@@ -19,7 +19,6 @@ package storage
 import (
 	"testing"
 
-	storageapiv1beta1 "k8s.io/api/storage/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/labels"
@@ -27,7 +26,6 @@ import (
 	"k8s.io/apiserver/pkg/registry/generic"
 	genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
 	etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
-	"k8s.io/kubernetes/pkg/api/testapi"
 	storageapi "k8s.io/kubernetes/pkg/apis/storage"
 	"k8s.io/kubernetes/pkg/registry/registrytest"
 )
@@ -62,11 +60,6 @@ func validNewCSINode(name string) *storageapi.CSINode {
 }
 
 func TestCreate(t *testing.T) {
-	if *testapi.Storage.GroupVersion() != storageapiv1beta1.SchemeGroupVersion {
-		// skip the test for all versions exception v1beta1
-		return
-	}
-
 	storage, server := newStorage(t)
 	defer server.Terminate(t)
 	defer storage.Store.DestroyFunc()
@@ -93,11 +86,6 @@ func TestCreate(t *testing.T) {
 }
 
 func TestUpdate(t *testing.T) {
-	if *testapi.Storage.GroupVersion() != storageapiv1beta1.SchemeGroupVersion {
-		// skip the test for all versions exception v1beta1
-		return
-	}
-
 	storage, server := newStorage(t)
 	defer server.Terminate(t)
 	defer storage.Store.DestroyFunc()
@@ -122,11 +110,6 @@ func TestUpdate(t *testing.T) {
 }
 
 func TestDelete(t *testing.T) {
-	if *testapi.Storage.GroupVersion() != storageapiv1beta1.SchemeGroupVersion {
-		// skip the test for all versions exception v1beta1
-		return
-	}
-
 	storage, server := newStorage(t)
 	defer server.Terminate(t)
 	defer storage.Store.DestroyFunc()
@@ -135,11 +118,6 @@ func TestDelete(t *testing.T) {
 }
 
 func TestGet(t *testing.T) {
-	if *testapi.Storage.GroupVersion() != storageapiv1beta1.SchemeGroupVersion {
-		// skip the test for all versions exception v1beta1
-		return
-	}
-
 	storage, server := newStorage(t)
 	defer server.Terminate(t)
 	defer storage.Store.DestroyFunc()
@@ -148,11 +126,6 @@ func TestGet(t *testing.T) {
 }
 
 func TestList(t *testing.T) {
-	if *testapi.Storage.GroupVersion() != storageapiv1beta1.SchemeGroupVersion {
-		// skip the test for all versions exception v1beta1
-		return
-	}
-
 	storage, server := newStorage(t)
 	defer server.Terminate(t)
 	defer storage.Store.DestroyFunc()
@@ -161,11 +134,6 @@ func TestList(t *testing.T) {
 }
 
 func TestWatch(t *testing.T) {
-	if *testapi.Storage.GroupVersion() != storageapiv1beta1.SchemeGroupVersion {
-		// skip the test for all versions exception v1beta1
-		return
-	}
-
 	storage, server := newStorage(t)
 	defer server.Terminate(t)
 	defer storage.Store.DestroyFunc()