diff --git a/.golangci.yml b/.golangci.yml
index a0138383..0f5aaa0d 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -68,7 +68,7 @@ linters:
     #- gofumpt
     #- goheader
     - goimports
-    - golint # !
+    #- golint ! Use revive instead
     #- gomnd
     #- gomoddirectives
     #- gomodguard
@@ -99,7 +99,7 @@ linters:
     #- prealloc
     #- predeclared
     #- promlinter
-    #- revive
+    - revive
     #- rowserrcheck
     #- scopelint !
     #- sqlclosecheck
diff --git a/completions_test.go b/completions_test.go
index 01724660..28a2c26b 100644
--- a/completions_test.go
+++ b/completions_test.go
@@ -1261,7 +1261,7 @@ func TestValidArgsFuncCmdContext(t *testing.T) {
 	}
 	rootCmd.AddCommand(childCmd)
 
-	//nolint:golint,staticcheck // We can safely use a basic type as key in tests.
+	//nolint:golint,revive,staticcheck // We can safely use a basic type as key in tests.
 	ctx := context.WithValue(context.Background(), "testKey", "123")
 
 	// Test completing an empty string on the childCmd