diff --git a/tools/test-requires b/tools/test-requires
index 66e723b8..251d7868 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -1,7 +1,10 @@
-# This file is managed by openstack-depends
-coverage>=3.6
+# Fix versions for pep8/pyflakes/flake8/hacking
+pep8==1.4.5
+pyflakes==0.7.2
 flake8==2.0
-hacking>=0.5.3,<0.6
+hacking>=0.5.6,<0.6
+
+coverage>=3.6
 mock>=0.8.0
 nose
 openstack.nose_plugin>=0.7
diff --git a/tox.ini b/tox.ini
index ba818807..50f6c13a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,7 @@
 envlist = py26,py27,pep8
 
 [testenv]
+sitepackages = True
 setenv =
     VIRTUAL_ENV={envdir}
     NOSE_WITH_OPENSTACK=1
@@ -20,12 +21,11 @@ commands = nosetests {posargs}
 setenv = NOSE_WITH_COVERAGE=1
 
 [tox:jenkins]
+sitepackages = False
 downloadcache = ~/cache/pip
 
 [testenv:pep8]
-deps =
-    flake8
-    hacking
+sitepackages = False
 commands = flake8
 
 [testenv:venv]