diff --git a/tox.ini b/tox.ini
index 254b0915a25b3105a6bb75ddd232614e9618261b..cc0a43b1a49948b20dfa1c0065004bc828c53a0c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,11 +3,11 @@ envlist = py24,py25,py26,py27
 
 [testenv]
 deps=unittest2
-commands=python setup.py test
+commands=unit2 discover
 
 [testenv:py26]
 commands=
-    python setup.py test
+    unit2 discover
     sphinx-build -b doctest docs html
     sphinx-build docs html
 deps = 
@@ -16,7 +16,7 @@ deps =
 
 [testenv:py27]
 commands=
-    python setup.py test
+    unit2 discover
     sphinx-build -b doctest docs html
     sphinx-build docs html
 deps =