1 files changed, 6 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index 9061869f..806e6ed2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,9 @@
 [tox]
-envlist = py26,py27,py31,py32,py33,py34
+envlist = py26,py27,py33,py34,py35,pypy,pypy3
 
 [testenv]
-commands=python setup.py test
+deps=
+	pytest-flake8
+	pytest>=3.0.2
+passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir
+commands=python setup.py test --addopts='-rsx'