diff --git a/go.mod b/go.mod
index 59b6cd4464..f6f2f7a2d8 100644
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/fsnotify/fsnotify v1.5.1
 	github.com/go-logr/logr v1.2.0
 	github.com/go-logr/zapr v1.2.0
-	github.com/onsi/ginkgo v1.16.5
+	github.com/onsi/ginkgo/v2 v2.1.1
 	github.com/onsi/gomega v1.18.1
 	github.com/prometheus/client_golang v1.12.1
 	github.com/prometheus/client_model v0.2.0
@@ -52,7 +52,7 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/nxadm/tail v1.4.8 // indirect
+	github.com/onsi/ginkgo v1.16.5 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/common v0.32.1 // indirect
 	github.com/prometheus/procfs v0.7.3 // indirect
@@ -66,7 +66,6 @@ require (
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 	k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
diff --git a/go.sum b/go.sum
index f942be5258..d244d89bb7 100644
--- a/go.sum
+++ b/go.sum
@@ -362,8 +362,9 @@ github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9k
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
-github.com/onsi/ginkgo/v2 v2.0.0 h1:CcuG/HvWNkkaqCUpJifQY8z7qEMBJya6aLPx6ftGyjQ=
 github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
+github.com/onsi/ginkgo/v2 v2.1.1 h1:LCnPB85AvFNr91s0B2aDzEiiIg6MUwLYbryC1NSlWi8=
+github.com/onsi/ginkgo/v2 v2.1.1/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
diff --git a/pkg/builder/builder_suite_test.go b/pkg/builder/builder_suite_test.go
index 5ae6fd8616..a3a25a8798 100644
--- a/pkg/builder/builder_suite_test.go
+++ b/pkg/builder/builder_suite_test.go
@@ -19,7 +19,7 @@ package builder
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
@@ -36,10 +36,11 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 )
 
+const suiteName = "application Suite"
+
 func TestBuilder(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "application Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
 
 var testenv *envtest.Environment
@@ -63,7 +64,7 @@ var _ = BeforeSuite(func() {
 
 	webhook.DefaultPort, _, err = addr.Suggest("")
 	Expect(err).NotTo(HaveOccurred())
-}, 60)
+})
 
 var _ = AfterSuite(func() {
 	Expect(testenv.Stop()).To(Succeed())
@@ -75,6 +76,10 @@ var _ = AfterSuite(func() {
 	webhook.DefaultPort = 9443
 })
 
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
+
 func addCRDToEnvironment(env *envtest.Environment, gvks ...schema.GroupVersionKind) {
 	for _, gvk := range gvks {
 		plural, singular := meta.UnsafeGuessKindToResource(gvk)
diff --git a/pkg/builder/controller_test.go b/pkg/builder/controller_test.go
index 56c1a41458..4b694dcf45 100644
--- a/pkg/builder/controller_test.go
+++ b/pkg/builder/controller_test.go
@@ -23,7 +23,7 @@ import (
 	"sync/atomic"
 
 	"github.com/go-logr/logr"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -321,7 +321,7 @@ var _ = Describe("application", func() {
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()
 			doReconcileTest(ctx, "3", m, false, bldr)
-		}, 10)
+		})
 
 		It("should Reconcile Watches objects", func() {
 			m, err := manager.New(cfg, manager.Options{})
@@ -336,7 +336,7 @@ var _ = Describe("application", func() {
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()
 			doReconcileTest(ctx, "4", m, true, bldr)
-		}, 10)
+		})
 	})
 
 	Describe("Set custom predicates", func() {
@@ -552,7 +552,6 @@ func doReconcileTest(ctx context.Context, nameSuffix string, mgr manager.Manager
 	go func() {
 		defer GinkgoRecover()
 		Expect(mgr.Start(ctx)).NotTo(HaveOccurred())
-		By("Stopping the application")
 	}()
 
 	By("Creating a Deployment")
diff --git a/pkg/builder/webhook_test.go b/pkg/builder/webhook_test.go
index 80703a38ff..2b231e4a92 100644
--- a/pkg/builder/webhook_test.go
+++ b/pkg/builder/webhook_test.go
@@ -25,7 +25,7 @@ import (
 	"os"
 	"strings"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
diff --git a/pkg/cache/cache_suite_test.go b/pkg/cache/cache_suite_test.go
index 2517777d39..2c5b1f7f6c 100644
--- a/pkg/cache/cache_suite_test.go
+++ b/pkg/cache/cache_suite_test.go
@@ -19,7 +19,7 @@ package cache_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
@@ -29,10 +29,11 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
+const suiteName = "Cache Suite"
+
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Cache Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
 
 var testenv *envtest.Environment
@@ -50,8 +51,12 @@ var _ = BeforeSuite(func() {
 
 	clientset, err = kubernetes.NewForConfig(cfg)
 	Expect(err).NotTo(HaveOccurred())
-}, 60)
+})
 
 var _ = AfterSuite(func() {
 	Expect(testenv.Stop()).To(Succeed())
 })
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/cache/cache_test.go b/pkg/cache/cache_test.go
index a84b08e94c..7f49cd85ec 100644
--- a/pkg/cache/cache_test.go
+++ b/pkg/cache/cache_test.go
@@ -23,8 +23,7 @@ import (
 	"sort"
 	"strconv"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/ginkgo/extensions/table"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	corev1 "k8s.io/api/core/v1"
@@ -1540,7 +1539,7 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca
 
 					By("verifying the object is received on the channel")
 					Eventually(out).Should(Receive(Equal(pod)))
-				}, 3)
+				})
 
 				It("should be able to index an object field then retrieve objects by that field", func() {
 					By("creating the cache")
@@ -1590,7 +1589,7 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca
 					Expect(listObj.Items).Should(HaveLen(1))
 					actual := listObj.Items[0]
 					Expect(actual.GetName()).To(Equal("test-pod-3"))
-				}, 3)
+				})
 
 				It("should allow for get informer to be cancelled", func() {
 					By("cancelling the context")
@@ -1660,7 +1659,7 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca
 
 					By("verifying the object's metadata is received on the channel")
 					Eventually(out).Should(Receive(Equal(podMeta)))
-				}, 3)
+				})
 
 				It("should be able to index an object field then retrieve objects by that field", func() {
 					By("creating the cache")
@@ -1714,7 +1713,7 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca
 						Version: "v1",
 						Kind:    "Pod",
 					}))
-				}, 3)
+				})
 
 				It("should allow for get informer to be cancelled", func() {
 					By("creating a context and cancelling it")
diff --git a/pkg/cache/informer_cache_test.go b/pkg/cache/informer_cache_test.go
index 6a19eaa366..ff691204a8 100644
--- a/pkg/cache/informer_cache_test.go
+++ b/pkg/cache/informer_cache_test.go
@@ -17,7 +17,7 @@ limitations under the License.
 package cache_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"k8s.io/client-go/rest"
diff --git a/pkg/cache/informer_cache_unit_test.go b/pkg/cache/informer_cache_unit_test.go
index 6f66e4bd89..401cc70f8d 100644
--- a/pkg/cache/informer_cache_unit_test.go
+++ b/pkg/cache/informer_cache_unit_test.go
@@ -17,7 +17,7 @@ limitations under the License.
 package cache
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	corev1 "k8s.io/api/core/v1"
diff --git a/pkg/cache/internal/informers_map_test.go b/pkg/cache/internal/informers_map_test.go
index 32a26fff4e..854a39c1f1 100644
--- a/pkg/cache/internal/informers_map_test.go
+++ b/pkg/cache/internal/informers_map_test.go
@@ -19,7 +19,7 @@ package internal
 import (
 	"fmt"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
diff --git a/pkg/cache/internal/internal_suite_test.go b/pkg/cache/internal/internal_suite_test.go
index 4e7c2b2de5..56cfe2cb80 100644
--- a/pkg/cache/internal/internal_suite_test.go
+++ b/pkg/cache/internal/internal_suite_test.go
@@ -19,13 +19,18 @@ package internal
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 )
 
+const suiteName = "Cache Internal Suite"
+
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Cache Internal Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/certwatcher/certwatcher_suite_test.go b/pkg/certwatcher/certwatcher_suite_test.go
index e1e9861ea5..e74ebb0e2a 100644
--- a/pkg/certwatcher/certwatcher_suite_test.go
+++ b/pkg/certwatcher/certwatcher_suite_test.go
@@ -20,7 +20,7 @@ import (
 	"os"
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
@@ -28,22 +28,26 @@ import (
 )
 
 var (
-	certPath = "testdata/tls.crt"
-	keyPath  = "testdata/tls.key"
+	certPath  = "testdata/tls.crt"
+	keyPath   = "testdata/tls.key"
+	suiteName = "CertWatcher Suite"
 )
 
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "CertWatcher Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
 
 var _ = BeforeSuite(func() {
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
-}, 60)
+})
 
 var _ = AfterSuite(func() {
 	for _, file := range []string{certPath, keyPath} {
 		_ = os.Remove(file)
 	}
-}, 60)
+})
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/certwatcher/certwatcher_test.go b/pkg/certwatcher/certwatcher_test.go
index 8ca27b27b1..c7349ea80d 100644
--- a/pkg/certwatcher/certwatcher_test.go
+++ b/pkg/certwatcher/certwatcher_test.go
@@ -29,7 +29,7 @@ import (
 	"os"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/prometheus/client_golang/prometheus/testutil"
 	"sigs.k8s.io/controller-runtime/pkg/certwatcher"
diff --git a/pkg/client/apiutil/apiutil_suite_test.go b/pkg/client/apiutil/apiutil_suite_test.go
index f617195724..2502afa735 100644
--- a/pkg/client/apiutil/apiutil_suite_test.go
+++ b/pkg/client/apiutil/apiutil_suite_test.go
@@ -19,7 +19,7 @@ package apiutil
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
@@ -28,10 +28,11 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
+const suiteName = "API Utilities Test Suite"
+
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "API Utilities Test Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
 
 var cfg *rest.Config
@@ -41,4 +42,8 @@ var _ = BeforeSuite(func() {
 
 	// for things that technically need a rest.Config for defaulting, but don't actually use them
 	cfg = &rest.Config{}
-}, 60)
+})
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/client/apiutil/dynamicrestmapper_test.go b/pkg/client/apiutil/dynamicrestmapper_test.go
index 6b88a3aa5f..51c8f3ca4b 100644
--- a/pkg/client/apiutil/dynamicrestmapper_test.go
+++ b/pkg/client/apiutil/dynamicrestmapper_test.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/format"
 	"github.com/onsi/gomega/types"
