diff --git a/magnum/api/attr_validator.py b/magnum/api/attr_validator.py
index 63a15eb845..d1e64b478e 100644
--- a/magnum/api/attr_validator.py
+++ b/magnum/api/attr_validator.py
@@ -14,7 +14,6 @@
 
 from glanceclient import exc as glance_exception
 from novaclient import exceptions as nova_exception
-import six
 
 from magnum.api import utils as api_utils
 from magnum.common import clients
@@ -87,7 +86,7 @@ def validate_os_resources(context, baymodel_id):
     baymodel = BayModel.get_by_uuid(context, baymodel_id)
     cli = clients.OpenStackClients(context)
 
-    for attr, validate_method in six.iteritems(validators):
+    for attr, validate_method in validators.items():
         if attr in baymodel and baymodel[attr] is not None:
             validate_method(cli, baymodel[attr])
 
diff --git a/magnum/tests/unit/db/test_magnum_service.py b/magnum/tests/unit/db/test_magnum_service.py
index b0cf71cc36..90ee86ce4c 100644
--- a/magnum/tests/unit/db/test_magnum_service.py
+++ b/magnum/tests/unit/db/test_magnum_service.py
@@ -87,7 +87,7 @@ class DbMagnumServiceTestCase(base.DbTestCase):
         res = self.dbapi.get_magnum_service_list(self.context)
         self.assertEqual(1, len(res))
         res = res[0]
-        for k, v in fake_ms_params.iteritems():
+        for k, v in fake_ms_params.items():
             self.assertEqual(res[k], v)
 
         fake_ms_params['binary'] = 'FakeBin1'
@@ -96,5 +96,5 @@ class DbMagnumServiceTestCase(base.DbTestCase):
         res = self.dbapi.get_magnum_service_list(self.context, disabled=True)
         self.assertEqual(1, len(res))
         res = res[0]
-        for k, v in fake_ms_params.iteritems():
+        for k, v in fake_ms_params.items():
             self.assertEqual(res[k], v)