diff --git a/pylintrc b/pylintrc
index b83bc9f82..ca3ea1c57 100644
--- a/pylintrc
+++ b/pylintrc
@@ -11,13 +11,18 @@ disable=abstract-method,
         bad-continuation,
         bad-indentation,
         bad-mcs-classmethod-argument,
+        bad-super-call,
         bad-whitespace,
+        blacklisted-name,
         broad-except,
         c-extension-no-member,
         catching-non-exception,
         cell-var-from-loop,
         comparison-with-callable,
+        consider-iterating-dictionary,
         consider-using-in,
+        consider-using-set-comprehension,
+        consider-using-sys-exit,
         cyclic-import,
         dangerous-default-value,
         deprecated-method,
@@ -30,6 +35,7 @@ disable=abstract-method,
         global-statement,
         import-error,
         import-outside-toplevel,
+        import-self,
         inconsistent-return-statements,
         inherit-non-class,
         invalid-name,
@@ -39,6 +45,7 @@ disable=abstract-method,
         logging-not-lazy,
         lost-exception,
         method-hidden,
+        misplaced-comparison-constant,
         missing-docstring,
         missing-final-newline,
         multiple-imports,
@@ -52,6 +59,9 @@ disable=abstract-method,
         no-name-in-module,
         no-self-argument,
         no-self-use,
+        no-value-for-parameter,
+        not-callable,
+        pointless-statement,
         pointless-string-statement,
         protected-access,
         redefined-argument-from-local,
@@ -59,6 +69,7 @@ disable=abstract-method,
         redefined-outer-name,
         reimported,
         signature-differs,
+        singleton-comparison,
         super-init-not-called,
         superfluous-parens,
         too-few-public-methods,
@@ -67,15 +78,21 @@ disable=abstract-method,
         too-many-branches,
         too-many-function-args,
         too-many-instance-attributes,
+        too-many-lines,
         too-many-locals,
+        too-many-public-methods,
         too-many-return-statements,
         trailing-newlines,
         trailing-whitespace,
+        unbalanced-tuple-unpacking,
+        undefined-variable,
         unexpected-special-method-signature,
         ungrouped-imports,
         unidiomatic-typecheck,
         unnecessary-comprehension,
+        unnecessary-lambda,
         unnecessary-pass,
+        unreachable,
         unsubscriptable-object,
         unused-argument,
         unused-import,
@@ -83,6 +100,8 @@ disable=abstract-method,
         unused-wildcard-import,
         used-before-assignment,
         useless-object-inheritance,  # Required for Python 2 support
+        useless-return,
+        useless-super-delegation,
         wildcard-import,
         wrong-import-order,
         wrong-import-position
diff --git a/tox.ini b/tox.ini
index e7d366fe9..428571ef2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -110,7 +110,7 @@ deps =
     pylint
 
 commands =
-    pylint scrapy
+    pylint conftest.py docs extras scrapy setup.py tests
 
 [docs]
 changedir = docs