diff --git a/.golangci.yaml b/.golangci.yaml
index 0166b7a..59459ed 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -52,7 +52,6 @@ linters-settings:
       - strings.SplitN
 
   govet:
-    check-shadowing: true
     settings:
       printf:
         funcs:
@@ -60,6 +59,8 @@ linters-settings:
           - (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf
           - (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
           - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
+      shadow:
+        strict: true
   lll:
     line-length: 140
   misspell:
@@ -128,11 +129,16 @@ linters:
 
 issues:
   # Excluding configuration per-path, per-linter, per-text and per-source
+  exclude-dirs:
+    - test/testdata_etc # test files
+    - internal/cache # extracted from Go code
+    - internal/renameio # extracted from Go code
+    - internal/robustio # extracted from Go code
   exclude-rules:
     - path: _test\.go
       linters:
-        - gomnd
-        - revive
+        - gomnd # test files can have magic numbers
+        - revive # test files can have unused parameters
 
     - path: pkg/golinters/errcheck.go
       text: "SA1019: errCfg.Exclude is deprecated: use ExcludeFunctions instead"
@@ -154,8 +160,3 @@ issues:
 
 run:
   timeout: 5m
-  skip-dirs:
-    - test/testdata_etc # test files
-    - internal/cache # extracted from Go code
-    - internal/renameio # extracted from Go code
-    - internal/robustio # extracted from Go code