diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
index a040e9d64..72e7a6dc9 100644
--- a/pkg/controller/controller.go
+++ b/pkg/controller/controller.go
@@ -119,6 +119,7 @@ func (c *controller) Run(workers int, stopCh <-chan struct{}) error {
 	}
 
 	for _, f := range c.runDurationFuncs {
+		f := f // capture range variable
 		go wait.Until(func() { f.fn(ctx) }, f.duration, stopCh)
 	}
 
diff --git a/test/e2e/suite/issuers/selfsigned/certificaterequest.go b/test/e2e/suite/issuers/selfsigned/certificaterequest.go
index cf1c42345..159709c78 100644
--- a/test/e2e/suite/issuers/selfsigned/certificaterequest.go
+++ b/test/e2e/suite/issuers/selfsigned/certificaterequest.go
@@ -163,6 +163,7 @@ var _ = framework.CertManagerDescribe("SelfSigned CertificateRequest", func() {
 			},
 		}
 		for _, v := range cases {
+			v := v // capture range variable
 			It("should generate a signed certificate valid for "+v.label, func() {
 				crClient := f.CertManagerClientSet.CertmanagerV1().CertificateRequests(f.Namespace.Name)
 
@@ -172,6 +173,7 @@ var _ = framework.CertManagerDescribe("SelfSigned CertificateRequest", func() {
 
 				_, err = crClient.Create(context.TODO(), gen.CertificateRequestFrom(basicCR,
 					gen.SetCertificateRequestCSR(csr),
+					gen.SetCertificateRequestDuration(v.inputDuration),
 				), metav1.CreateOptions{})
 				Expect(err).NotTo(HaveOccurred())