2 files changed, 6 insertions, 0 deletions
diff --git a/pytest.ini b/pytest.ini
index 2fa3a3ec..c693a4c3 100755
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,3 +1,6 @@
 [pytest]
 addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt --ignore scripts/upload-old-releases-as-zip.py --ignore pavement.py
 norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern
+flake8-ignore =
+    setuptools/site-patch.py F821
+    setuptools/py*compat.py F811
diff --git a/setup.py b/setup.py
index 7bd3a079..0aa394fb 100755
--- a/setup.py
+++ b/setup.py
@@ -161,6 +161,9 @@ setup_params = dict(
     scripts=[],
     tests_require=[
         'setuptools[ssl]',
+        'pytest-flake8',
+        # workaround for pytest-flake8 #7
+        'flake8<3dev',
         'pytest>=2.8',
     ] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
     setup_requires=[