diff --git a/.circleci/config.yml b/.circleci/config.yml
index f6b7a7f9d38..befaa73f08b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -826,7 +826,7 @@ jobs:
           command: |
             # To save memory, run in two batches
             golangci-lint run -v -j 4 --config scripts/go/configs/ci/.golangci.toml -E deadcode -E depguard -E dogsled \
-              -E errcheck -E goconst -E golint -E gosec -E gosimple -E govet -E scopelint -E whitespace ./pkg/...
+              -E errcheck -E goconst -E golint -E gosec -E gosimple -E govet -E exportloopref -E whitespace ./pkg/...
             golangci-lint run -v -j 4 --config scripts/go/configs/ci/.golangci.toml -E ineffassign \
               -E rowserrcheck -E staticcheck -E structcheck -E typecheck -E unconvert -E unused -E varcheck ./pkg/...
             ./scripts/go/bin/revive -formatter stylish -config ./scripts/go/configs/revive.toml ./pkg/...
diff --git a/scripts/go/configs/.golangci.toml b/scripts/go/configs/.golangci.toml
index 5ff0e6bd138..84467505b59 100644
--- a/scripts/go/configs/.golangci.toml
+++ b/scripts/go/configs/.golangci.toml
@@ -29,7 +29,7 @@ enable = [
   # "interfacer",
   # "misspell",
   "rowserrcheck",
-  "scopelint",
+  "exportloopref",
   "staticcheck",
   "structcheck",
   # "stylecheck",
@@ -44,10 +44,6 @@ enable = [
 # "gocyclo",
 # "unparam"
 
-[[issues.exclude-rules]]
-path = "_test\\.go"
-linters = ["scopelint"]
-
 [[issues.exclude-rules]]
 linters = ["gosec"]
 text = "G108"
diff --git a/scripts/go/configs/ci/.golangci.toml b/scripts/go/configs/ci/.golangci.toml
index e38382bcf98..57bc7588c62 100644
--- a/scripts/go/configs/ci/.golangci.toml
+++ b/scripts/go/configs/ci/.golangci.toml
@@ -11,10 +11,6 @@ min-occurrences = 5
 [linters]
 disable-all = true
 
-[[issues.exclude-rules]]
-path = "_test\\.go"
-linters = ["scopelint"]
-
 [[issues.exclude-rules]]
 linters = ["gosec"]
 text = "G108"