diff --git a/pkg/client/client_suite_test.go b/pkg/client/client_suite_test.go
index c7ed32e7bc..b229c68c56 100644
--- a/pkg/client/client_suite_test.go
+++ b/pkg/client/client_suite_test.go
@@ -19,7 +19,7 @@ package client_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/scheme"
@@ -32,10 +32,11 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
+const suiteName = "Client Suite"
+
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Client Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
 
 var testenv *envtest.Environment
@@ -55,8 +56,12 @@ var _ = BeforeSuite(func() {
 	Expect(err).NotTo(HaveOccurred())
 
 	Expect(pkg.AddToScheme(scheme.Scheme)).NotTo(HaveOccurred())
-}, 60)
+})
 
 var _ = AfterSuite(func() {
 	Expect(testenv.Stop()).To(Succeed())
 })
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/client/client_test.go b/pkg/client/client_test.go
index 52bec53ff0..7292ac251e 100644
--- a/pkg/client/client_test.go
+++ b/pkg/client/client_test.go
@@ -22,7 +22,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -38,8 +38,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-const serverSideTimeoutSeconds = 10
-
 func deleteDeployment(ctx context.Context, dep *appsv1.Deployment, ns string) {
 	_, err := clientset.AppsV1().Deployments(ns).Get(ctx, dep.Name, metav1.GetOptions{})
 	if err == nil {
@@ -167,7 +165,7 @@ var _ = Describe("Client", func() {
 			Spec:       corev1.NodeSpec{},
 		}
 		scheme = kscheme.Scheme
-	}, serverSideTimeoutSeconds)
+	})
 
 	var delOptions *metav1.DeleteOptions
 	AfterEach(func() {
@@ -184,7 +182,7 @@ var _ = Describe("Client", func() {
 			err = clientset.CoreV1().Nodes().Delete(ctx, node.Name, *delOptions)
 			Expect(err).NotTo(HaveOccurred())
 		}
-	}, serverSideTimeoutSeconds)
+	})
 
 	// TODO(seans): Cast "cl" as "client" struct from "Client" interface. Then validate the
 	// instance values for the "client" struct.
@@ -294,7 +292,7 @@ var _ = Describe("Client", func() {
 				Expect(err).To(HaveOccurred())
 				// TODO(seans): Add test to validate the returned error. Problems currently with
 				// different returned error locally versus travis.
-			}, serverSideTimeoutSeconds)
+			})
 
 			It("should fail if the object cannot be mapped to a GVK", func() {
 				By("creating client with empty Scheme")
@@ -431,7 +429,7 @@ var _ = Describe("Client", func() {
 				Expect(err).To(HaveOccurred())
 				// TODO(seans): Add test to validate the returned error. Problems currently with
 				// different returned error locally versus travis.
-			}, serverSideTimeoutSeconds)
+			})
 
 		})
 
@@ -1646,7 +1644,7 @@ var _ = Describe("Client", func() {
 					}
 				}
 				Expect(hasDep).To(BeTrue())
