diff --git a/tox.ini b/tox.ini
index 4f123c1b..fa6d0b4c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,14 +1,11 @@
 [tox]
 envlist = py27, py33
-skipsdist = True
 usedevelop = True
+sitepackages = False
 
 [testenv]
 whitelist_externals = sh
-commands =
- python setup.py develop
- gmg dbupdate
- sh runtests.sh
+commands = py.test ./mediagoblin/tests --boxed
 deps =
  git+https://github.com/ianare/exif-py.git@develop
  lxml