=== modified file 'unit_tests/test_glance_contexts.py'
--- unit_tests/test_glance_contexts.py	2015-08-27 11:44:11 +0000
+++ unit_tests/test_glance_contexts.py	2015-09-28 10:57:15 +0000
@@ -89,10 +89,13 @@
         self.assertEquals(ctxt(), {'bind_host': '::',
                                    'registry_host': '[::]'})
 
+    @patch('charmhelpers.contrib.openstack.context.config')
     @patch("subprocess.check_output")
-    def test_glance_ipv6_context_service_disabled(self, mock_subprocess):
+    def test_glance_ipv6_context_service_disabled(self, mock_subprocess,
+                                                  mock_config):
         self.config.return_value = False
+        mock_config.return_value = False
         mock_subprocess.return_value = 'false'
         ctxt = contexts.GlanceIPv6Context()
-        self.assertEquals(ctxt(), {'bind_host': '0.0.0.0',
+        self.assertEquals(ctxt(), {'bind_host': '::',
                                    'registry_host': '0.0.0.0'})