diff --git a/.gitreview b/.gitreview
index 429807bd..bde2b0f8 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
 host=review.openstack.org
 port=29418
-project=stackforge/cloud-init.git
+project=openstack/cloud-init.git
diff --git a/test-requirements.txt b/test-requirements.txt
index 81b8ddef..a27acde2 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,7 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-httpretty>=0.7.1
+httpretty>=0.7.1,!=0.8.11,!=0.8.12
 mock
 nose
 testtools