diff --git a/hooks/quantum_hooks.py b/hooks/quantum_hooks.py
index 08da83a1..af048362 100755
--- a/hooks/quantum_hooks.py
+++ b/hooks/quantum_hooks.py
@@ -47,7 +47,7 @@ from quantum_utils import (
     stop_services
 )
 
-hooks = Hooks(config_save=False)
+hooks = Hooks()
 CONFIGS = register_configs()
 
 
diff --git a/unit_tests/test_quantum_hooks.py b/unit_tests/test_quantum_hooks.py
index 1ed438c5..22ac6e17 100644
--- a/unit_tests/test_quantum_hooks.py
+++ b/unit_tests/test_quantum_hooks.py
@@ -57,6 +57,7 @@ class TestQuantumHooks(CharmTestCase):
         self.lsb_release.return_value = {'DISTRIB_CODENAME': 'precise'}
         self.b64decode.side_effect = passthrough
         hookenv.config.side_effect = self.test_config.get
+        hooks.hooks._config_save = False
 
     def _call_hook(self, hookname):
         hooks.hooks.execute([