diff --git a/tox.ini b/tox.ini
index fb483a0462965bb2dab2ac760ead205efc0b3496..51d46d1dc72de2d0c38514c00f4e4bc55efca047 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,6 +20,7 @@ deps =
     six
 commands =
     check-manifest --ignore tox.ini,tests*
+    python setup.py setup.py check --metadata --strict
     flake8 .
     python -m doctest template/filters.py template/__init__.py
     ./tests.sh
@@ -27,7 +28,7 @@ commands =
 [testenv:docs]
 basepython = python
 deps = readme_renderer
-commands = python setup.py check -m -r -s
+commands = python setup.py check --restructuredtext --strict
 
 [testenv:release]
 basepython = python
@@ -38,5 +39,6 @@ deps =
     wheel
 commands =
     sh -c 'git tag "v$(cat VERSION)" && git push --tags'
+    sh -c 'rm -rf dist/'
     python setup.py bdist_wheel
     twine upload --skip-existing dist/*.whl