diff --git a/.gitreview b/.gitreview
index 5e7b91a24ec805a58ef46c9f363dc5b70ee5c6bb..e762b57b475223106c61aca0b4bd0fa41be8a707 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,4 +3,4 @@ host=review.opendev.org
 port=29418
 project=openstack/charm-ceilometer.git
 
-defaultbranch=stable/19.04
+defaultbranch=stable/18.11
diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml
index 1209637b8de417d4d75ecf88f70a15ed8fb2ccea..6af571dd8f9e9b75698a8f9d6686020ee541aa1e 100644
--- a/charm-helpers-hooks.yaml
+++ b/charm-helpers-hooks.yaml
@@ -1,5 +1,5 @@
-repo: https://github.com/juju/charm-helpers@stable/19.04
-destination: charmhelpers
+repo: https://github.com/juju/charm-helpers@stable/18.11
+destination: hooks/charmhelpers
 include:
     - core
     - osplatform
diff --git a/unit_tests/test_ceilometer_utils.py b/unit_tests/test_ceilometer_utils.py
index 7f8723cdb8943c01f2ca7e550d3885265e9c5aa8..a1b10d0cd05fb361cc6f2a6ed41889bafbc2ab2a 100644
--- a/unit_tests/test_ceilometer_utils.py
+++ b/unit_tests/test_ceilometer_utils.py
@@ -367,7 +367,8 @@ class CeilometerUtilsTest(CharmTestCase):
         self.is_leader.return_value = True
         self.os_release.return_value = 'ocata'
         utils.ceilometer_upgrade()
-        mock_subprocess.check_call.assert_called_with(['ceilometer-upgrade', '--skip-metering-database'])
+        mock_subprocess.check_call.assert_called_with(
+            ['ceilometer-upgrade', '--skip-metering-database'])
 
     @patch.object(utils, 'subprocess')
     def test_ceilometer_upgrade_mitaka(self, mock_subprocess):