diff --git a/setup.cfg b/setup.cfg
index 0a8df87..e6b88b1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,7 @@
 [wheel]
-universal = 1
\ No newline at end of file
+universal = 1
+
+[check-manifest]
+ignore =
+    .coveragerc
+    tests
diff --git a/tox.ini b/tox.ini
index 8e20d47..84f2edf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,18 +1,31 @@
 [tox]
-envlist = py27,py33,py34
+envlist = py27,py33,py34,report,check
 
 [testenv]
-commands = py.test
-deps =
-
-[testenv:py27]
+commands = py.test --cov sigal --cov-report term-missing
 deps =
     pytest
+    pytest-capturelog
+    pytest-cov
 
-[testenv:py33]
-deps =
-    pytest
+[testenv:report]
+basepython = python3.4
+commands =
+    coverage combine
+    coverage report
+usedevelop = true
+deps = coverage
 
-[testenv:py34]
+[testenv:check]
+basepython = python3.4
 deps =
-    pytest
+    docutils
+    check-manifest
+    flake8
+    collective.checkdocs
+    pygments
+usedevelop = true
+commands =
+    python setup.py checkdocs
+    python setup.py check --strict --metadata
+    check-manifest {toxinidir}