diff --git a/components/odh-notebook-controller/controllers/suite_test.go b/components/odh-notebook-controller/controllers/suite_test.go
index 8df6546d714..9c166bd7b4f 100644
--- a/components/odh-notebook-controller/controllers/suite_test.go
+++ b/components/odh-notebook-controller/controllers/suite_test.go
@@ -56,11 +56,14 @@ import (
 // +kubebuilder:docs-gen:collapse=Imports
 
 var (
-	cfg            *rest.Config
-	cli            client.Client
-	envTest        *envtest.Environment
+	cfg     *rest.Config
+	cli     client.Client
+	envTest *envtest.Environment
+
 	ctx            context.Context
 	cancel         context.CancelFunc
+	managerStopped = make(chan struct{})
+
 	testNamespaces = []string{}
 )
 
@@ -75,7 +78,7 @@ func TestAPIs(t *testing.T) {
 }
 
 var _ = BeforeSuite(func() {
-	ctx, cancel = context.WithCancel(context.TODO())
+	ctx, cancel = context.WithCancel(context.Background())
 
 	// Initialize logger
 	opts := zap.Options{
@@ -164,6 +167,7 @@ var _ = BeforeSuite(func() {
 	go func() {
 		defer GinkgoRecover()
 		err = mgr.Start(ctx)
+		managerStopped <- struct{}{}
 		Expect(err).ToNot(HaveOccurred(), "Failed to run manager")
 	}()
 
@@ -194,7 +198,10 @@ var _ = BeforeSuite(func() {
 }, 60)
 
 var _ = AfterSuite(func() {
+	By("Stopping the manager")
 	cancel()
+	<-managerStopped // Issue#429: waiting to avoid shutdown errors being logged
+
 	By("Tearing down the test environment")
 	// TODO: Stop cert controller-runtime.certwatcher before manager
 	err := envTest.Stop()