diff --git a/.golangci-warnings.yml b/.golangci-warnings.yml
index f0f2eee48e..e3b8d22ff2 100644
--- a/.golangci-warnings.yml
+++ b/.golangci-warnings.yml
@@ -8,8 +8,8 @@ linters:
     - deadcode
     - partitiontest
     - structcheck
-    - typecheck
     - varcheck
+    - unconvert
     - unused
 
 
@@ -52,24 +52,19 @@ issues:
     # be more lenient with test code
     - path: _test\.go
       linters:
-        - staticcheck
+        - deadcode
         - structcheck
-        - typecheck
         - varcheck
-        - deadcode
-        - gosimple
+        - unconvert
         - unused
     # Add all linters here -- Comment this block out for testing linters
     - path: test/linttest/lintissues\.go
       linters:
-        - staticcheck
+        - deadcode
         - structcheck
-        - typecheck
         - varcheck
-        - deadcode
-        - gosimple
+        - unconvert
         - unused
-        - partitiontest
     - path: crypto/secp256k1/secp256_test\.go
       linters:
         - partitiontest