diff --git a/hack/validate/golangci-lint.yml b/hack/validate/golangci-lint.yml
index 3aedf82a0c..661a85e385 100644
--- a/hack/validate/golangci-lint.yml
+++ b/hack/validate/golangci-lint.yml
@@ -24,10 +24,7 @@ linters:
     modules-download-mode: vendor
 
     skip-dirs:
-      - bundles
       - docs
-      # TODO: This package should be completely removed
-      - libnetwork/client/mflag
 
 linters-settings:
   govet:
@@ -85,9 +82,6 @@ issues:
       path: "api/types/(volume|container)/"
       linters:
         - golint
-    - text: "(G201|G202): SQL string (formatting|concatenation)"
-      linters:
-        - gosec
     # FIXME: evaluate these and fix where needed: G307: Deferring unsafe method "*os.File" on type "Close" (gosec)
     - text: "G307: Deferring unsafe method"
       linters:
@@ -104,11 +98,6 @@ issues:
     - text: "SA1019: httputil.ErrPersistEOF"
       linters:
         - staticcheck
-    # FIXME temporarily suppress these for false positives in tests (see https://github.com/dominikh/go-tools/issues/1022)
-    - text: "SA5011"
-      path: _test\.go
-      linters:
-        - staticcheck
     # This code is doing some fun stuff with reflect and it trips up the linter.
     - text: "field `foo` is unused"
       path: "libnetwork/options/options_test.go"