diff --git a/.golangci.yml b/.golangci.yml
index e4138482bb..9add6fc6f9 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -7,13 +7,14 @@ run:
 linters: 
   default: none
   enable:
-    - misspell
+    - ginkgolinter
+    - govet
     - ineffassign
+    - misspell
     - modernize
     - revive
     - unconvert
     - unused
-    - govet
   settings:
     govet:
       enable:
diff --git a/manager/csi/plugin_test.go b/manager/csi/plugin_test.go
index 7b10009a3d..02c966b510 100644
--- a/manager/csi/plugin_test.go
+++ b/manager/csi/plugin_test.go
@@ -195,7 +195,7 @@ var _ = Describe("Plugin manager", func() {
 			})
 
 			It("should not call CreateVolume", func() {
-				Expect(controller.createVolumeRequests).To(HaveLen(0))
+				Expect(controller.createVolumeRequests).To(BeEmpty())
 			})
 
 			It("should not return an error", func() {
diff --git a/manager/orchestrator/jobs/replicated/reconciler_test.go b/manager/orchestrator/jobs/replicated/reconciler_test.go
index 2f87812605..e4d5e03c16 100644
--- a/manager/orchestrator/jobs/replicated/reconciler_test.go
+++ b/manager/orchestrator/jobs/replicated/reconciler_test.go
@@ -267,7 +267,7 @@ var _ = Describe("Replicated Job reconciler", func() {
 
 				It("should use the cluster to set the default log driver", func() {
 					tasks := AllTasks(s)
-					Expect(len(tasks) >= 1).To(BeTrue())
+					Expect(tasks).ToNot(BeEmpty())
 
 					Expect(tasks[0].LogDriver).To(Equal(cluster.Spec.TaskDefaults.LogDriver))
 				})