diff --git a/tox.ini b/tox.ini
index 8f6e5365..07ed14b9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,21 +7,15 @@
 
 [tox]
 envlist = py26, py27, py34, pypy
-usedevelop = True
-skipsdist = True
 
 
 [testenv]
-
-whitelist_externals =
-    py.test
+deps =
+    pytest
+    pytest-xdist
 
 commands =
     py.test --doctest-modules \
             --basetemp={envtmpdir} \
             -n 8 \
             {posargs:./tests ./httpie}
-
-[testenv:py26]
-deps =
-    argparse