diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml
index 6bb1866f..eebce9e6 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 48b12f6f..c469f130 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 76cc8328..6b12ff7d 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -21,7 +21,7 @@ u = OpenStackAmuletUtils(DEBUG)
 class KeystoneBasicDeployment(OpenStackAmuletDeployment):
     """Amulet tests on a basic keystone deployment."""
 
-    def __init__(self, series=None, openstack=None, source=None, git=False, stable=False):
+    def __init__(self, series=None, openstack=None, source=None, git=False, stable=True):
         """Deploy the entire test environment."""
         super(KeystoneBasicDeployment, self).__init__(series, openstack, source, stable)
         self.git = git