diff --git a/e2e/ingress_class_extensions_test.go b/e2e/ingress_class_extensions_test.go
index 0ffaa691..e17b205e 100644
--- a/e2e/ingress_class_extensions_test.go
+++ b/e2e/ingress_class_extensions_test.go
@@ -35,12 +35,14 @@ var _ = Describe("when Tenant handles Ingress classes with extensions/v1beta1",
 				},
 			},
 			IngressOptions: capsulev1beta2.IngressOptions{
-				AllowedClasses: &api.AllowedListSpec{
-					Exact: []string{
-						"nginx",
-						"haproxy",
+				AllowedClasses: &api.SelectorAllowedListSpec{
+					AllowedListSpec: api.AllowedListSpec{
+						Exact: []string{
+							"nginx",
+							"haproxy",
+						},
+						Regex: "^oil-.*$",
 					},
-					Regex: "^oil-.*$",
 				},
 			},
 		},
diff --git a/e2e/ingress_class_networking_test.go b/e2e/ingress_class_networking_test.go
index 500a1cbf..0ecdd67b 100644
--- a/e2e/ingress_class_networking_test.go
+++ b/e2e/ingress_class_networking_test.go
@@ -34,12 +34,14 @@ var _ = Describe("when Tenant handles Ingress classes with networking.k8s.io/v1"
 				},
 			},
 			IngressOptions: capsulev1beta2.IngressOptions{
-				AllowedClasses: &api.AllowedListSpec{
-					Exact: []string{
-						"nginx",
-						"haproxy",
+				AllowedClasses: &api.SelectorAllowedListSpec{
+					AllowedListSpec: api.AllowedListSpec{
+						Exact: []string{
+							"nginx",
+							"haproxy",
+						},
+						Regex: "^oil-.*$",
 					},
-					Regex: "^oil-.*$",
 				},
 			},
 		},
diff --git a/e2e/owner_webhooks_test.go b/e2e/owner_webhooks_test.go
index 55e90e9d..b20772b6 100644
--- a/e2e/owner_webhooks_test.go
+++ b/e2e/owner_webhooks_test.go
@@ -33,10 +33,12 @@ var _ = Describe("when Tenant owner interacts with the webhooks", func() {
 					Kind: "User",
 				},
 			},
-			StorageClasses: &api.AllowedListSpec{
-				Exact: []string{
-					"cephfs",
-					"glusterfs",
+			StorageClasses: &api.SelectorAllowedListSpec{
+				AllowedListSpec: api.AllowedListSpec{
+					Exact: []string{
+						"cephfs",
+						"glusterfs",
+					},
 				},
 			},
 			LimitRanges: api.LimitRangesSpec{Items: []corev1.LimitRangeSpec{
diff --git a/e2e/pod_priority_class_test.go b/e2e/pod_priority_class_test.go
index 93300ee0..fd774d72 100644
--- a/e2e/pod_priority_class_test.go
+++ b/e2e/pod_priority_class_test.go
@@ -30,9 +30,11 @@ var _ = Describe("enforcing a Priority Class", func() {
 					Kind: "User",
 				},
 			},
-			PriorityClasses: &api.AllowedListSpec{
-				Exact: []string{"gold"},
-				Regex: "pc\\-\\w+",
+			PriorityClasses: &api.SelectorAllowedListSpec{
+				AllowedListSpec: api.AllowedListSpec{
+					Exact: []string{"gold"},
+					Regex: "pc\\-\\w+",
+				},
 			},
 		},
 	}
diff --git a/e2e/storage_class_test.go b/e2e/storage_class_test.go
index 7cd27dcc..2469a871 100644
--- a/e2e/storage_class_test.go
+++ b/e2e/storage_class_test.go
@@ -31,12 +31,14 @@ var _ = Describe("when Tenant handles Storage classes", func() {
 					Kind: "User",
 				},
 			},
-			StorageClasses: &api.AllowedListSpec{
-				Exact: []string{
-					"cephfs",
-					"glusterfs",
+			StorageClasses: &api.SelectorAllowedListSpec{
+				AllowedListSpec: api.AllowedListSpec{
+					Exact: []string{
+						"cephfs",
+						"glusterfs",
+					},
+					Regex: "^oil-.*$",
 				},
-				Regex: "^oil-.*$",
 			},
 		},
 	}