diff --git a/.gitreview b/.gitreview
index 8043986..4299817 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,5 @@
 host=review.openstack.org
 port=29418
 project=openstack/charm-nova-compute-proxy.git
+
+defaultbranch=stable/17.11
diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml
index cccaedf..b6a022e 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/17.11
 destination: hooks/charmhelpers
 include:
     - cli
diff --git a/charm-helpers-tests.yaml b/charm-helpers-tests.yaml
index cabe7b0..6506484 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/17.11
 destination: tests/charmhelpers
 include:
     - fetch
diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 8e5d30f..37101f8 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -54,7 +54,7 @@ class NovaBasicDeployment(OpenStackAmuletDeployment):
     """Amulet tests on a basic nova compute proxy deployment."""
 
     def __init__(self, series=None, openstack=None, source=None,
-                 git=False, stable=False):
+                 git=False, stable=True):
         """Deploy the entire test environment."""
         super(NovaBasicDeployment, self).__init__(series, openstack,
                                                   source, stable)