1 files changed, 11 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 92bcb75b..c0a9738f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,pypy,py32,py33,docs,pep8
+envlist = py26,py27,pypy,py32,py33,docs,pep8,py3pep8
 
 [testenv]
 deps =
@@ -18,9 +18,19 @@ commands =
     sphinx-build -W -b doctest -d {envtmpdir}/doctrees docs docs/_build/html
     sphinx-build -W -b linkcheck docs docs/_build/html
 
+# Temporarily disable coverage on pypy because of performance problems with
+# coverage.py on pypy.
+[testenv:pypy]
+commands = py.test
+
 [testenv:pep8]
 deps = flake8
 commands = flake8 .
 
+[testenv:py3pep8]
+basepython = python3.3
+deps = flake8
+commands = flake8 .
+
 [flake8]
 exclude = .tox,*.egg