diff --git a/fix-gates.txt b/fix-gates.txt
new file mode 100644
index 000000000..e99777049
--- /dev/null
+++ b/fix-gates.txt
@@ -0,0 +1 @@
+httpretty==0.8.6
diff --git a/test-requirements.txt b/test-requirements.txt
index 09201eea9..db0e82518 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,7 +5,6 @@ hacking>=0.9.2,<0.10
 
 coverage>=3.6
 discover
-httpretty>=0.8.4,!=0.8.7,!=0.8.8
 fixtures>=0.3.14
 mock>=1.0
 python-subunit>=0.0.18
diff --git a/tox.ini b/tox.ini
index 6c13da826..b25002d8d 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}/fix-gates.txt
 commands = python setup.py testr --slowest --testr-args='{posargs}'
 
 [testenv:functional]