diff --git a/pkg/registry/core/service/storage/storage_test.go b/pkg/registry/core/service/storage/storage_test.go
index 985eccdf7c1..6eb40de2c94 100644
--- a/pkg/registry/core/service/storage/storage_test.go
+++ b/pkg/registry/core/service/storage/storage_test.go
@@ -87,7 +87,7 @@ func validService() *api.Service {
 		svctest.SetIPFamilies(api.IPv4Protocol))
 }
 
-func TestCreate(t *testing.T) {
+func TestGenericCreate(t *testing.T) {
 	storage, _, server := newStorage(t, []api.IPFamily{api.IPv4Protocol})
 	defer server.Terminate(t)
 	defer storage.Store.DestroyFunc()
@@ -104,7 +104,7 @@ func TestCreate(t *testing.T) {
 	)
 }
 
-func TestUpdate(t *testing.T) {
+func TestGenericUpdate(t *testing.T) {
 	clusterInternalTrafficPolicy := api.ServiceInternalTrafficPolicyCluster
 
 	storage, _, server := newStorage(t, []api.IPFamily{api.IPv4Protocol})
@@ -135,7 +135,7 @@ func TestUpdate(t *testing.T) {
 	)
 }
 
-func TestDelete(t *testing.T) {
+func TestGenericDelete(t *testing.T) {
 	storage, _, server := newStorage(t, []api.IPFamily{api.IPv4Protocol})
 	defer server.Terminate(t)
 	defer storage.Store.DestroyFunc()
@@ -143,7 +143,7 @@ func TestDelete(t *testing.T) {
 	test.TestDelete(validService())
 }
 
-func TestGet(t *testing.T) {
+func TestGenericGet(t *testing.T) {
 	storage, _, server := newStorage(t, []api.IPFamily{api.IPv4Protocol})
 	defer server.Terminate(t)
 	defer storage.Store.DestroyFunc()
@@ -151,7 +151,7 @@ func TestGet(t *testing.T) {
 	test.TestGet(validService())
 }
 
-func TestList(t *testing.T) {
+func TestGenericList(t *testing.T) {
 	storage, _, server := newStorage(t, []api.IPFamily{api.IPv4Protocol})
 	defer server.Terminate(t)
 	defer storage.Store.DestroyFunc()
@@ -159,7 +159,7 @@ func TestList(t *testing.T) {
 	test.TestList(validService())
 }
 
-func TestWatch(t *testing.T) {
+func TestGenericWatch(t *testing.T) {
 	storage, _, server := newStorage(t, []api.IPFamily{api.IPv4Protocol})
 	defer server.Terminate(t)
 	defer storage.Store.DestroyFunc()
@@ -183,7 +183,7 @@ func TestWatch(t *testing.T) {
 	)
 }
 
-func TestShortNames(t *testing.T) {
+func TestGenericShortNames(t *testing.T) {
 	storage, _, server := newStorage(t, []api.IPFamily{api.IPv4Protocol})
 	defer server.Terminate(t)
 	defer storage.Store.DestroyFunc()
@@ -191,7 +191,7 @@ func TestShortNames(t *testing.T) {
 	registrytest.AssertShortNames(t, storage, expected)
 }
 
-func TestCategories(t *testing.T) {
+func TestGenericCategories(t *testing.T) {
 	storage, _, server := newStorage(t, []api.IPFamily{api.IPv4Protocol})
 	defer server.Terminate(t)
 	defer storage.Store.DestroyFunc()