diff --git a/setup.cfg b/setup.cfg
index 66c036df6..d811e7989 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,9 @@
 [isort]
 skip =
-    _vendor
-    __main__.py
+    .tox,
+    .scratch,
+    _vendor,
+    data
 multi_line_output = 5
 known_third_party =
     pip._vendor
@@ -12,7 +14,11 @@ default_section = THIRDPARTY
 include_trailing_comma = true
 
 [flake8]
-exclude = .tox,.idea,.scratch,*.egg,build,_vendor,data
+exclude =
+    .tox,
+    .scratch,
+    _vendor,
+    data
 select = E,W,F
 
 [mypy]
diff --git a/tox.ini b/tox.ini
index 866db977f..46f0fb3e0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -36,8 +36,8 @@ commands =
 [lint]
 deps = -r{toxinidir}/tools/lint-requirements.txt
 commands =
-    flake8 .
-    isort --recursive --check-only --diff src/pip tests
+    flake8
+    isort --check-only --diff
 
 [testenv:lint-py2]
 basepython = python2