diff --git a/actions/openstack_upgrade.py b/actions/openstack_upgrade.py
index 6c2fc9b..48b672e 100755
--- a/actions/openstack_upgrade.py
+++ b/actions/openstack_upgrade.py
@@ -7,17 +7,16 @@ from charmhelpers.contrib.openstack.utils import (
     do_action_openstack_upgrade,
 )
 
-from heat_relations import config_changed
+from heat_relations import (
+    config_changed,
+    CONFIGS,
+)
 
 from heat_utils import (
     do_openstack_upgrade,
-    register_configs
 )
 
 
-CONFIGS = register_configs()
-
-
 def openstack_upgrade():
     """Perform action-managed OpenStack upgrade.
 
diff --git a/unit_tests/test_actions_openstack_upgrade.py b/unit_tests/test_actions_openstack_upgrade.py
index c516bc6..39e56b6 100644
--- a/unit_tests/test_actions_openstack_upgrade.py
+++ b/unit_tests/test_actions_openstack_upgrade.py
@@ -13,7 +13,6 @@ from test_utils import (
 TO_PATCH = [
     'config_changed',
     'do_openstack_upgrade',
-    'register_configs',
 ]
 
 
@@ -23,12 +22,13 @@ class TestHeatUpgradeActions(CharmTestCase):
         super(TestHeatUpgradeActions, self).setUp(openstack_upgrade,
                                                     TO_PATCH)
 
+    @patch('charmhelpers.contrib.openstack.utils.juju_log')
     @patch('charmhelpers.contrib.openstack.utils.config')
     @patch('charmhelpers.contrib.openstack.utils.action_set')
     @patch('charmhelpers.contrib.openstack.utils.git_install_requested')
     @patch('charmhelpers.contrib.openstack.utils.openstack_upgrade_available')
     def test_openstack_upgrade_true(self, upgrade_avail, git_requested,
-                                    action_set, config):
+                                    action_set, config, log):
         git_requested.return_value = False
         upgrade_avail.return_value = True
         config.return_value = True
@@ -38,12 +38,13 @@ class TestHeatUpgradeActions(CharmTestCase):
         self.assertTrue(self.do_openstack_upgrade.called)
         self.assertTrue(self.config_changed.called)
 
+    @patch('charmhelpers.contrib.openstack.utils.juju_log')
     @patch('charmhelpers.contrib.openstack.utils.config')
     @patch('charmhelpers.contrib.openstack.utils.action_set')
     @patch('charmhelpers.contrib.openstack.utils.git_install_requested')
     @patch('charmhelpers.contrib.openstack.utils.openstack_upgrade_available')
     def test_openstack_upgrade_false(self, upgrade_avail, git_requested,
-                                     action_set, config):
+                                     action_set, config, log):
         git_requested.return_value = False
         upgrade_avail.return_value = True
         config.return_value = False