diff --git a/pkg/util/openapi/openapi_getter_test.go b/pkg/util/openapi/openapi_getter_test.go
index 8afffd345..d30d14278 100644
--- a/pkg/util/openapi/openapi_getter_test.go
+++ b/pkg/util/openapi/openapi_getter_test.go
@@ -48,7 +48,7 @@ var _ = Describe("Getting the Resources", func() {
 		instance = openapi.NewOpenAPIParser(openapi.NewOpenAPIGetter(&client))
 		var err error
 		expectedData, err = openapi.NewOpenAPIData(nil)
-		Expect(err).To(BeNil())
+		Expect(err).ToNot(HaveOccurred())
 	})
 
 	Context("when the server returns a successful result", func() {
@@ -56,12 +56,12 @@ var _ = Describe("Getting the Resources", func() {
 			Expect(client.Calls).To(Equal(0))
 
 			result, err := instance.Parse()
-			Expect(err).To(BeNil())
+			Expect(err).ToNot(HaveOccurred())
 			Expect(result).To(Equal(expectedData))
 			Expect(client.Calls).To(Equal(1))
 
 			result, err = instance.Parse()
-			Expect(err).To(BeNil())
+			Expect(err).ToNot(HaveOccurred())
 			Expect(result).To(Equal(expectedData))
 			// No additional client calls expected
 			Expect(client.Calls).To(Equal(1))
diff --git a/pkg/util/openapi/openapi_test.go b/pkg/util/openapi/openapi_test.go
index 225018bf7..aeec587f7 100644
--- a/pkg/util/openapi/openapi_test.go
+++ b/pkg/util/openapi/openapi_test.go
@@ -34,9 +34,9 @@ var _ = Describe("Reading apps/v1/Deployment from openAPIData", func() {
 	var resources openapi.Resources
 	BeforeEach(func() {
 		s, err := fakeSchema.OpenAPISchema()
-		Expect(err).To(BeNil())
+		Expect(err).ToNot(HaveOccurred())
 		resources, err = openapi.NewOpenAPIData(s)
-		Expect(err).To(BeNil())
+		Expect(err).ToNot(HaveOccurred())
 	})
 
 	gvk := schema.GroupVersionKind{
@@ -52,7 +52,7 @@ var _ = Describe("Reading apps/v1/Deployment from openAPIData", func() {
 		Expect(schema.(*proto.Kind)).ToNot(BeNil())
 		consumes := resources.GetConsumes(gvk, "PATCH")
 		Expect(consumes).ToNot(BeNil())
-		Expect(len(consumes)).To(Equal(4))
+		Expect(consumes).To(HaveLen(4))
 	})
 })
 
@@ -60,9 +60,9 @@ var _ = Describe("Reading authorization.k8s.io/v1/SubjectAccessReview from openA
 	var resources openapi.Resources
 	BeforeEach(func() {
 		s, err := fakeSchema.OpenAPISchema()
-		Expect(err).To(BeNil())
+		Expect(err).ToNot(HaveOccurred())
 		resources, err = openapi.NewOpenAPIData(s)
-		Expect(err).To(BeNil())
+		Expect(err).ToNot(HaveOccurred())
 	})
 
 	gvk := schema.GroupVersionKind{
diff --git a/pkg/validation/validation_test.go b/pkg/validation/validation_test.go
index 55b4c100b..0247a8211 100644
--- a/pkg/validation/validation_test.go
+++ b/pkg/validation/validation_test.go
@@ -36,9 +36,9 @@ var _ = Describe("resource validation using OpenAPI Schema", func() {
 	var validator Schema
 	BeforeEach(func() {
 		s, err := fakeSchema.OpenAPISchema()
-		Expect(err).To(BeNil())
+		Expect(err).ToNot(HaveOccurred())
 		resources, err := openapi.NewOpenAPIData(s)
-		Expect(err).To(BeNil())
+		Expect(err).ToNot(HaveOccurred())
 		validator = NewSchemaValidation(resources)
 		Expect(validator).ToNot(BeNil())
 	})
@@ -65,7 +65,7 @@ spec:
       - image: redis
         name: redis
 `))
-		Expect(err).To(BeNil())
+		Expect(err).ToNot(HaveOccurred())
 	})
 
 	It("validates a valid pod", func() {
@@ -87,7 +87,7 @@ spec:
     image: gcr.io/fake_project/fake_image:fake_tag
     name: master
 `))
-		Expect(err).To(BeNil())
+		Expect(err).ToNot(HaveOccurred())
 	})
 
 	It("finds invalid command (string instead of []string) in Json Pod", func() {
@@ -317,7 +317,7 @@ spec:
     command:
 `))
 
-		Expect(err).To(BeNil())
+		Expect(err).ToNot(HaveOccurred())
 	})
 
 	It("can validate lists", func() {
@@ -336,7 +336,7 @@ items:
       - name: name
 `))
 
-		Expect(err).To(BeNil())
+		Expect(err).ToNot(HaveOccurred())
 	})
 
 	It("fails because apiVersion is not provided", func() {
@@ -407,6 +407,6 @@ metadata:
 spec:
   foo: bar
 `))
-		Expect(err).To(BeNil())
+		Expect(err).ToNot(HaveOccurred())
 	})
 })