diff --git a/AUTHORS b/AUTHORS
index 190e9d4d..d7a2a8e9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,6 +3,7 @@ Alexander Kuznetsov <akuznetsov@mirantis.com>
 Andrew Lazarev <alazarev@mirantis.com>
 Chad Roberts <croberts@redhat.com>
 Dmitry Mescheryakov <dmescheryakov@mirantis.com>
+James E. Blair <jeblair@openstack.org>
 Jeremy Stanley <fungi@yuggoth.org>
 Matthew Farrellee <matt@redhat.com>
 Nadya Privalova <nprivalova@mirantis.com>
diff --git a/tox.ini b/tox.ini
index 8cc199cf..569a5f51 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,11 @@
 [tox]
+minversion = 1.6
+skipsdist = True
 envlist = py26,py27,pep8
 
 [testenv]
+usedevelop = True
+install_command = pip install -U {opts} {packages}
 setenv =
     VIRTUAL_ENV={envdir}
     NOSE_WITH_OPENSTACK=1