diff --git a/.gitignore b/.gitignore
index faf1fd7..26a7a52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,8 @@ pip-log.txt
 .coverage
 .tox
 nosetests.xml
+coverage.xml
+htmlcov/
 
 # Translations
 *.mo
diff --git a/setup.cfg b/setup.cfg
index 9b6f515..ae55b00 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,3 +15,14 @@ formats = zip
 # If you set this to 1, make sure you have a proper Travis CI build matrix,
 # and that your Trove classifiers state you support Python 2 and 3
 universal = 1
+
+
+[pytest]
+norecursedirs = .* *.egg *.egg-info bin dist include lib local share static docs
+python_files = tests/test_*.py
+#addopts =
+
+
+[flake8]
+#ignore = E226,…
+max-line-length = 132
diff --git a/tox.ini b/tox.ini
index 0e11467..a41e63a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,8 +13,9 @@ setenv =
 commands =
     python test_configobj.py
     python -m configobj.validate
-    coverage run --source=configobj.py,validate.py -m py.test tests
-    coverage report
+    py.test -c {toxinidir}/setup.cfg --color=yes --cov=configobj \
+        --cov-report=term --cov-report=html --cov-report=xml \
+        {posargs}
 
 
 [testenv:flake8]