diff --git a/setup.cfg b/setup.cfg
index 5e40900..bdd4dca 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,18 @@
+[pytest]
+addopts=-vs --pep8 --flakes
+timeout=5
+norecursedirs=.tox
+pep8ignore =
+    *.py E128
+    docs/conf.py ALL
+    tests/*.py ALL
+flakes-ignore =
+    docs/conf.py ALL
+    tests/*.py ALL
+
+[flake8]
+ignore = E128
+exclude = .tox,.git,docs/conf.py,tests/*.py
+
 [wheel]
 universal = 1
diff --git a/setup.py b/setup.py
index d955aee..10f825b 100755
--- a/setup.py
+++ b/setup.py
@@ -17,6 +17,8 @@ test_requires = [
     'coverage',
     'pytest',
     'pytest-cov>=1.4',
+    'pytest-flakes',
+    'pytest-pep8',
     'python-coveralls',
 ]