diff --git a/pkg/envtest/envtest_test.go b/pkg/envtest/envtest_test.go
index 18ed4c22c8..628eeaab64 100644
--- a/pkg/envtest/envtest_test.go
+++ b/pkg/envtest/envtest_test.go
@@ -65,7 +65,7 @@ var _ = Describe("Test", func() {
 				Name: crd.GetName(),
 			}
 			var placeholder v1beta1.CustomResourceDefinition
-			err := c.Get(context.TODO(), crdObjectKey, &placeholder)
+			err = c.Get(context.TODO(), crdObjectKey, &placeholder)
 			if err != nil && apierrors.IsNotFound(err) {
 				// CRD doesn't need to be deleted.
 				continue
@@ -73,7 +73,7 @@ var _ = Describe("Test", func() {
 			Expect(err).NotTo(HaveOccurred())
 			Expect(c.Delete(context.TODO(), crd)).To(Succeed())
 			Eventually(func() bool {
-				err := c.Get(context.TODO(), crdObjectKey, &placeholder)
+				err = c.Get(context.TODO(), crdObjectKey, &placeholder)
 				return apierrors.IsNotFound(err)
 			}, 5*time.Second).Should(BeTrue())
 		}
@@ -830,16 +830,16 @@ var _ = Describe("Test", func() {
 
 	Describe("Start", func() {
 		It("should raise an error on invalid dir when flag is enabled", func(done Done) {
-			env := &Environment{ErrorIfCRDPathMissing: true, CRDDirectoryPaths: []string{invalidDirectory}}
-			_, err := env.Start()
+			env = &Environment{ErrorIfCRDPathMissing: true, CRDDirectoryPaths: []string{invalidDirectory}}
+			_, err = env.Start()
 			Expect(err).To(HaveOccurred())
 			Expect(env.Stop()).To(Succeed())
 			close(done)
 		}, 30)
 
 		It("should not raise an error on invalid dir when flag is disabled", func(done Done) {
-			env := &Environment{ErrorIfCRDPathMissing: false, CRDDirectoryPaths: []string{invalidDirectory}}
-			_, err := env.Start()
+			env = &Environment{ErrorIfCRDPathMissing: false, CRDDirectoryPaths: []string{invalidDirectory}}
+			_, err = env.Start()
 			Expect(err).NotTo(HaveOccurred())
 			Expect(env.Stop()).To(Succeed())
 			close(done)
diff --git a/pkg/envtest/server.go b/pkg/envtest/server.go
index 614d861fde..148b0ad405 100644
--- a/pkg/envtest/server.go
+++ b/pkg/envtest/server.go
@@ -158,13 +158,15 @@ func (te *Environment) Stop() error {
 			return err
 		}
 	}
+
+	if err := te.WebhookInstallOptions.Cleanup(); err != nil {
+		return err
+	}
+
 	if te.useExistingCluster() {
 		return nil
 	}
-	err := te.WebhookInstallOptions.Cleanup()
-	if err != nil {
-		return err
-	}
+
 	return te.ControlPlane.Stop()
 }
 
diff --git a/pkg/envtest/webhook.go b/pkg/envtest/webhook.go
index 9f96e87930..7f5966f56a 100644
--- a/pkg/envtest/webhook.go
+++ b/pkg/envtest/webhook.go
@@ -165,7 +165,7 @@ func (o *WebhookInstallOptions) PrepWithoutInstalling() error {
 	if err != nil {
 		return err
 	}
-	if err := parseWebhook(o); err != nil {
+	if err = parseWebhook(o); err != nil {
 		return err
 	}
 
@@ -292,10 +292,10 @@ func (o *WebhookInstallOptions) setupCA() ([]byte, error) {
 		return nil, fmt.Errorf("unable to marshal webhook serving certs: %v", err)
 	}
 
-	if err := ioutil.WriteFile(filepath.Join(localServingCertsDir, "tls.crt"), certData, 0640); err != nil {
+	if err = ioutil.WriteFile(filepath.Join(localServingCertsDir, "tls.crt"), certData, 0640); err != nil {
 		return nil, fmt.Errorf("unable to write webhook serving cert to disk: %v", err)
 	}
-	if err := ioutil.WriteFile(filepath.Join(localServingCertsDir, "tls.key"), keyData, 0640); err != nil {
+	if err = ioutil.WriteFile(filepath.Join(localServingCertsDir, "tls.key"), keyData, 0640); err != nil {
 		return nil, fmt.Errorf("unable to write webhook serving key to disk: %v", err)
 	}
 
diff --git a/pkg/envtest/webhook_test.go b/pkg/envtest/webhook_test.go
index 1064190745..40f7a98221 100644
--- a/pkg/envtest/webhook_test.go
+++ b/pkg/envtest/webhook_test.go
@@ -100,6 +100,6 @@ var _ = Describe("Test", func() {
 type rejectingValidator struct {
 }
 
-func (v *rejectingValidator) Handle(ctx context.Context, req admission.Request) admission.Response {
+func (v *rejectingValidator) Handle(_ context.Context, _ admission.Request) admission.Response {
 	return admission.Denied(fmt.Sprint("Always denied"))
 }
diff --git a/pkg/webhook/server_test.go b/pkg/webhook/server_test.go
index 1426b4dec9..ca7da4ce49 100644
--- a/pkg/webhook/server_test.go
+++ b/pkg/webhook/server_test.go
@@ -43,7 +43,7 @@ var _ = Describe("Webhook Server", func() {
 
 	BeforeEach(func() {
 		ctx, ctxCancel = context.WithCancel(context.Background())
-		// closed in indivual tests differently
+		// closed in individual tests differently
 
 		servingOpts = envtest.WebhookInstallOptions{}
 		Expect(servingOpts.PrepWithoutInstalling()).To(Succeed())