diff --git a/test/e2e/v1beta1/common_cbs_test.go b/test/e2e/v1beta1/common_cbs_test.go
index c65b25224e..81f0ae9280 100644
--- a/test/e2e/v1beta1/common_cbs_test.go
+++ b/test/e2e/v1beta1/common_cbs_test.go
@@ -58,7 +58,7 @@ func (c *clusterBuildStrategyPrototype) Create() (cbs *buildapi.ClusterBuildStra
 		return nil, err
 	}
 
-	err = wait.PollImmediate(pollCreateInterval, pollCreateTimeout, func() (done bool, err error) {
+	err = wait.PollUntilContextTimeout(ctx, pollCreateInterval, pollCreateTimeout, true, func(context.Context) (done bool, err error) {
 		cbs, err = testBuild.BuildClientSet.ShipwrightV1beta1().ClusterBuildStrategies().Get(ctx, c.clusterBuildStrategy.Name, meta.GetOptions{})
 		if err != nil {
 			return false, err