diff --git a/tox.ini b/tox.ini
index cfd19a5ba97..a508d0eab25 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,11 @@
 [tox]
+minversion = 1.6
+skipsdist = True
 envlist = py26,py27,py33,pep8
 
 [testenv]
+usedevelop = True
+install_command = pip install -U {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt