diff --git a/test-requirements.txt b/test-requirements.txt
index 61fb67b..5d70425 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,13 +2,13 @@ coverage>=3.6
 discover
 fixtures>=0.3.14
 hacking>=0.8.0,<0.9
-httpretty>=0.8.0,!=0.8.1,!=0.8.2
 keyring>=2.1,!=3.3
 mock>=1.0
 mox3>=0.7.0
 oauthlib>=0.6
 oslosphinx
 pycrypto>=2.6
+requests-mock>=0.4.0  # Apache-2.0
 sphinx>=1.1.2,!=1.2.0,<1.3
 testrepository>=0.0.18
 testresources>=0.2.4