diff --git a/.golangci.yaml b/.golangci.yaml
index bd812ea3f..6e5bac35b 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -10,6 +10,16 @@ linters:
     - ineffassign
     - staticcheck
     - unused
+    - revive
+    - stylecheck
 issues:
   max-issues-per-linter: 0
   max-same-issues: 0
+  exclude-rules:
+    # Allow underscores in names in test files because the
+    # HashiCorp-recommended/documented convention uses
+    # underscores in function names
+    - path: _test\.go
+      linters:
+        - revive
+      text: "^var-naming"