-			}, serverSideTimeoutSeconds)
+			})
 
 			It("should fetch unstructured collection of objects", func() {
 				By("create an initial object")
@@ -1680,7 +1678,7 @@ var _ = Describe("Client", func() {
 					}
 				}
 				Expect(hasDep).To(BeTrue())
-			}, serverSideTimeoutSeconds)
+			})
 
 			It("should fetch unstructured collection of objects, even if scheme is empty", func() {
 				By("create an initial object")
@@ -1709,7 +1707,7 @@ var _ = Describe("Client", func() {
 					}
 				}
 				Expect(hasDep).To(BeTrue())
-			}, serverSideTimeoutSeconds)
+			})
 
 			It("should return an empty list if there are no matching objects", func() {
 				cl, err := client.New(cfg, client.Options{})
@@ -1721,7 +1719,7 @@ var _ = Describe("Client", func() {
 
 				By("validating no Deployments are returned")
 				Expect(deps.Items).To(BeEmpty())
-			}, serverSideTimeoutSeconds)
+			})
 
 			// TODO(seans): get label selector test working
 			It("should filter results by label selector", func() {
@@ -1782,7 +1780,7 @@ var _ = Describe("Client", func() {
 
 				deleteDeployment(ctx, depFrontend, ns)
 				deleteDeployment(ctx, depBackend, ns)
-			}, serverSideTimeoutSeconds)
+			})
 
 			It("should filter results by namespace selector", func() {
 				By("creating a Deployment in test-namespace-1")
@@ -1841,7 +1839,7 @@ var _ = Describe("Client", func() {
 				deleteDeployment(ctx, depBackend, "test-namespace-2")
 				deleteNamespace(ctx, tns1)
 				deleteNamespace(ctx, tns2)
-			}, serverSideTimeoutSeconds)
+			})
 
 			It("should filter results by field selector", func() {
 				By("creating a Deployment with name deployment-frontend")
@@ -1893,7 +1891,7 @@ var _ = Describe("Client", func() {
 
 				deleteDeployment(ctx, depFrontend, ns)
 				deleteDeployment(ctx, depBackend, ns)
-			}, serverSideTimeoutSeconds)
+			})
 
 			It("should filter results by namespace selector and label selector", func() {
 				By("creating a Deployment in test-namespace-3 with the app=frontend label")
@@ -1986,7 +1984,7 @@ var _ = Describe("Client", func() {
 				deleteDeployment(ctx, depFrontend4, "test-namespace-4")
 				deleteNamespace(ctx, tns3)
 				deleteNamespace(ctx, tns4)
-			}, serverSideTimeoutSeconds)
+			})
 
 			It("should filter results using limit and continue options", func() {
 
@@ -2069,7 +2067,7 @@ var _ = Describe("Client", func() {
 				Expect(deps.Continue).To(BeEmpty())
 				Expect(deps.Items[0].Name).To(Equal(dep3.Name))
 				Expect(deps.Items[1].Name).To(Equal(dep4.Name))
-			}, serverSideTimeoutSeconds)
+			})
 
 			PIt("should fail if the object doesn't have meta", func() {
 
@@ -2112,7 +2110,7 @@ var _ = Describe("Client", func() {
 					}
 				}
 				Expect(hasDep).To(BeTrue())
-			}, serverSideTimeoutSeconds)
+			})
 
 			It("should return an empty list if there are no matching objects", func() {
 				cl, err := client.New(cfg, client.Options{})
@@ -2129,7 +2127,7 @@ var _ = Describe("Client", func() {
 
 				By("validating no Deployments are returned")
 				Expect(deps.Items).To(BeEmpty())
-			}, serverSideTimeoutSeconds)
+			})
 
 			It("should filter results by namespace selector", func() {
 				By("creating a Deployment in test-namespace-5")
@@ -2193,7 +2191,7 @@ var _ = Describe("Client", func() {
 				deleteDeployment(ctx, depBackend, "test-namespace-6")
 				deleteNamespace(ctx, tns1)
 				deleteNamespace(ctx, tns2)
-			}, serverSideTimeoutSeconds)
+			})
 
 			It("should filter results by field selector", func() {
 				By("creating a Deployment with name deployment-frontend")
@@ -2250,7 +2248,7 @@ var _ = Describe("Client", func() {
 
 				deleteDeployment(ctx, depFrontend, ns)
 				deleteDeployment(ctx, depBackend, ns)
-			}, serverSideTimeoutSeconds)
+			})
 
 			It("should filter results by namespace selector and label selector", func() {
 				By("creating a Deployment in test-namespace-7 with the app=frontend label")
@@ -2346,7 +2344,7 @@ var _ = Describe("Client", func() {
 				deleteDeployment(ctx, depFrontend4, "test-namespace-8")
 				deleteNamespace(ctx, tns3)
 				deleteNamespace(ctx, tns4)
-			}, serverSideTimeoutSeconds)
+			})
 
 			PIt("should fail if the object doesn't have meta", func() {
 
@@ -2394,7 +2392,7 @@ var _ = Describe("Client", func() {
 					}
 				}
 				Expect(hasDep).To(BeTrue())
-			}, serverSideTimeoutSeconds)
+			})
 
 			It("should return an empty list if there are no matching objects", func() {
 				cl, err := client.New(cfg, client.Options{})
@@ -2411,7 +2409,7 @@ var _ = Describe("Client", func() {
 
 				By("validating no Deployments are returned")
 				Expect(metaList.Items).To(BeEmpty())
-			}, serverSideTimeoutSeconds)
+			})
 
 			// TODO(seans): get label selector test working
 			It("should filter results by label selector", func() {
@@ -2477,7 +2475,7 @@ var _ = Describe("Client", func() {
 
 				deleteDeployment(ctx, depFrontend, ns)
 				deleteDeployment(ctx, depBackend, ns)
-			}, serverSideTimeoutSeconds)
+			})
 
 			It("should filter results by namespace selector", func() {
 				By("creating a Deployment in test-namespace-1")
@@ -2541,7 +2539,7 @@ var _ = Describe("Client", func() {
 				deleteDeployment(ctx, depBackend, "test-namespace-2")
 				deleteNamespace(ctx, tns1)
 				deleteNamespace(ctx, tns2)
-			}, serverSideTimeoutSeconds)
+			})
 
 			It("should filter results by field selector", func() {
 				By("creating a Deployment with name deployment-frontend")
@@ -2598,7 +2596,7 @@ var _ = Describe("Client", func() {
 
 				deleteDeployment(ctx, depFrontend, ns)
 				deleteDeployment(ctx, depBackend, ns)
-			}, serverSideTimeoutSeconds)
+			})
 
 			It("should filter results by namespace selector and label selector", func() {
 				By("creating a Deployment in test-namespace-3 with the app=frontend label")
@@ -2696,7 +2694,7 @@ var _ = Describe("Client", func() {
 				deleteDeployment(ctx, depFrontend4, "test-namespace-4")
 				deleteNamespace(ctx, tns3)
 				deleteNamespace(ctx, tns4)
-			}, serverSideTimeoutSeconds)
+			})
 
 			It("should filter results using limit and continue options", func() {
 
@@ -2794,7 +2792,7 @@ var _ = Describe("Client", func() {
 				Expect(metaList.Continue).To(BeEmpty())
 				Expect(metaList.Items[0].Name).To(Equal(dep3.Name))
 				Expect(metaList.Items[1].Name).To(Equal(dep4.Name))
-			}, serverSideTimeoutSeconds)
+			})
 
 			PIt("should fail if the object doesn't have meta", func() {
 
diff --git a/pkg/client/config/config_suite_test.go b/pkg/client/config/config_suite_test.go
index 4d07c03c4b..1bee02b10d 100644
--- a/pkg/client/config/config_suite_test.go
+++ b/pkg/client/config/config_suite_test.go
@@ -19,7 +19,7 @@ package config
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
@@ -27,12 +27,17 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
+const suiteName = "Client Config Test Suite"
+
 func TestConfig(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Client Config Test Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
 
 var _ = BeforeSuite(func() {
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
-}, 60)
+})
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/client/config/config_test.go b/pkg/client/config/config_test.go
index a1f04d9e6e..058ff33c1f 100644
--- a/pkg/client/config/config_test.go
+++ b/pkg/client/config/config_test.go
@@ -21,7 +21,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
diff --git a/pkg/client/dryrun_test.go b/pkg/client/dryrun_test.go
index 0a46e5617d..3d2b07cca0 100644
--- a/pkg/client/dryrun_test.go
+++ b/pkg/client/dryrun_test.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"sync/atomic"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
diff --git a/pkg/client/fake/client_suite_test.go b/pkg/client/fake/client_suite_test.go
index ac5540106e..796b05163d 100644
--- a/pkg/client/fake/client_suite_test.go
+++ b/pkg/client/fake/client_suite_test.go
@@ -19,7 +19,7 @@ package fake
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 
@@ -27,12 +27,17 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
+const suiteName = "Fake client Suite"
+
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Fake client Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
 
 var _ = BeforeSuite(func() {
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
-}, 60)
+})
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/client/fake/client_test.go b/pkg/client/fake/client_test.go
index 5ce93a8cdc..f95a05d9d4 100644
--- a/pkg/client/fake/client_test.go
+++ b/pkg/client/fake/client_test.go
@@ -22,11 +22,10 @@ import (
 	"fmt"
 	"time"
 
-	"k8s.io/client-go/kubernetes/fake"
-
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/client-go/kubernetes/fake"
 
 	appsv1 "k8s.io/api/apps/v1"
 	coordinationv1 "k8s.io/api/coordination/v1"
diff --git a/pkg/client/namespaced_client_test.go b/pkg/client/namespaced_client_test.go
index 5b8f3388c8..648c8a4c62 100644
--- a/pkg/client/namespaced_client_test.go
+++ b/pkg/client/namespaced_client_test.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"sync/atomic"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	rbacv1 "k8s.io/api/rbac/v1"
diff --git a/pkg/client/options_test.go b/pkg/client/options_test.go
index 36447a3f3c..c41592bd0d 100644
--- a/pkg/client/options_test.go
+++ b/pkg/client/options_test.go
@@ -17,7 +17,7 @@ limitations under the License.
 package client_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/client/watch_test.go b/pkg/client/watch_test.go
index 6181596b5e..4770e1e56a 100644
--- a/pkg/client/watch_test.go
+++ b/pkg/client/watch_test.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"sync/atomic"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -59,11 +59,11 @@ var _ = Describe("ClientWithWatch", func() {
 		var err error
 		dep, err = clientset.AppsV1().Deployments(ns).Create(ctx, dep, metav1.CreateOptions{})
 		Expect(err).NotTo(HaveOccurred())
-	}, serverSideTimeoutSeconds)
+	})
 
 	AfterEach(func() {
 		deleteDeployment(ctx, dep, ns)
-	}, serverSideTimeoutSeconds)
+	})
 
 	Describe("NewWithWatch", func() {
 		It("should return a new Client", func() {
@@ -103,7 +103,7 @@ var _ = Describe("ClientWithWatch", func() {
 
 		It("should receive a create event when watching the typed object", func() {
 			watchSuite(&appsv1.DeploymentList{}, &appsv1.Deployment{})
-		}, 15)
+		})
 
 		It("should receive a create event when watching the unstructured object", func() {
 			u := &unstructured.UnstructuredList{}
@@ -113,12 +113,12 @@ var _ = Describe("ClientWithWatch", func() {
 				Version: "v1",
 			})
 			watchSuite(u, &unstructured.Unstructured{})
-		}, 15)
+		})
 
 		It("should receive a create event when watching the metadata object", func() {
 			m := &metav1.PartialObjectMetadataList{TypeMeta: metav1.TypeMeta{Kind: "Deployment", APIVersion: "apps/v1"}}
 			watchSuite(m, &metav1.PartialObjectMetadata{})
-		}, 15)
+		})
 	})
 
 })
diff --git a/pkg/cluster/cluster_suite_test.go b/pkg/cluster/cluster_suite_test.go
index 4970497193..5d204a2d34 100644
--- a/pkg/cluster/cluster_suite_test.go
+++ b/pkg/cluster/cluster_suite_test.go
@@ -20,7 +20,7 @@ import (
 	"net/http"
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
@@ -30,10 +30,11 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
+const suiteName = "Cluster Suite"
+
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Cluster Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
 
 var testenv *envtest.Environment
@@ -63,8 +64,12 @@ var _ = BeforeSuite(func() {
 
 	clientset, err = kubernetes.NewForConfig(cfg)
 	Expect(err).NotTo(HaveOccurred())
-}, 60)
+})
 
 var _ = AfterSuite(func() {
 	Expect(testenv.Stop()).To(Succeed())
 })
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/cluster/cluster_test.go b/pkg/cluster/cluster_test.go
index f9f7a0bdf3..0da179d3f0 100644
--- a/pkg/cluster/cluster_test.go
+++ b/pkg/cluster/cluster_test.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 
 	"github.com/go-logr/logr"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"go.uber.org/goleak"
 	"k8s.io/apimachinery/pkg/api/meta"
diff --git a/pkg/config/config_suite_test.go b/pkg/config/config_suite_test.go
index 9a494dafbc..976d0ba1a9 100644
--- a/pkg/config/config_suite_test.go
+++ b/pkg/config/config_suite_test.go
@@ -19,14 +19,19 @@ package config_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 )
 
+const suiteName = "Config Suite"
+
 func TestScheme(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Config Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
index f2b5461b55..3d7aec7e81 100644
--- a/pkg/config/config_test.go
+++ b/pkg/config/config_test.go
@@ -17,7 +17,7 @@ limitations under the License.
 package config_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"sigs.k8s.io/controller-runtime/pkg/config"
 	"sigs.k8s.io/controller-runtime/pkg/config/v1alpha1"
diff --git a/pkg/controller/controller_integration_test.go b/pkg/controller/controller_integration_test.go
index 9f347b0032..3ddd2ccf60 100644
--- a/pkg/controller/controller_integration_test.go
+++ b/pkg/controller/controller_integration_test.go
@@ -31,7 +31,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 )
@@ -169,7 +169,7 @@ var _ = Describe("controller", func() {
 			err = cm.GetClient().
 				List(context.Background(), &controllertest.UnconventionalListTypeList{})
 			Expect(err).NotTo(HaveOccurred())
-		}, 5)
+		})
 	})
 })
 
