diff --git a/tox.ini b/tox.ini
index 1644ad960b..f86e71b9a9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,12 @@
 [tox]
 envlist = py26,py27,py33,pep8
+minversion = 1.6
+skipsdist = True
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
+usedevelop = True
+install_command = pip install -U {opts} {packages}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
        setuptools_git>=0.4