diff --git a/.flake8 b/.flake8
new file mode 100644
index 00000000..e9955e71
--- /dev/null
+++ b/.flake8
@@ -0,0 +1,2 @@
+[flake8]
+ignore = W191,W503
diff --git a/pytest.ini b/pytest.ini
index 1b2f6247..0ba22c33 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,4 +1,4 @@
 [pytest]
 norecursedirs=dist build .tox .eggs
-addopts=--doctest-modules
+addopts=--doctest-modules --flake8
 doctest_optionflags=ALLOW_UNICODE ELLIPSIS
diff --git a/setup.py b/setup.py
index 9e73e231..c5ad4b1b 100644
--- a/setup.py
+++ b/setup.py
@@ -36,14 +36,21 @@
 	],
 	extras_require={
 		'testing': [
+			# upstream
 			'pytest>=2.8',
 			'pytest-sugar>=0.9.1',
 			'collective.checkdocs',
+			'pytest-flake8',
+
+			# local
 		],
 		'docs': [
+			# upstream
 			'sphinx',
 			'jaraco.packaging>=3.2',
 			'rst.linker>=1.9',
+
+			# local
 		],
 	},
 	setup_requires=[