diff --git a/.gitreview b/.gitreview
index bbf8b63..2eb536f 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
host=review.openstack.org
port=29418
project=openstack/charm-neutron-api.git
+defaultbranch=stable/16.04
diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml
index 1caab11..35becf8 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 8d331ba..eadfa2d 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -20,7 +20,7 @@ class NeutronAPIBasicDeployment(OpenStackAmuletDeployment):
"""Amulet tests on a basic neutron-api deployment."""
def __init__(self, series, openstack=None, source=None, git=False,
- stable=False):
+ stable=True):
"""Deploy the entire test environment."""
super(NeutronAPIBasicDeployment, self).__init__(series, openstack,
source, stable)