diff --git a/tools/test-options b/tools/test-options
deleted file mode 100644
index c7a2347407..0000000000
--- a/tools/test-options
+++ /dev/null
@@ -1 +0,0 @@
-MySQL-python
diff --git a/tools/test-requires b/tools/test-requires
index 5592cada8c..74910be0d3 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -12,3 +12,4 @@ pylint==0.25.2
 sphinx>=1.1.2
 feedparser
 python-cinderclient
+MySQL-python
diff --git a/tox.ini b/tox.ini
index 4212d05ce3..dc46b5fb4f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,6 +18,7 @@ deps = -r{toxinidir}/tools/pip-requires
 commands = nosetests {posargs}
 
 [tox:jenkins]
+sitepackages = True
 downloadcache = ~/cache/pip
 
 [testenv:pep8]
@@ -37,9 +38,3 @@ setenv = NOSE_WITH_COVERAGE=1
 
 [testenv:venv]
 commands = {posargs}
-
-[testenv:full]
-sitepackages = True
-deps = -r{toxinidir}/tools/pip-requires
-       -r{toxinidir}/tools/test-requires
-       -r{toxinidir}/tools/test-options