diff --git a/pkg/controller/controller_suite_test.go b/pkg/controller/controller_suite_test.go
index 71b2232239..f810c23f78 100644
--- a/pkg/controller/controller_suite_test.go
+++ b/pkg/controller/controller_suite_test.go
@@ -20,7 +20,7 @@ import (
 	"net/http"
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/kubernetes"
@@ -36,10 +36,11 @@ import (
 	crscheme "sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
+const suiteName = "Controller Integration Suite"
+
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Controller Integration Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
 
 var testenv *envtest.Environment
@@ -82,7 +83,7 @@ var _ = BeforeSuite(func() {
 
 	// Prevent the metrics listener being created
 	metrics.DefaultBindAddress = "0"
-}, 60)
+})
 
 var _ = AfterSuite(func() {
 	Expect(testenv.Stop()).To(Succeed())
@@ -90,3 +91,7 @@ var _ = AfterSuite(func() {
 	// Put the DefaultBindAddress back
 	metrics.DefaultBindAddress = ":8080"
 })
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/controller/controller_test.go b/pkg/controller/controller_test.go
index d3e8419a16..8932cb35ca 100644
--- a/pkg/controller/controller_test.go
+++ b/pkg/controller/controller_test.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"go.uber.org/goleak"
 	corev1 "k8s.io/api/core/v1"
diff --git a/pkg/controller/controllerutil/controllerutil_suite_test.go b/pkg/controller/controllerutil/controllerutil_suite_test.go
index da4c5cf4ac..f4ab0448b5 100644
--- a/pkg/controller/controllerutil/controllerutil_suite_test.go
+++ b/pkg/controller/controllerutil/controllerutil_suite_test.go
@@ -19,7 +19,7 @@ package controllerutil_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"k8s.io/client-go/rest"
@@ -28,10 +28,11 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 )
 
+const suiteName = "Controllerutil Suite"
+
 func TestControllerutil(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Controllerutil Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
 
 var testenv *envtest.Environment
@@ -53,3 +54,7 @@ var _ = BeforeSuite(func() {
 var _ = AfterSuite(func() {
 	Expect(testenv.Stop()).To(Succeed())
 })
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/controller/controllerutil/controllerutil_test.go b/pkg/controller/controllerutil/controllerutil_test.go
index e2464b2953..6e996bb203 100644
--- a/pkg/controller/controllerutil/controllerutil_test.go
+++ b/pkg/controller/controllerutil/controllerutil_test.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"math/rand"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
diff --git a/pkg/envtest/crd_test.go b/pkg/envtest/crd_test.go
index 2c12ba57b4..92dc48e963 100644
--- a/pkg/envtest/crd_test.go
+++ b/pkg/envtest/crd_test.go
@@ -17,7 +17,7 @@ limitations under the License.
 package envtest
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/util/sets"
 )
diff --git a/pkg/envtest/envtest_suite_test.go b/pkg/envtest/envtest_suite_test.go
index 0d5bb0eae2..a6dc7f4567 100644
--- a/pkg/envtest/envtest_suite_test.go
+++ b/pkg/envtest/envtest_suite_test.go
@@ -19,7 +19,7 @@ package envtest
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	admissionv1 "k8s.io/api/admissionregistration/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -29,10 +29,11 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
+const suiteName = "Envtest Suite"
+
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Envtest Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
 
 var env *Environment
@@ -44,7 +45,7 @@ var _ = BeforeSuite(func() {
 	initializeWebhookInEnvironment()
 	_, err := env.Start()
 	Expect(err).NotTo(HaveOccurred())
-}, StartTimeout)
+})
 
 func initializeWebhookInEnvironment() {
 	namespacedScopeV1 := admissionv1.NamespacedScope
@@ -133,4 +134,8 @@ func initializeWebhookInEnvironment() {
 
 var _ = AfterSuite(func() {
 	Expect(env.Stop()).NotTo(HaveOccurred())
-}, StopTimeout)
+})
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/envtest/envtest_test.go b/pkg/envtest/envtest_test.go
index 11eedca0ac..21464e10be 100644
--- a/pkg/envtest/envtest_test.go
+++ b/pkg/envtest/envtest_test.go
@@ -21,7 +21,7 @@ import (
 	"path/filepath"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -243,7 +243,7 @@ var _ = Describe("Test", func() {
 				CRDInstallOptions{MaxTime: 50 * time.Millisecond, PollInterval: 15 * time.Millisecond},
 			)
 			Expect(err).NotTo(HaveOccurred())
-		}, 5)
+		})
 
 		It("should install the CRDs into the cluster using file", func() {
 			crds, err = InstallCRDs(env.Config, CRDInstallOptions{
@@ -278,7 +278,7 @@ var _ = Describe("Test", func() {
 				CRDInstallOptions{MaxTime: 50 * time.Millisecond, PollInterval: 15 * time.Millisecond},
 			)
 			Expect(err).NotTo(HaveOccurred())
-		}, 10)
+		})
 
 		It("should be able to install CRDs using multiple files", func() {
 			crds, err = InstallCRDs(env.Config, CRDInstallOptions{
@@ -289,7 +289,7 @@ var _ = Describe("Test", func() {
 			})
 			Expect(err).NotTo(HaveOccurred())
 			Expect(crds).To(HaveLen(2))
-		}, 10)
+		})
 
 		It("should filter out already existent CRD", func() {
 			crds, err = InstallCRDs(env.Config, CRDInstallOptions{
@@ -329,26 +329,26 @@ var _ = Describe("Test", func() {
 				CRDInstallOptions{MaxTime: 50 * time.Millisecond, PollInterval: 15 * time.Millisecond},
 			)
 			Expect(err).NotTo(HaveOccurred())
-		}, 10)
+		})
 
 		It("should not return an not error if the directory doesn't exist", func() {
 			crds, err = InstallCRDs(env.Config, CRDInstallOptions{Paths: []string{invalidDirectory}})
 			Expect(err).NotTo(HaveOccurred())
-		}, 5)
+		})
 
 		It("should return an error if the directory doesn't exist", func() {
 			crds, err = InstallCRDs(env.Config, CRDInstallOptions{
 				Paths: []string{invalidDirectory}, ErrorIfPathMissing: true,
 			})
 			Expect(err).To(HaveOccurred())
-		}, 5)
+		})
 
 		It("should return an error if the file doesn't exist", func() {
 			crds, err = InstallCRDs(env.Config, CRDInstallOptions{Paths: []string{
 				filepath.Join(".", "testdata", "fake.yaml")}, ErrorIfPathMissing: true,
 			})
 			Expect(err).To(HaveOccurred())
-		}, 5)
+		})
 
 		It("should return an error if the resource group version isn't found", func() {
 			// Wait for a CRD where the Group and Version don't exist
@@ -374,7 +374,7 @@ var _ = Describe("Test", func() {
 				CRDInstallOptions{MaxTime: 50 * time.Millisecond, PollInterval: 15 * time.Millisecond},
 			)
 			Expect(err).To(HaveOccurred())
-		}, 5)
+		})
 
 		It("should return an error if the resource isn't found in the group version", func() {
 			crds, err = InstallCRDs(env.Config, CRDInstallOptions{
@@ -421,7 +421,7 @@ var _ = Describe("Test", func() {
 				CRDInstallOptions{MaxTime: 50 * time.Millisecond, PollInterval: 15 * time.Millisecond},
 			)
 			Expect(err).To(HaveOccurred())
-		}, 5)
+		})
 
 		It("should reinstall the CRDs if already present in the cluster", func() {
 
@@ -680,7 +680,7 @@ var _ = Describe("Test", func() {
 				CRDInstallOptions{MaxTime: 50 * time.Millisecond, PollInterval: 15 * time.Millisecond},
 			)
 			Expect(err).NotTo(HaveOccurred())
-		}, 5)
+		})
 	})
 
 	It("should update CRDs if already present in the cluster", func() {
@@ -771,7 +771,7 @@ var _ = Describe("Test", func() {
 			CRDInstallOptions{MaxTime: 50 * time.Millisecond, PollInterval: 15 * time.Millisecond},
 		)
 		Expect(err).NotTo(HaveOccurred())
-	}, 5)
+	})
 
 	Describe("UninstallCRDs", func() {
 		It("should uninstall the CRDs from the cluster", func() {
@@ -928,7 +928,7 @@ var _ = Describe("Test", func() {
 				}
 				return true
 			}, 20).Should(BeTrue())
-		}, 30)
+		})
 	})
 
 	Describe("Start", func() {
@@ -937,14 +937,14 @@ var _ = Describe("Test", func() {
 			_, err := env.Start()
 			Expect(err).To(HaveOccurred())
 			Expect(env.Stop()).To(Succeed())
-		}, 30)
+		})
 
 		It("should not raise an error on invalid dir when flag is disabled", func() {
 			env := &Environment{ErrorIfCRDPathMissing: false, CRDDirectoryPaths: []string{invalidDirectory}}
 			_, err := env.Start()
 			Expect(err).NotTo(HaveOccurred())
 			Expect(env.Stop()).To(Succeed())
-		}, 30)
+		})
 	})
 
 	Describe("Stop", func() {
@@ -956,6 +956,6 @@ var _ = Describe("Test", func() {
 
 			// check if the /tmp/envtest-serving-certs-* dir doesnt exists any more
 			Expect(env.WebhookInstallOptions.LocalServingCertDir).ShouldNot(BeADirectory())
-		}, 30)
+		})
 	})
 })
