diff --git a/.gitreview b/.gitreview
index 0eac5a3..3b839a0 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.openstack.org
 port=29418
 project=openstack/charm-ceph-proxy
+defaultbranch=stable/16.07
diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml
index d12f696..5ea0055 100644
--- a/charm-helpers-hooks.yaml
+++ b/charm-helpers-hooks.yaml
@@ -1,4 +1,4 @@
-branch: lp:charm-helpers
+branch: lp:~openstack-charmers/charm-helpers/stable
 destination: hooks/charmhelpers
 include:
     - core
diff --git a/charm-helpers-tests.yaml b/charm-helpers-tests.yaml
index 48b12f6..c469f13 100644
--- a/charm-helpers-tests.yaml
+++ b/charm-helpers-tests.yaml
@@ -1,4 +1,4 @@
-branch: lp:charm-helpers
+branch: lp:~openstack-charmers/charm-helpers/stable
 destination: tests/charmhelpers
 include:
     - contrib.amulet
diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 4cddccf..23d466d 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -18,7 +18,7 @@ u = OpenStackAmuletUtils(DEBUG)
 class CephBasicDeployment(OpenStackAmuletDeployment):
     """Amulet tests on a basic ceph deployment."""
 
-    def __init__(self, series=None, openstack=None, source=None, stable=False):
+    def __init__(self, series=None, openstack=None, source=None, stable=True):
         """Deploy the entire test environment."""
         super(CephBasicDeployment, self).__init__(series, openstack, source,
                                                   stable)