diff --git a/test/cmd/discovery.sh b/test/cmd/discovery.sh
index 258b03d6ebb..3e909f2b9e3 100755
--- a/test/cmd/discovery.sh
+++ b/test/cmd/discovery.sh
@@ -86,12 +86,9 @@ run_resource_aliasing_tests() {
   request="{{range.items}}{{range .metadata.labels}}{{.}}:{{end}}{{end}}"
 
   # all 4 cassandra's might not be in the request immediately...
-  # first option with :: suffix is for possible service.kubernetes.io/headless
+  # :? suffix is for possible service.kubernetes.io/headless
   # label with "" value
-  kube::test::get_object_assert "$object" "$request" 'cassandra:cassandra:cassandra:cassandra::' || \
-  kube::test::get_object_assert "$object" "$request" 'cassandra:cassandra:cassandra:cassandra:' || \
-  kube::test::get_object_assert "$object" "$request" 'cassandra:cassandra:cassandra:' || \
-  kube::test::get_object_assert "$object" "$request" 'cassandra:cassandra:'
+  kube::test::get_object_assert "$object" "$request" '(cassandra:){2}(cassandra:(cassandra::?)?)?'
 
   kubectl delete all -l app=cassandra "${kube_flags[@]}"