diff --git a/pkg/envtest/ginkgo_test.go b/pkg/envtest/ginkgo_test.go
deleted file mode 100644
index fba031c954..0000000000
--- a/pkg/envtest/ginkgo_test.go
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2021 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package envtest
-
-import (
-	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
-)
-
-// NewlineReporter is Reporter that Prints a newline after the default Reporter output so that the results
-// are correctly parsed by test automation.
-// See issue https://github.com/jstemmer/go-junit-report/issues/31
-// It's re-exported here to avoid compatibility breakage/mass rewrites.
-type NewlineReporter = printer.NewlineReporter
diff --git a/pkg/envtest/printer/ginkgo.go b/pkg/envtest/printer/ginkgo.go
deleted file mode 100644
index d835dc7721..0000000000
--- a/pkg/envtest/printer/ginkgo.go
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-Copyright 2016 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Package printer contains setup for a friendlier Ginkgo printer that's easier
-// to parse by test automation.
-package printer
-
-import (
-	"fmt"
-
-	"github.com/onsi/ginkgo"
-	"github.com/onsi/ginkgo/config"
-	"github.com/onsi/ginkgo/types"
-)
-
-var _ ginkgo.Reporter = NewlineReporter{}
-
-// NewlineReporter is Reporter that Prints a newline after the default Reporter output so that the results
-// are correctly parsed by test automation.
-// See issue https://github.com/jstemmer/go-junit-report/issues/31
-type NewlineReporter struct{}
-
-// SpecSuiteWillBegin implements ginkgo.Reporter.
-func (NewlineReporter) SpecSuiteWillBegin(config config.GinkgoConfigType, summary *types.SuiteSummary) {
-}
-
-// BeforeSuiteDidRun implements ginkgo.Reporter.
-func (NewlineReporter) BeforeSuiteDidRun(setupSummary *types.SetupSummary) {}
-
-// AfterSuiteDidRun implements ginkgo.Reporter.
-func (NewlineReporter) AfterSuiteDidRun(setupSummary *types.SetupSummary) {}
-
-// SpecWillRun implements ginkgo.Reporter.
-func (NewlineReporter) SpecWillRun(specSummary *types.SpecSummary) {}
-
-// SpecDidComplete implements ginkgo.Reporter.
-func (NewlineReporter) SpecDidComplete(specSummary *types.SpecSummary) {}
-
-// SpecSuiteDidEnd Prints a newline between "35 Passed | 0 Failed | 0 Pending | 0 Skipped" and "--- PASS:".
-func (NewlineReporter) SpecSuiteDidEnd(summary *types.SuiteSummary) { fmt.Printf("\n") }
diff --git a/pkg/envtest/printer/prow.go b/pkg/envtest/printer/prow.go
index 2f4009aa03..c67976e129 100644
--- a/pkg/envtest/printer/prow.go
+++ b/pkg/envtest/printer/prow.go
@@ -22,11 +22,8 @@ import (
 	"path/filepath"
 	"sync"
 
-	"github.com/onsi/ginkgo"
-	"github.com/onsi/ginkgo/config"
-	"github.com/onsi/ginkgo/reporters"
-	"github.com/onsi/ginkgo/types"
-
+	"github.com/onsi/ginkgo/v2"
+	"github.com/onsi/ginkgo/v2/reporters"
 	"k8s.io/apimachinery/pkg/util/sets"
 )
 
@@ -35,17 +32,8 @@ var (
 	allRegisteredSuitesLock = &sync.Mutex{}
 )
 
-type prowReporter struct {
-	junitReporter *reporters.JUnitReporter
-}
-
-// NewProwReporter returns a prowReporter that will write out junit if running in Prow and do
-// nothing otherwise.
-// WARNING: It seems this does not always properly fail the test runs when there are failures,
-// see https://github.com/onsi/ginkgo/issues/706
-// When using this you must make sure to grep for failures in your junit xmls and fail the run
-// if there are any.
-func NewProwReporter(suiteName string) ginkgo.Reporter {
+// AddReport adds.
+func AddReport(report ginkgo.Report, suiteName string) {
 	allRegisteredSuitesLock.Lock()
 	if allRegisteredSuites.Has(suiteName) {
 		panic(fmt.Sprintf("Suite named %q registered more than once", suiteName))
@@ -53,57 +41,13 @@ func NewProwReporter(suiteName string) ginkgo.Reporter {
 	allRegisteredSuites.Insert(suiteName)
 	allRegisteredSuitesLock.Unlock()
 
-	if os.Getenv("CI") == "" {
-		return &prowReporter{}
-	}
 	artifactsDir := os.Getenv("ARTIFACTS")
-	if artifactsDir == "" {
-		return &prowReporter{}
-	}
-
-	path := filepath.Join(artifactsDir, fmt.Sprintf("junit_%s_%d.xml", suiteName, config.GinkgoConfig.ParallelNode))
-	return &prowReporter{
-		junitReporter: reporters.NewJUnitReporter(path),
-	}
-}
-
-func (pr *prowReporter) SpecSuiteWillBegin(config config.GinkgoConfigType, summary *types.SuiteSummary) {
-	if pr.junitReporter != nil {
-		pr.junitReporter.SpecSuiteWillBegin(config, summary)
-	}
-}
-
-// BeforeSuiteDidRun implements ginkgo.Reporter.
-func (pr *prowReporter) BeforeSuiteDidRun(setupSummary *types.SetupSummary) {
-	if pr.junitReporter != nil {
-		pr.junitReporter.BeforeSuiteDidRun(setupSummary)
-	}
-}
-
-// AfterSuiteDidRun implements ginkgo.Reporter.
-func (pr *prowReporter) AfterSuiteDidRun(setupSummary *types.SetupSummary) {
-	if pr.junitReporter != nil {
-		pr.junitReporter.AfterSuiteDidRun(setupSummary)
-	}
-}
-
-// SpecWillRun implements ginkgo.Reporter.
-func (pr *prowReporter) SpecWillRun(specSummary *types.SpecSummary) {
-	if pr.junitReporter != nil {
-		pr.junitReporter.SpecWillRun(specSummary)
-	}
-}
-
-// SpecDidComplete implements ginkgo.Reporter.
-func (pr *prowReporter) SpecDidComplete(specSummary *types.SpecSummary) {
-	if pr.junitReporter != nil {
-		pr.junitReporter.SpecDidComplete(specSummary)
-	}
-}
 
-// SpecSuiteDidEnd Prints a newline between "35 Passed | 0 Failed | 0 Pending | 0 Skipped" and "--- PASS:".
-func (pr *prowReporter) SpecSuiteDidEnd(summary *types.SuiteSummary) {
-	if pr.junitReporter != nil {
-		pr.junitReporter.SpecSuiteDidEnd(summary)
+	if os.Getenv("CI") != "" && artifactsDir != "" {
+		path := filepath.Join(artifactsDir, fmt.Sprintf("junit_%s_%d.xml", suiteName, report.SuiteConfig.ParallelProcess))
+		err := reporters.GenerateJUnitReport(report, path)
+		if err != nil {
+			fmt.Printf("Failed to generate report\n\t%s", err.Error())
+		}
 	}
 }
diff --git a/pkg/envtest/webhook_test.go b/pkg/envtest/webhook_test.go
index 6f900bb7fb..bb1726cf01 100644
--- a/pkg/envtest/webhook_test.go
+++ b/pkg/envtest/webhook_test.go
@@ -21,7 +21,7 @@ import (
 	"path/filepath"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
diff --git a/pkg/finalizer/finalizer_test.go b/pkg/finalizer/finalizer_test.go
index 944acd595a..15350abee5 100644
--- a/pkg/finalizer/finalizer_test.go
+++ b/pkg/finalizer/finalizer_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -21,10 +21,12 @@ type mockFinalizer struct {
 func (f mockFinalizer) Finalize(context.Context, client.Object) (Result, error) {
 	return f.result, f.err
 }
+
+const suiteName = "Finalizer Suite"
+
 func TestFinalizer(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Finalizer Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
 
 var _ = Describe("TestFinalizer", func() {
@@ -214,3 +216,7 @@ var _ = Describe("TestFinalizer", func() {
 		})
 	})
 })
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/handler/eventhandler_suite_test.go b/pkg/handler/eventhandler_suite_test.go
index ebcc993915..96264ccb6b 100644
--- a/pkg/handler/eventhandler_suite_test.go
+++ b/pkg/handler/eventhandler_suite_test.go
@@ -19,7 +19,7 @@ package handler_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
@@ -28,10 +28,11 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
+const suiteName = "Eventhandler Suite"
+
 func TestEventhandler(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Eventhandler Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
 
 var testenv *envtest.Environment
@@ -49,3 +50,7 @@ var _ = BeforeSuite(func() {
 var _ = AfterSuite(func() {
 	Expect(testenv.Stop()).To(Succeed())
 })
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/handler/eventhandler_test.go b/pkg/handler/eventhandler_test.go
index 61db62e66a..d8b2211869 100644
--- a/pkg/handler/eventhandler_test.go
+++ b/pkg/handler/eventhandler_test.go
@@ -17,7 +17,7 @@
 package handler_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	appsv1 "k8s.io/api/apps/v1"
 	autoscalingv1 "k8s.io/api/autoscaling/v1"
diff --git a/pkg/healthz/healthz_suite_test.go b/pkg/healthz/healthz_suite_test.go
index b51fcb3605..ce69f9e974 100644
--- a/pkg/healthz/healthz_suite_test.go
+++ b/pkg/healthz/healthz_suite_test.go
@@ -19,19 +19,24 @@ package healthz_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
+const suiteName = "Healthz Suite"
+
 func TestHealthz(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Healthz Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
 
 var _ = BeforeSuite(func() {
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
 })
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/healthz/healthz_test.go b/pkg/healthz/healthz_test.go
index e0413103f7..639a7575f3 100644
--- a/pkg/healthz/healthz_test.go
+++ b/pkg/healthz/healthz_test.go
@@ -21,7 +21,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 )
diff --git a/pkg/internal/controller/controller_suite_test.go b/pkg/internal/controller/controller_suite_test.go
index 6091dd746c..20015ac654 100644
--- a/pkg/internal/controller/controller_suite_test.go
+++ b/pkg/internal/controller/controller_suite_test.go
@@ -19,7 +19,7 @@ package controller
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
@@ -29,10 +29,11 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
+const suiteName = "Controller internal Suite"
+
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Controller internal Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
 
 var testenv *envtest.Environment
@@ -50,8 +51,12 @@ var _ = BeforeSuite(func() {
 
 	clientset, err = kubernetes.NewForConfig(cfg)
 	Expect(err).NotTo(HaveOccurred())
-}, 60)
+})
 
 var _ = AfterSuite(func() {
 	Expect(testenv.Stop()).To(Succeed())
 })
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/internal/controller/controller_test.go b/pkg/internal/controller/controller_test.go
index 7825749490..cb50ec999b 100644
--- a/pkg/internal/controller/controller_test.go
+++ b/pkg/internal/controller/controller_test.go
@@ -24,7 +24,7 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/prometheus/client_golang/prometheus"
 	dto "github.com/prometheus/client_model/go"
@@ -210,7 +210,7 @@ var _ = Describe("controller", func() {
 			}()
 
 			<-sourceSynced
-		}, 10.0)
+		})
 
 		It("should process events from source.Channel", func() {
 			// channel to be closed when event is processed
@@ -521,8 +521,8 @@ var _ = Describe("controller", func() {
 
 			By("Removing the item from the queue")
 			Eventually(queue.Len).Should(Equal(0))
-			Eventually(func() int { return queue.NumRequeues(request) }).Should(Equal(0))
-		}, 1.0)
+			Eventually(func() int { return queue.NumRequeues(request) }, 1.0).Should(Equal(0))
+		})
 
 		// TODO(directxman12): we should ensure that backoff occurrs with error requeue
 
@@ -698,7 +698,7 @@ var _ = Describe("controller", func() {
 					}
 					return nil
 				}, 2.0).Should(Succeed())
-			}, 2.0)
+			})
 
 			It("should get updated on reconcile errors", func() {
 				Expect(func() error {
@@ -727,7 +727,7 @@ var _ = Describe("controller", func() {
 					}
 					return nil
 				}, 2.0).Should(Succeed())
-			}, 2.0)
+			})
 
 			It("should get updated when reconcile returns with retry enabled", func() {
 				Expect(func() error {
@@ -757,7 +757,7 @@ var _ = Describe("controller", func() {
 					}
 					return nil
 				}, 2.0).Should(Succeed())
-			}, 2.0)
+			})
 
 			It("should get updated when reconcile returns with retryAfter enabled", func() {
 				Expect(func() error {
@@ -786,7 +786,7 @@ var _ = Describe("controller", func() {
 					}
 					return nil
 				}, 2.0).Should(Succeed())
-			}, 2.0)
+			})
 		})
 
 		Context("should update prometheus metrics", func() {
@@ -827,7 +827,7 @@ var _ = Describe("controller", func() {
 				By("Removing the item from the queue")
 				Eventually(queue.Len).Should(Equal(0))
 				Eventually(func() int { return queue.NumRequeues(request) }).Should(Equal(0))
-			}, 2.0)
+			})
 
 			It("should add a reconcile time to the reconcile time histogram", func() {
 				var reconcileTime dto.Metric
@@ -868,7 +868,7 @@ var _ = Describe("controller", func() {
 					}
 					return nil
 				}, 2.0).Should(Succeed())
-			}, 4.0)
+			})
 		})
 	})
 })
