diff --git a/senlinclient/v1/cluster.py b/senlinclient/v1/cluster.py
index 0fbd629..392700b 100644
--- a/senlinclient/v1/cluster.py
+++ b/senlinclient/v1/cluster.py
@@ -997,7 +997,7 @@ class ClusterRun(command.Command):
                                     "network.") % {'node': node_id}
                 return
             else:
-                addresses = list(six.itervalues(addr))[0]
+                addresses = list(addr.values())[0]
 
         # Select the address in the selected network.
         # If the extension is not present, we assume the address to be
diff --git a/senlinclient/v1/shell.py b/senlinclient/v1/shell.py
index 5949832..a552980 100644
--- a/senlinclient/v1/shell.py
+++ b/senlinclient/v1/shell.py
@@ -632,7 +632,7 @@ def _run_script(node_id, addr, net, addr_type, port, user, ipv6, identity_file,
                                  "network.") % {'node': node_id}
             return
         else:
-            addresses = list(six.itervalues(addr))[0]
+            addresses = list(addr.values())[0]
 
     # Select the address in the selected network.
     # If the extension is not present, we assume the address to be floating.