diff --git a/designate/tests/test_zone_manager/test_tasks.py b/designate/tests/test_zone_manager/test_tasks.py
index 865ef581..83805506 100644
--- a/designate/tests/test_zone_manager/test_tasks.py
+++ b/designate/tests/test_zone_manager/test_tasks.py
@@ -32,7 +32,7 @@ class TaskTest(TestCase):
 
     def _enable_tasks(self, tasks):
         self.config(
-            enabled_tasks=",".join(tasks),
+            enabled_tasks=tasks,
             group="service:zone_manager")
 
 
diff --git a/designate/zone_manager/service.py b/designate/zone_manager/service.py
index 28c79eaa..f9365581 100644
--- a/designate/zone_manager/service.py
+++ b/designate/zone_manager/service.py
@@ -43,7 +43,8 @@ class Service(coordination.CoordinationMixin, service.Service):
         self._partitioner.start()
         self._partitioner.watch_partition_change(self._rebalance)
 
-        for task in tasks.PeriodicTask.get_extensions():
+        enabled = CONF['service:zone_manager'].enabled_tasks
+        for task in tasks.PeriodicTask.get_extensions(enabled):
             LOG.debug("Registering task %s" % task)
 
             # Instantiate the task