diff --git a/tox.ini b/tox.ini
index bea0b49f..f77bad83 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,12 @@
 [tox]
 envlist = py26,py27,pypy,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
 commands = python setup.py testr --slowest --testr-args='{posargs}'