fix: first step to split up the e2e need a cluster, versus ones that do not

fix: first step to split up the e2e need a cluster, versus ones that do not #8312