diff --git a/fixgates.txt b/fixgates.txt
new file mode 100644
index 000000000..04e4a64dd
--- /dev/null
+++ b/fixgates.txt
@@ -0,0 +1 @@
+httpretty>=0.8.0,!=0.8.1,!=0.8.2,!=0.8.3,!=0.8.7
diff --git a/test-requirements.txt b/test-requirements.txt
index a23841934..1b9fd7652 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,7 +7,6 @@ coverage>=3.6
 discover
 fixtures>=0.3.14
 mock>=1.0
-httpretty>=0.8.0,!=0.8.1,!=0.8.2,!=0.8.3
 python-subunit>=0.0.18
 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
 oslosphinx>=2.2.0  # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 18b9e18ce..f93d395c3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,6 +10,7 @@ setenv =
    VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
+       -r{toxinidir}/fixgates.txt
 commands = python setup.py testr --slowest --testr-args='{posargs}'
 
 [testenv:pep8]