diff --git a/.travis.yml b/.travis.yml
index 7b3765716eb2..6d5b43c2f035 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ matrix:
     - python: "3.6.1"
       env: TOXENV=lint
     - python: "3.6.1"
-      env: TOXENV=pylint
+      env: TOXENV=pylint PYLINT_ARGS=--jobs=0
     - python: "3.6.1"
       env: TOXENV=typing
     - python: "3.6.1"
diff --git a/azure-pipelines-ci.yml b/azure-pipelines-ci.yml
index 1ca834b62136..f1abf2ff9dba 100644
--- a/azure-pipelines-ci.yml
+++ b/azure-pipelines-ci.yml
@@ -167,7 +167,7 @@ stages:
       displayName: 'Install Home Assistant'
     - script: |
         . venv/bin/activate
-        pylint -j 2 homeassistant
+        pylint homeassistant
       displayName: 'Run pylint'
   - job: 'Mypy'
     pool:
diff --git a/pylintrc b/pylintrc
index 3d69800e5c31..4aced384b630 100644
--- a/pylintrc
+++ b/pylintrc
@@ -1,5 +1,8 @@
 [MASTER]
 ignore=tests
+# Use a conservative default here; 2 should speed up most setups and not hurt
+# any too bad. Override on command line as appropriate.
+jobs=2
 
 [BASIC]
 good-names=id,i,j,k,ex,Run,_,fp
diff --git a/tox.ini b/tox.ini
index 0b0c969d7811..f6d12fe30f52 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,7 +26,7 @@ deps =
      -r{toxinidir}/requirements_test.txt
      -c{toxinidir}/homeassistant/package_constraints.txt
 commands =
-     pylint {posargs} homeassistant
+     pylint {env:PYLINT_ARGS} {posargs} homeassistant
 
 [testenv:lint]
 deps =