diff --git a/.golangci.yml b/.golangci.yml
index 00fc7b27..c0057fce 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -2,10 +2,6 @@ run:
   # timeout for analysis
   deadline: 4m
 
-  # Linting uses a lot of memory. Keep it under control by only running a single
-  # worker.
-  concurrency: 1
-
   # Skip autogenerated files for mobile.
   skip-files:
     - "mobile\\/.*generated\\.go"
diff --git a/.travis.yml b/.travis.yml
index 32a9f5b5..138d0b2b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,7 +41,7 @@ jobs:
       script:
         - make rpc-check
         - make unit pkg=... case=_NONE_
-        - make lint
+        - make lint workers=1
         - make btcd
         - LNDBUILDSYS=windows-amd64 bash ./build/release/release.sh
     - stage: Test
diff --git a/Makefile b/Makefile
index d0495793..5ecd4929 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,13 @@ include make/testing_flags.mk
 
 DEV_TAGS := $(if ${tags},$(DEV_TAGS) ${tags},$(DEV_TAGS))
 
-LINT = $(LINT_BIN) run -v
+# Linting uses a lot of memory, so keep it under control by limiting the number
+# of workers if requested.
+ifneq ($(workers),)
+LINT_WORKERS = --concurrency=$(workers)
+endif
+
+LINT = $(LINT_BIN) run -v $(LINT_WORKERS)
 
 GREEN := "\\033[0;32m"
 NC := "\\033[0m"