diff --git a/manilaclient/common/httpclient.py b/manilaclient/common/httpclient.py
index 2ed2f2d05..7d232ac3f 100644
--- a/manilaclient/common/httpclient.py
+++ b/manilaclient/common/httpclient.py
@@ -18,13 +18,13 @@
 
 import copy
 import logging
+from urllib import parse
 
 from oslo_serialization import jsonutils
 from oslo_utils import strutils
 import re
 import requests
 import six
-from six.moves.urllib import parse
 
 from manilaclient import exceptions
 
diff --git a/manilaclient/tests/unit/v2/fake_clients.py b/manilaclient/tests/unit/v2/fake_clients.py
index b07624297..d6f7141ed 100644
--- a/manilaclient/tests/unit/v2/fake_clients.py
+++ b/manilaclient/tests/unit/v2/fake_clients.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from six.moves.urllib import parse
+from urllib import parse
 
 from manilaclient import api_versions
 from manilaclient.common import httpclient
diff --git a/manilaclient/utils.py b/manilaclient/utils.py
index 69eebc627..cfd8e9a5f 100644
--- a/manilaclient/utils.py
+++ b/manilaclient/utils.py
@@ -10,8 +10,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from urllib import parse
+
 import six
-from six.moves.urllib import parse
 
 
 class HookableMixin(object):