diff --git a/setup.cfg b/setup.cfg
index 011c2619..5bea5c48 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -29,6 +29,10 @@ setup-hooks =
 packages =
     marconiclient
 
+[nosetests]
+where=tests
+verbosity=2
+
 [build_sphinx]
 source-dir = doc/source
 build-dir = doc/build
diff --git a/tox.ini b/tox.ini
index 9f72e265..904cbf67 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,12 @@
 [tox]
+minversion = 1.6
 envlist = py26,py27,py33,pypy,pep8
+skipsdist = True
 
 [testenv]
+usedevelop = True
+# Customize pip command, add -U to force updates.
+install_command = pip install -U {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
          NOSE_WITH_OPENSTACK=1
          NOSE_OPENSTACK_COLOR=1