diff --git a/cinderclient/client.py b/cinderclient/client.py
index 27171528a..146776ef0 100644
--- a/cinderclient/client.py
+++ b/cinderclient/client.py
@@ -43,10 +43,7 @@ from oslo_utils import strutils
 
 osprofiler_web = importutils.try_import("osprofiler.web")
 
-try:
-    import urlparse
-except ImportError:
-    import urllib.parse as urlparse
+import six.moves.urllib.parse as urlparse
 
 try:
     from eventlet import sleep
diff --git a/cinderclient/tests/unit/v1/fakes.py b/cinderclient/tests/unit/v1/fakes.py
index 35043d2c1..e7659ecb8 100644
--- a/cinderclient/tests/unit/v1/fakes.py
+++ b/cinderclient/tests/unit/v1/fakes.py
@@ -15,10 +15,7 @@
 
 from datetime import datetime
 
-try:
-    import urlparse
-except ImportError:
-    import urllib.parse as urlparse
+import six.moves.urllib.parse as urlparse
 
 from cinderclient import client as base_client
 from cinderclient.tests.unit import fakes
diff --git a/cinderclient/tests/unit/v2/fakes.py b/cinderclient/tests/unit/v2/fakes.py
index b787e2da6..f6c58ed32 100644
--- a/cinderclient/tests/unit/v2/fakes.py
+++ b/cinderclient/tests/unit/v2/fakes.py
@@ -14,10 +14,7 @@
 
 from datetime import datetime
 
-try:
-    import urlparse
-except ImportError:
-    import urllib.parse as urlparse
+import six.moves.urllib.parse as urlparse
 
 from cinderclient import client as base_client
 from cinderclient.tests.unit import fakes