diff --git a/designate/storage/impl_sqlalchemy/__init__.py b/designate/storage/impl_sqlalchemy/__init__.py
index 577c63263..8b07b2adf 100644
--- a/designate/storage/impl_sqlalchemy/__init__.py
+++ b/designate/storage/impl_sqlalchemy/__init__.py
@@ -553,7 +553,7 @@ class SQLAlchemyStorage(sqlalchemy_base.SQLAlchemy, storage_base.Storage):
                            marker=None, limit=None, sort_key=None,
                            sort_dir=None):
 
-        return self._find(context, tables.zone_attributes,
+        return self._find(context, tables.zone_masters,
                           objects.ZoneMaster, objects.ZoneMasterList,
                           exceptions.ZoneMasterNotFound, criterion, one,
                           marker, limit, sort_key, sort_dir)
diff --git a/designate/tests/test_api/test_v2/test_zones.py b/designate/tests/test_api/test_v2/test_zones.py
index aa23c2107..3585700bc 100644
--- a/designate/tests/test_api/test_v2/test_zones.py
+++ b/designate/tests/test_api/test_v2/test_zones.py
@@ -558,7 +558,7 @@ class ApiV2ZonesTest(ApiV2TestCase):
         # Create a zone
         fixture = self.get_zone_fixture('SECONDARY', 0)
         fixture['email'] = cfg.CONF['service:central'].managed_resource_email
-        fixture['attributes'] = [{"key": "master", "value": "10.0.0.10"}]
+        fixture['masters'] = [{"host": "10.0.0.10", "port": 53}]
 
         # Create a zone
         zone = self.create_zone(**fixture)
diff --git a/designate/tests/test_central/test_service.py b/designate/tests/test_central/test_service.py
index 3ac22242d..0039399f3 100644
--- a/designate/tests/test_central/test_service.py
+++ b/designate/tests/test_central/test_service.py
@@ -1291,7 +1291,7 @@ class CentralServiceTest(CentralTestCase):
         # Create a zone
         fixture = self.get_zone_fixture('SECONDARY', 0)
         fixture['email'] = cfg.CONF['service:central'].managed_resource_email
-        fixture['attributes'] = [{"key": "master", "value": "10.0.0.10"}]
+        fixture['masters'] = [{"host": "10.0.0.10", "port": 53}]
 
         # Create a zone
         secondary = self.create_zone(**fixture)
@@ -1308,7 +1308,7 @@ class CentralServiceTest(CentralTestCase):
         # Create a zone
         fixture = self.get_zone_fixture('SECONDARY', 0)
         fixture['email'] = cfg.CONF['service:central'].managed_resource_email
-        fixture['attributes'] = [{"key": "master", "value": "10.0.0.10"}]
+        fixture['masters'] = [{"host": "10.0.0.10", "port": 53}]
 
         # Create a zone
         secondary = self.create_zone(**fixture)
@@ -1325,7 +1325,7 @@ class CentralServiceTest(CentralTestCase):
         # Create a zone
         fixture = self.get_zone_fixture('SECONDARY', 0)
         fixture['email'] = cfg.CONF['service:central'].managed_resource_email
-        fixture['attributes'] = [{"key": "master", "value": "10.0.0.10"}]
+        fixture['masters'] = [{"host": "10.0.0.10", "port": 53}]
         fixture['serial'] = 10
 
         # Create a zone