diff --git a/test/e2e/apimachinery/openapiv3.go b/test/e2e/apimachinery/openapiv3.go
index 7a939b059b7..515e6744744 100644
--- a/test/e2e/apimachinery/openapiv3.go
+++ b/test/e2e/apimachinery/openapiv3.go
@@ -134,13 +134,14 @@ var _ = SIGDescribe("OpenAPIV3", func() {
 		c := openapi3.NewRoot(f.ClientSet.Discovery().OpenAPIV3())
 		var openAPISpec *spec3.OpenAPI
 		// Poll for the OpenAPI to be updated with the new CRD
-		wait.Poll(time.Second*1, wait.ForeverTestTimeout, func() (bool, error) {
+		err = wait.PollUntilContextTimeout(context.Background(), time.Second*1, wait.ForeverTestTimeout, false, func(context.Context) (bool, error) {
 			openAPISpec, err = c.GVSpec(gv)
 			if err == nil {
 				return true, nil
 			}
 			return false, nil
 		})
+		framework.ExpectNoError(err, "timed out getting new CustomResourceDefinition")
 
 		specMarshalled, err := json.Marshal(openAPISpec)
 		framework.ExpectNoError(err)