diff --git a/cluster/test/setup.sh b/cluster/test/setup.sh
index f1138cc..0c6daf6 100755
--- a/cluster/test/setup.sh
+++ b/cluster/test/setup.sh
@@ -24,3 +24,7 @@ spec:
       name: provider-secret
       namespace: upbound-system
       key: credentials
+EOF
+
+${KUBECTL} wait provider.pkg --all --for condition=Healthy --timeout 5m
+${KUBECTL} -n upbound-system wait --for=condition=Available deployment --all --timeout=5m
diff --git a/hack/prepare.sh b/hack/prepare.sh
index e50e627..bc99f37 100755
--- a/hack/prepare.sh
+++ b/hack/prepare.sh
@@ -18,6 +18,8 @@ git grep -l 'Template' -- ${REPLACE_FILES} | xargs sed -i.bak "s/Template/${PROV
 # shellcheck disable=SC2086
 git grep -l "upbound.io" -- "apis/v1*" | xargs sed -i.bak "s|upbound.io|${CRD_ROOT_GROUP}|g"
 # shellcheck disable=SC2086
+git grep -l "upbound.io" -- "cluster/test/setup.sh" | xargs sed -i.bak "s|upbound.io|${CRD_ROOT_GROUP}|g"
+# shellcheck disable=SC2086
 git grep -l "ujconfig\.WithRootGroup(\"${PROVIDER_NAME_LOWER}.upbound\.io\")" -- "config/provider.go" | xargs sed -i.bak "s|ujconfig.WithRootGroup(\"${PROVIDER_NAME_LOWER}.upbound.io\")|ujconfig.WithRootGroup(\"${CRD_ROOT_GROUP}\")|g"
 
 # We need to be careful while replacing "template" keyword in go.mod as it could tamper