diff --git a/magnumclient/openstack/common/apiclient/auth.py b/magnumclient/openstack/common/apiclient/auth.py
index 9bdfdb8..3c08121 100644
--- a/magnumclient/openstack/common/apiclient/auth.py
+++ b/magnumclient/openstack/common/apiclient/auth.py
@@ -67,7 +67,7 @@ def load_auth_system_opts(parser):
     """
     group = parser.add_argument_group("Common auth options")
     BaseAuthPlugin.add_common_opts(group)
-    for name, auth_plugin in six.iteritems(_discovered_plugins):
+    for name, auth_plugin in _discovered_plugins.items():
         group = parser.add_argument_group(
             "Auth-system '%s' options" % name,
             conflict_handler="resolve")
diff --git a/magnumclient/openstack/common/apiclient/base.py b/magnumclient/openstack/common/apiclient/base.py
index f6491b1..3d9987a 100644
--- a/magnumclient/openstack/common/apiclient/base.py
+++ b/magnumclient/openstack/common/apiclient/base.py
@@ -317,7 +317,7 @@ class CrudManager(BaseManager):
 
     def _filter_kwargs(self, kwargs):
         """Drop null values and handle ids."""
-        for key, ref in six.iteritems(kwargs.copy()):
+        for key, ref in kwargs.copy().items():
             if ref is None:
                 kwargs.pop(key)
             else:
@@ -476,7 +476,7 @@ class Resource(object):
         return None
 
     def _add_details(self, info):
-        for (k, v) in six.iteritems(info):
+        for (k, v) in info.items():
             try:
                 setattr(self, k, v)
                 self._info[k] = v
diff --git a/magnumclient/openstack/common/apiclient/exceptions.py b/magnumclient/openstack/common/apiclient/exceptions.py
index 3ce658b..948c7c9 100644
--- a/magnumclient/openstack/common/apiclient/exceptions.py
+++ b/magnumclient/openstack/common/apiclient/exceptions.py
@@ -423,7 +423,7 @@ class HttpVersionNotSupported(HttpServerError):
 # _code_map contains all the classes that have http_status attribute.
 _code_map = dict(
     (getattr(obj, 'http_status', None), obj)
-    for name, obj in six.iteritems(vars(sys.modules[__name__]))
+    for name, obj in vars(sys.modules[__name__]).items()
     if inspect.isclass(obj) and getattr(obj, 'http_status', False)
 )
 
diff --git a/magnumclient/openstack/common/cliutils.py b/magnumclient/openstack/common/cliutils.py
index 1714c11..1f6b5fb 100644
--- a/magnumclient/openstack/common/cliutils.py
+++ b/magnumclient/openstack/common/cliutils.py
@@ -210,7 +210,7 @@ def print_dict(dct, dict_property="Property", wrap=0):
     """
     pt = prettytable.PrettyTable([dict_property, 'Value'])
     pt.align = 'l'
-    for k, v in six.iteritems(dct):
+    for k, v in dct.items():
         # convert dict to str to check length
         if isinstance(v, dict):
             v = six.text_type(keys_and_vals_to_strs(v))