diff --git a/pkg/internal/recorder/recorder_integration_test.go b/pkg/internal/recorder/recorder_integration_test.go
index 5bafaabf5a..30928c390f 100644
--- a/pkg/internal/recorder/recorder_integration_test.go
+++ b/pkg/internal/recorder/recorder_integration_test.go
@@ -31,7 +31,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/internal/recorder/recorder_suite_test.go b/pkg/internal/recorder/recorder_suite_test.go
index ee8f98fae0..671783ddf3 100644
--- a/pkg/internal/recorder/recorder_suite_test.go
+++ b/pkg/internal/recorder/recorder_suite_test.go
@@ -19,7 +19,7 @@ package recorder_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
@@ -29,10 +29,11 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
+const suiteName = "Recorder Integration Suite"
+
 func TestRecorder(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Recorder Integration Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
 
 var testenv *envtest.Environment
@@ -50,8 +51,12 @@ var _ = BeforeSuite(func() {
 
 	clientset, err = kubernetes.NewForConfig(cfg)
 	Expect(err).NotTo(HaveOccurred())
-}, 60)
+})
 
 var _ = AfterSuite(func() {
 	Expect(testenv.Stop()).To(Succeed())
 })
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/internal/recorder/recorder_test.go b/pkg/internal/recorder/recorder_test.go
index 86bcdd36f6..0179ce53fc 100644
--- a/pkg/internal/recorder/recorder_test.go
+++ b/pkg/internal/recorder/recorder_test.go
@@ -18,7 +18,7 @@ package recorder_test
 
 import (
 	"github.com/go-logr/logr"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/tools/record"
diff --git a/pkg/internal/testing/addr/addr_suite_test.go b/pkg/internal/testing/addr/addr_suite_test.go
index b18c62def9..baa40102d3 100644
--- a/pkg/internal/testing/addr/addr_suite_test.go
+++ b/pkg/internal/testing/addr/addr_suite_test.go
@@ -19,15 +19,20 @@ package addr_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 )
 
