diff --git a/.gitreview b/.gitreview
index 2ae2776..f8f8d88 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,5 @@
 host=review.openstack.org
 port=29418
 project=openstack/charm-swift-proxy.git
+
+defaultbranch=stable/18.02
diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml
index cf44c5f..fff5d72 100644
--- a/charm-helpers-hooks.yaml
+++ b/charm-helpers-hooks.yaml
@@ -1,4 +1,4 @@
-repo: https://github.com/juju/charm-helpers
+repo: https://github.com/juju/charm-helpers@stable/18.02
 destination: charmhelpers
 include:
     - core
diff --git a/charm-helpers-tests.yaml b/charm-helpers-tests.yaml
index cabe7b0..7a83f91 100644
--- a/charm-helpers-tests.yaml
+++ b/charm-helpers-tests.yaml
@@ -1,4 +1,4 @@
-repo: https://github.com/juju/charm-helpers
+repo: https://github.com/juju/charm-helpers@stable/18.02
 destination: tests/charmhelpers
 include:
     - fetch
diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index a091024..501b24a 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -33,7 +33,7 @@ u = OpenStackAmuletUtils(DEBUG)
 class SwiftProxyBasicDeployment(OpenStackAmuletDeployment):
     """Amulet tests on a basic swift-proxy deployment."""
 
-    def __init__(self, series, openstack=None, source=None, stable=False):
+    def __init__(self, series, openstack=None, source=None, stable=True):
         """Deploy the entire test environment."""
         super(SwiftProxyBasicDeployment, self).__init__(series, openstack,
                                                         source, stable)