diff --git a/cmd/olm/main.go b/cmd/olm/main.go
index a4bcfebb43..fcc42bcf1d 100644
--- a/cmd/olm/main.go
+++ b/cmd/olm/main.go
@@ -231,7 +231,7 @@ func main() {
 	}
 
 	// Start the controller manager
-	if err := mgr.Start(ctx.Done()); err != nil {
+	if err := mgr.Start(ctx); err != nil {
 		logger.WithError(err).Fatal("controller manager stopped")
 	}
 
diff --git a/pkg/controller/operators/suite_test.go b/pkg/controller/operators/suite_test.go
index 08c46e0fe6..cedf803775 100644
--- a/pkg/controller/operators/suite_test.go
+++ b/pkg/controller/operators/suite_test.go
@@ -149,11 +149,11 @@ var _ = BeforeSuite(func() {
 		defer GinkgoRecover()
 
 		By("Starting managed controllers")
-		err = mgr.Start(stop)
+		err := mgr.Start(ctx)
 		Expect(err).ToNot(HaveOccurred())
 	}()
 
-	Expect(mgr.GetCache().WaitForCacheSync(stop)).To(BeTrue(), "Cache sync failed on startup")
+	Expect(mgr.GetCache().WaitForCacheSync(ctx)).To(BeTrue(), "Cache sync failed on startup")
 
 	k8sClient = mgr.GetClient()
 	Expect(k8sClient).ToNot(BeNil())