+const suiteName = "Addr Suite"
+
 func TestAddr(t *testing.T) {
 	t.Parallel()
 	RegisterFailHandler(Fail)
-	suiteName := "Addr Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/internal/testing/addr/manager_test.go b/pkg/internal/testing/addr/manager_test.go
index cf95c36115..065e847dc5 100644
--- a/pkg/internal/testing/addr/manager_test.go
+++ b/pkg/internal/testing/addr/manager_test.go
@@ -20,7 +20,7 @@ import (
 	"net"
 	"strconv"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/controller-runtime/pkg/internal/testing/addr"
diff --git a/pkg/internal/testing/certs/certs_suite_test.go b/pkg/internal/testing/certs/certs_suite_test.go
index 5b63fc4f55..085c092be9 100644
--- a/pkg/internal/testing/certs/certs_suite_test.go
+++ b/pkg/internal/testing/certs/certs_suite_test.go
@@ -19,15 +19,20 @@ package certs_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 )
 
+const suiteName = "TinyCA (Internal Certs) Suite"
+
 func TestInternal(t *testing.T) {
 	t.Parallel()
 	RegisterFailHandler(Fail)
-	suiteName := "TinyCA (Internal Certs) Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/internal/testing/certs/tinyca_test.go b/pkg/internal/testing/certs/tinyca_test.go
index e3f2513210..6e0540ba9f 100644
--- a/pkg/internal/testing/certs/tinyca_test.go
+++ b/pkg/internal/testing/certs/tinyca_test.go
@@ -24,7 +24,7 @@ import (
 	"sort"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gstruct"
 
diff --git a/pkg/internal/testing/controlplane/apiserver_test.go b/pkg/internal/testing/controlplane/apiserver_test.go
index b857220203..6ce1577d45 100644
--- a/pkg/internal/testing/controlplane/apiserver_test.go
+++ b/pkg/internal/testing/controlplane/apiserver_test.go
@@ -20,7 +20,7 @@ import (
 	"errors"
 	"net/url"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/client-go/rest"
 
diff --git a/pkg/internal/testing/controlplane/auth_test.go b/pkg/internal/testing/controlplane/auth_test.go
index 3acbc3d3c4..9891c6f2e2 100644
--- a/pkg/internal/testing/controlplane/auth_test.go
+++ b/pkg/internal/testing/controlplane/auth_test.go
@@ -22,7 +22,7 @@ import (
 	"os"
 	"path/filepath"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/client-go/rest"
 	kcert "k8s.io/client-go/util/cert"
diff --git a/pkg/internal/testing/controlplane/controlplane_suite_test.go b/pkg/internal/testing/controlplane/controlplane_suite_test.go
index 067b0c40ce..812fa9e31c 100644
--- a/pkg/internal/testing/controlplane/controlplane_suite_test.go
+++ b/pkg/internal/testing/controlplane/controlplane_suite_test.go
@@ -19,15 +19,20 @@ package controlplane_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 )
 
+const suiteName = "Control Plane Standup Unit Tests"
+
 func TestIntegration(t *testing.T) {
 	t.Parallel()
 	RegisterFailHandler(Fail)
-	suiteName := "Control Plane Standup Unit Tests"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/internal/testing/controlplane/etcd_test.go b/pkg/internal/testing/controlplane/etcd_test.go
index e9a1f7a181..7c7c7561ff 100644
--- a/pkg/internal/testing/controlplane/etcd_test.go
+++ b/pkg/internal/testing/controlplane/etcd_test.go
@@ -17,7 +17,7 @@ limitations under the License.
 package controlplane_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	. "sigs.k8s.io/controller-runtime/pkg/internal/testing/controlplane"
diff --git a/pkg/internal/testing/controlplane/kubectl_test.go b/pkg/internal/testing/controlplane/kubectl_test.go
index c09695eecb..5484bc31a1 100644
--- a/pkg/internal/testing/controlplane/kubectl_test.go
+++ b/pkg/internal/testing/controlplane/kubectl_test.go
@@ -19,7 +19,7 @@ package controlplane_test
 import (
 	"io"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gstruct"
 	"k8s.io/client-go/rest"
diff --git a/pkg/internal/testing/controlplane/plane_test.go b/pkg/internal/testing/controlplane/plane_test.go
index 714e76e8a4..cd0359dbca 100644
--- a/pkg/internal/testing/controlplane/plane_test.go
+++ b/pkg/internal/testing/controlplane/plane_test.go
@@ -19,7 +19,7 @@ package controlplane_test
 import (
 	"context"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	kauthn "k8s.io/api/authorization/v1"
 
diff --git a/pkg/internal/testing/process/arguments_test.go b/pkg/internal/testing/process/arguments_test.go
index 386a3ec52f..b513cbdf86 100644
--- a/pkg/internal/testing/process/arguments_test.go
+++ b/pkg/internal/testing/process/arguments_test.go
@@ -20,7 +20,7 @@ import (
 	"net/url"
 	"strings"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	. "sigs.k8s.io/controller-runtime/pkg/internal/testing/process"
diff --git a/pkg/internal/testing/process/bin_path_finder_test.go b/pkg/internal/testing/process/bin_path_finder_test.go
index c933478811..1b15941840 100644
--- a/pkg/internal/testing/process/bin_path_finder_test.go
+++ b/pkg/internal/testing/process/bin_path_finder_test.go
@@ -19,7 +19,7 @@ package process
 import (
 	"os"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/internal/testing/process/process_suite_test.go b/pkg/internal/testing/process/process_suite_test.go
index 4b9d7ab198..9832534448 100644
--- a/pkg/internal/testing/process/process_suite_test.go
+++ b/pkg/internal/testing/process/process_suite_test.go
@@ -19,15 +19,20 @@ package process_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 )
 
+const suiteName = "Envtest Process Launcher Suite"
+
 func TestInternal(t *testing.T) {
 	t.Parallel()
 	RegisterFailHandler(Fail)
-	suiteName := "Envtest Process Launcher Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/internal/testing/process/process_test.go b/pkg/internal/testing/process/process_test.go
index 4ea6ae7263..9c3aa3bf27 100644
--- a/pkg/internal/testing/process/process_test.go
+++ b/pkg/internal/testing/process/process_test.go
@@ -25,7 +25,7 @@ import (
 	"strconv"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/ghttp"
 	"sigs.k8s.io/controller-runtime/pkg/internal/testing/addr"
diff --git a/pkg/log/log_suite_test.go b/pkg/log/log_suite_test.go
index bf8e967cb7..3abca610ad 100644
--- a/pkg/log/log_suite_test.go
+++ b/pkg/log/log_suite_test.go
@@ -19,13 +19,18 @@ package log
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 )
 
+const suiteName = "Log Suite"
+
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Log Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/log/log_test.go b/pkg/log/log_test.go
index 7ea56d9b49..a4f4d895ab 100644
--- a/pkg/log/log_test.go
+++ b/pkg/log/log_test.go
@@ -21,7 +21,7 @@ import (
 	"errors"
 
 	"github.com/go-logr/logr"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/log/zap/zap_suite_test.go b/pkg/log/zap/zap_suite_test.go
index 43044d8066..86cd0d61fa 100644
--- a/pkg/log/zap/zap_suite_test.go
+++ b/pkg/log/zap/zap_suite_test.go
@@ -19,13 +19,18 @@ package zap
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 )
 
+const suiteName = "Zap Log Suite"
+
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Zap Log Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/log/zap/zap_test.go b/pkg/log/zap/zap_test.go
index 2d18476e1f..748923b9f1 100644
--- a/pkg/log/zap/zap_test.go
+++ b/pkg/log/zap/zap_test.go
@@ -24,7 +24,7 @@ import (
 	"reflect"
 
 	"github.com/go-logr/logr"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"go.uber.org/zap/zapcore"
 	corev1 "k8s.io/api/core/v1"
diff --git a/pkg/manager/manager_options_test.go b/pkg/manager/manager_options_test.go
index 048441e56f..3718bedcbe 100644
--- a/pkg/manager/manager_options_test.go
+++ b/pkg/manager/manager_options_test.go
@@ -1,7 +1,7 @@
 package manager
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/controller-runtime/pkg/config"
diff --git a/pkg/manager/manager_suite_test.go b/pkg/manager/manager_suite_test.go
index 3b975a9049..73fe2406aa 100644
--- a/pkg/manager/manager_suite_test.go
+++ b/pkg/manager/manager_suite_test.go
@@ -21,7 +21,7 @@ import (
 	"net/http"
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
@@ -32,10 +32,11 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/metrics"
 )
 
+const suiteName = "Manager Suite"
+
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Manager Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
 
 var testenv *envtest.Environment
@@ -72,7 +73,7 @@ var _ = BeforeSuite(func() {
 
 	// Prevent the metrics listener being created
 	metrics.DefaultBindAddress = "0"
-}, 60)
+})
 
 var _ = AfterSuite(func() {
 	Expect(testenv.Stop()).To(Succeed())
@@ -80,3 +81,7 @@ var _ = AfterSuite(func() {
 	// Put the DefaultBindAddress back
 	metrics.DefaultBindAddress = ":8080"
 })
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/manager/manager_test.go b/pkg/manager/manager_test.go
index a4530688fa..b5aef683e6 100644
--- a/pkg/manager/manager_test.go
+++ b/pkg/manager/manager_test.go
@@ -30,7 +30,7 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/prometheus/client_golang/prometheus"
 	"go.uber.org/goleak"
diff --git a/pkg/manager/runnable_group_test.go b/pkg/manager/runnable_group_test.go
index db23eeae95..2122f23656 100644
--- a/pkg/manager/runnable_group_test.go
+++ b/pkg/manager/runnable_group_test.go
@@ -7,7 +7,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/cache/informertest"
diff --git a/pkg/manager/signals/signal_test.go b/pkg/manager/signals/signal_test.go
index 2776e13a6d..134937e012 100644
--- a/pkg/manager/signals/signal_test.go
+++ b/pkg/manager/signals/signal_test.go
@@ -23,7 +23,7 @@ import (
 	"sync"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/manager/signals/signals_suite_test.go b/pkg/manager/signals/signals_suite_test.go
index 770df0ca9c..5bc6c8c5d3 100644
--- a/pkg/manager/signals/signals_suite_test.go
+++ b/pkg/manager/signals/signals_suite_test.go
@@ -20,17 +20,22 @@ import (
 	"os/signal"
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 )
 
+const suiteName = "Runtime Signal Suite"
+
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Runtime Signal Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
 
 var _ = BeforeSuite(func() {
 	signal.Reset()
 })
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/predicate/predicate_suite_test.go b/pkg/predicate/predicate_suite_test.go
index a03d94b17d..ff6da96d7a 100644
--- a/pkg/predicate/predicate_suite_test.go
+++ b/pkg/predicate/predicate_suite_test.go
@@ -19,19 +19,24 @@ package predicate_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
+const suiteName = "Predicate Suite"
+
 func TestPredicate(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Predicate Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
 
 var _ = BeforeSuite(func() {
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
 })
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/predicate/predicate_test.go b/pkg/predicate/predicate_test.go
index f545139871..e43cca655e 100644
--- a/pkg/predicate/predicate_test.go
+++ b/pkg/predicate/predicate_test.go
@@ -17,7 +17,7 @@ limitations under the License.
 package predicate_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/reconcile/reconcile_suite_test.go b/pkg/reconcile/reconcile_suite_test.go
index 179fb10de4..c8e5586005 100644
--- a/pkg/reconcile/reconcile_suite_test.go
+++ b/pkg/reconcile/reconcile_suite_test.go
@@ -19,19 +19,24 @@ package reconcile_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
+const suiteName = "Reconcile Suite"
+
 func TestReconcile(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Reconcile Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
 
 var _ = BeforeSuite(func() {
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
 })
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/reconcile/reconcile_test.go b/pkg/reconcile/reconcile_test.go
index 26924c8fa9..125b80936d 100644
--- a/pkg/reconcile/reconcile_test.go
+++ b/pkg/reconcile/reconcile_test.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
diff --git a/pkg/runtime/inject/inject_suite_test.go b/pkg/runtime/inject/inject_suite_test.go
index 98cf79ab3b..3d49744d34 100644
--- a/pkg/runtime/inject/inject_suite_test.go
+++ b/pkg/runtime/inject/inject_suite_test.go
@@ -19,13 +19,18 @@ package inject
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 )
 
+const suiteName = "Runtime Injection Suite"
+
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Runtime Injection Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/runtime/inject/inject_test.go b/pkg/runtime/inject/inject_test.go
index bffc34ec27..7818909221 100644
--- a/pkg/runtime/inject/inject_test.go
+++ b/pkg/runtime/inject/inject_test.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"reflect"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/rest"
diff --git a/pkg/scheme/scheme_suite_test.go b/pkg/scheme/scheme_suite_test.go
index a11e08fa5c..6d7d8b7d66 100644
--- a/pkg/scheme/scheme_suite_test.go
+++ b/pkg/scheme/scheme_suite_test.go
@@ -19,14 +19,19 @@ package scheme_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 )
 
+const suiteName = "Scheme Suite"
+
 func TestScheme(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Scheme Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/scheme/scheme_test.go b/pkg/scheme/scheme_test.go
index 72f083ad4b..37c6766e6f 100644
--- a/pkg/scheme/scheme_test.go
+++ b/pkg/scheme/scheme_test.go
@@ -19,7 +19,7 @@ package scheme_test
 import (
 	"reflect"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gstruct"
 	appsv1 "k8s.io/api/apps/v1"
diff --git a/pkg/source/internal/internal_suite_test.go b/pkg/source/internal/internal_suite_test.go
index 21dd5ee6b4..17c64eda2d 100644
--- a/pkg/source/internal/internal_suite_test.go
+++ b/pkg/source/internal/internal_suite_test.go
@@ -19,19 +19,24 @@ package internal_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
+const suiteName = "Source Internal Suite"
+
 func TestInternal(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Source Internal Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
 
 var _ = BeforeSuite(func() {
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
 })
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/source/internal/internal_test.go b/pkg/source/internal/internal_test.go
index 9b96c6d46d..312fd86c17 100644
--- a/pkg/source/internal/internal_test.go
+++ b/pkg/source/internal/internal_test.go
@@ -17,7 +17,7 @@ limitations under the License.
 package internal_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"
diff --git a/pkg/source/source_integration_test.go b/pkg/source/source_integration_test.go
index f05a154d14..c7b3da39e2 100644
--- a/pkg/source/source_integration_test.go
+++ b/pkg/source/source_integration_test.go
@@ -26,7 +26,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/runtime/inject"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -188,7 +188,7 @@ var _ = Describe("Source", func() {
 				Expect(ok).To(BeTrue(), fmt.Sprintf("expect %T to be %T", evt, event.DeleteEvent{}))
 				deleteEvt.Object.SetResourceVersion("")
 				Expect(deleteEvt.Object).To(Equal(deleted))
-			}, 5)
+			})
 		})
 
 		// TODO(pwittrock): Write this test
@@ -274,7 +274,7 @@ var _ = Describe("Source", func() {
 				_, err = clientset.AppsV1().ReplicaSets("default").Create(ctx, rs, metav1.CreateOptions{})
 				Expect(err).NotTo(HaveOccurred())
 				<-c
-			}, 30)
+			})
 
 			It("should provide a ReplicaSet UpdateEvent", func() {
 				var err error
diff --git a/pkg/source/source_suite_test.go b/pkg/source/source_suite_test.go
index 9fd9671cd0..04bef13469 100644
--- a/pkg/source/source_suite_test.go
+++ b/pkg/source/source_suite_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
@@ -31,10 +31,11 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
+const suiteName = "Source Suite"
+
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Source Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
 
 var testenv *envtest.Environment
@@ -64,9 +65,13 @@ var _ = BeforeSuite(func() {
 		defer GinkgoRecover()
 		Expect(icache.Start(ctx)).NotTo(HaveOccurred())
 	}()
-}, 60)
+})
 
 var _ = AfterSuite(func() {
 	cancel()
 	Expect(testenv.Stop()).To(Succeed())
-}, 5)
+})
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/source/source_test.go b/pkg/source/source_test.go
index 70c708df08..c2e6904180 100644
--- a/pkg/source/source_test.go
+++ b/pkg/source/source_test.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"sigs.k8s.io/controller-runtime/pkg/cache/informertest"
 	"sigs.k8s.io/controller-runtime/pkg/event"
diff --git a/pkg/webhook/admission/admission_suite_test.go b/pkg/webhook/admission/admission_suite_test.go
index 3648aa45b7..0cf9a1e7e8 100644
--- a/pkg/webhook/admission/admission_suite_test.go
+++ b/pkg/webhook/admission/admission_suite_test.go
@@ -19,7 +19,7 @@ package admission
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
@@ -27,12 +27,17 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
+const suiteName = "Admission Webhook Suite"
+
 func TestAdmissionWebhook(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Admission Webhook Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
 
 var _ = BeforeSuite(func() {
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
-}, 60)
+})
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/webhook/admission/decode_test.go b/pkg/webhook/admission/decode_test.go
index c167c51026..f92db10a6c 100644
--- a/pkg/webhook/admission/decode_test.go
+++ b/pkg/webhook/admission/decode_test.go
@@ -17,7 +17,7 @@ limitations under the License.
 package admission
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	admissionv1 "k8s.io/api/admission/v1"
diff --git a/pkg/webhook/admission/defaulter_test.go b/pkg/webhook/admission/defaulter_test.go
index 93c3eda7c2..e9e41f5420 100644
--- a/pkg/webhook/admission/defaulter_test.go
+++ b/pkg/webhook/admission/defaulter_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"net/http"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	admissionv1 "k8s.io/api/admission/v1"
diff --git a/pkg/webhook/admission/http_test.go b/pkg/webhook/admission/http_test.go
index 7dd2d5bcfc..356e24010a 100644
--- a/pkg/webhook/admission/http_test.go
+++ b/pkg/webhook/admission/http_test.go
@@ -24,7 +24,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	admissionv1 "k8s.io/api/admission/v1"
diff --git a/pkg/webhook/admission/multi_test.go b/pkg/webhook/admission/multi_test.go
index a8b51872a2..da85a52e42 100644
--- a/pkg/webhook/admission/multi_test.go
+++ b/pkg/webhook/admission/multi_test.go
@@ -19,7 +19,7 @@ package admission
 import (
 	"context"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	jsonpatch "gomodules.xyz/jsonpatch/v2"
diff --git a/pkg/webhook/admission/response_test.go b/pkg/webhook/admission/response_test.go
index e96b0e6ca7..42a083a166 100644
--- a/pkg/webhook/admission/response_test.go
+++ b/pkg/webhook/admission/response_test.go
@@ -20,7 +20,7 @@ import (
 	"errors"
 	"net/http"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	jsonpatch "gomodules.xyz/jsonpatch/v2"
diff --git a/pkg/webhook/admission/validator_test.go b/pkg/webhook/admission/validator_test.go
index 7fe19268d9..d777d78a67 100644
--- a/pkg/webhook/admission/validator_test.go
+++ b/pkg/webhook/admission/validator_test.go
@@ -21,7 +21,7 @@ import (
 	goerrors "errors"
 	"net/http"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission/admissiontest"
 
diff --git a/pkg/webhook/admission/webhook_test.go b/pkg/webhook/admission/webhook_test.go
index 73b0be1694..a2a66d9d1d 100644
--- a/pkg/webhook/admission/webhook_test.go
+++ b/pkg/webhook/admission/webhook_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 	"net/http"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	jsonpatch "gomodules.xyz/jsonpatch/v2"
diff --git a/pkg/webhook/authentication/authentication_suite_test.go b/pkg/webhook/authentication/authentication_suite_test.go
index b993d1ef80..a2f22264cf 100644
--- a/pkg/webhook/authentication/authentication_suite_test.go
+++ b/pkg/webhook/authentication/authentication_suite_test.go
@@ -19,7 +19,7 @@ package authentication
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
@@ -27,12 +27,17 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
+const suiteName = "Authentication Webhook Suite"
+
 func TestAuthenticationWebhook(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Authentication Webhook Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
 
 var _ = BeforeSuite(func() {
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
-}, 60)
+})
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/webhook/authentication/http_test.go b/pkg/webhook/authentication/http_test.go
index 882a77e427..32227ee144 100644
--- a/pkg/webhook/authentication/http_test.go
+++ b/pkg/webhook/authentication/http_test.go
@@ -24,7 +24,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	authenticationv1 "k8s.io/api/authentication/v1"
 
diff --git a/pkg/webhook/authentication/response_test.go b/pkg/webhook/authentication/response_test.go
index 22c1ee3ba7..6eeef87c11 100644
--- a/pkg/webhook/authentication/response_test.go
+++ b/pkg/webhook/authentication/response_test.go
@@ -19,7 +19,7 @@ package authentication
 import (
 	"errors"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	authenticationv1 "k8s.io/api/authentication/v1"
diff --git a/pkg/webhook/authentication/webhook_test.go b/pkg/webhook/authentication/webhook_test.go
index 55849ece32..e80096395e 100644
--- a/pkg/webhook/authentication/webhook_test.go
+++ b/pkg/webhook/authentication/webhook_test.go
@@ -19,7 +19,7 @@ package authentication
 import (
 	"context"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	authenticationv1 "k8s.io/api/authentication/v1"
diff --git a/pkg/webhook/conversion/conversion_suite_test.go b/pkg/webhook/conversion/conversion_suite_test.go
index bb3798747c..442357ad38 100644
--- a/pkg/webhook/conversion/conversion_suite_test.go
+++ b/pkg/webhook/conversion/conversion_suite_test.go
@@ -18,7 +18,7 @@ package conversion
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
@@ -26,12 +26,17 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
+const suiteName = "CRD conversion Suite"
+
 func TestConversionWebhook(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "CRD conversion Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
 
 var _ = BeforeSuite(func() {
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
 })
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})
diff --git a/pkg/webhook/conversion/conversion_test.go b/pkg/webhook/conversion/conversion_test.go
index 2dd5e2ae0e..6a6c9a7611 100644
--- a/pkg/webhook/conversion/conversion_test.go
+++ b/pkg/webhook/conversion/conversion_test.go
@@ -23,7 +23,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	appsv1beta1 "k8s.io/api/apps/v1beta1"
diff --git a/pkg/webhook/server_test.go b/pkg/webhook/server_test.go
index 5e77564194..68b4dcf076 100644
--- a/pkg/webhook/server_test.go
+++ b/pkg/webhook/server_test.go
@@ -24,7 +24,7 @@ import (
 	"net"
 	"net/http"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
diff --git a/pkg/webhook/webhook_integration_test.go b/pkg/webhook/webhook_integration_test.go
index 029a503b4b..3f0f0d42a1 100644
--- a/pkg/webhook/webhook_integration_test.go
+++ b/pkg/webhook/webhook_integration_test.go
@@ -26,7 +26,7 @@ import (
 	"strconv"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
diff --git a/pkg/webhook/webhook_suite_test.go b/pkg/webhook/webhook_suite_test.go
index b8ee879d36..b5d486a280 100644
--- a/pkg/webhook/webhook_suite_test.go
+++ b/pkg/webhook/webhook_suite_test.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	admissionv1 "k8s.io/api/admissionregistration/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -32,10 +32,11 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
+const suiteName = "Webhook Integration Suite"
+
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	suiteName := "Webhook Integration Suite"
-	RunSpecsWithDefaultAndCustomReporters(t, suiteName, []Reporter{printer.NewlineReporter{}, printer.NewProwReporter(suiteName)})
+	RunSpecs(t, suiteName)
 }
 
 var testenv *envtest.Environment
@@ -50,12 +51,12 @@ var _ = BeforeSuite(func() {
 	var err error
 	cfg, err = testenv.Start()
 	Expect(err).NotTo(HaveOccurred())
-}, 60)
+})
 
 var _ = AfterSuite(func() {
 	fmt.Println("stopping?")
 	Expect(testenv.Stop()).To(Succeed())
-}, 60)
+})
 
 func initializeWebhookInEnvironment() {
 	namespacedScopeV1 := admissionv1.NamespacedScope
@@ -105,3 +106,7 @@ func initializeWebhookInEnvironment() {
 		},
 	}
 }
+
+var _ = ReportAfterSuite("Report to Prow", func(report Report) {
+	printer.AddReport(report, suiteName)
+})