diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py
index f17eb2c7f54c..60f282cf859e 100644
--- a/nova/api/ec2/__init__.py
+++ b/nova/api/ec2/__init__.py
@@ -18,11 +18,10 @@ Starting point for routing EC2 requests.
 
 """
 
-import urlparse
-
 from eventlet.green import httplib
 from oslo.config import cfg
 import six
+import six.moves.urllib.parse as urlparse
 import webob
 import webob.dec
 import webob.exc
diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index f280701b3d73..7fe58c72f6ad 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -17,9 +17,9 @@ import functools
 import itertools
 import os
 import re
-import urlparse
 
 from oslo.config import cfg
+import six.moves.urllib.parse as urlparse
 import webob
 from webob import exc
 
diff --git a/nova/api/openstack/compute/contrib/quotas.py b/nova/api/openstack/compute/contrib/quotas.py
index b3478551032c..886f2e52ab31 100644
--- a/nova/api/openstack/compute/contrib/quotas.py
+++ b/nova/api/openstack/compute/contrib/quotas.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import urlparse
+import six.moves.urllib.parse as urlparse
 import webob
 
 from nova.api.openstack import extensions
diff --git a/nova/api/openstack/compute/contrib/simple_tenant_usage.py b/nova/api/openstack/compute/contrib/simple_tenant_usage.py
index 2bc76c7c3af0..39f733898357 100644
--- a/nova/api/openstack/compute/contrib/simple_tenant_usage.py
+++ b/nova/api/openstack/compute/contrib/simple_tenant_usage.py
@@ -14,9 +14,9 @@
 #    under the License.
 
 import datetime
-import urlparse
 
 import iso8601
+import six.moves.urllib.parse as urlparse
 from webob import exc
 
 from nova.api.openstack import extensions
diff --git a/nova/api/openstack/compute/plugins/v3/quota_sets.py b/nova/api/openstack/compute/plugins/v3/quota_sets.py
index e38ae58dac9e..912c31c249a5 100644
--- a/nova/api/openstack/compute/plugins/v3/quota_sets.py
+++ b/nova/api/openstack/compute/plugins/v3/quota_sets.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import urlparse
+import six.moves.urllib.parse as urlparse
 import webob
 
 from nova.api.openstack import extensions
diff --git a/nova/image/glance.py b/nova/image/glance.py
index b5c894405c98..986394c47684 100644
--- a/nova/image/glance.py
+++ b/nova/image/glance.py
@@ -23,12 +23,12 @@ import json
 import random
 import sys
 import time
-import urlparse
 
 import glanceclient
 import glanceclient.exc
 from oslo.config import cfg
 import six
+import six.moves.urllib.parse as urlparse
 
 from nova import exception
 import nova.image.download as image_xfers
diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_flavors.py b/nova/tests/api/openstack/compute/plugins/v3/test_flavors.py
index 92758ca953b8..16f992ba4930 100644
--- a/nova/tests/api/openstack/compute/plugins/v3/test_flavors.py
+++ b/nova/tests/api/openstack/compute/plugins/v3/test_flavors.py
@@ -13,10 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import six.moves.urllib.parse as urlparse
 import webob
 
-import urlparse
-
 from nova.api.openstack.compute.plugins.v3 import flavors
 from nova.openstack.common import jsonutils
 
diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_servers.py b/nova/tests/api/openstack/compute/plugins/v3/test_servers.py
index 3e19bd3679d1..cc1a5dd1dc0f 100644
--- a/nova/tests/api/openstack/compute/plugins/v3/test_servers.py
+++ b/nova/tests/api/openstack/compute/plugins/v3/test_servers.py
@@ -18,11 +18,11 @@ import base64
 import datetime
 import mox
 import testtools
-import urlparse
 import uuid
 
 import iso8601
 from oslo.config import cfg
+import six.moves.urllib.parse as urlparse
 import webob
 
 from nova.api.openstack import compute
diff --git a/nova/tests/api/openstack/compute/test_flavors.py b/nova/tests/api/openstack/compute/test_flavors.py
index ec1f371ee593..427b31dd92b1 100644
--- a/nova/tests/api/openstack/compute/test_flavors.py
+++ b/nova/tests/api/openstack/compute/test_flavors.py
@@ -14,10 +14,9 @@
 #    under the License.
 
 from lxml import etree
+import six.moves.urllib.parse as urlparse
 import webob
 
-import urlparse
-
 from nova.api.openstack.compute import flavors
 from nova.api.openstack import xmlutil
 import nova.compute.flavors
diff --git a/nova/tests/api/openstack/compute/test_images.py b/nova/tests/api/openstack/compute/test_images.py
index a5cdea40b904..d5a97b78fbbc 100644
--- a/nova/tests/api/openstack/compute/test_images.py
+++ b/nova/tests/api/openstack/compute/test_images.py
@@ -19,9 +19,9 @@ and as a WSGI layer
 """
 
 import copy
-import urlparse
 
 from lxml import etree
+import six.moves.urllib.parse as urlparse
 import webob
 
 from nova.api.openstack.compute import images
diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py
index 22dc9d41030a..33271bd6c40d 100644
--- a/nova/tests/api/openstack/compute/test_servers.py
+++ b/nova/tests/api/openstack/compute/test_servers.py
@@ -18,13 +18,13 @@
 import base64
 import datetime
 import testtools
-import urlparse
 import uuid
 
 import iso8601
 from lxml import etree
 import mox
 from oslo.config import cfg
+import six.moves.urllib.parse as urlparse
 import webob
 
 from nova.api.openstack import compute
diff --git a/nova/tests/db/test_migrations.py b/nova/tests/db/test_migrations.py
index a6a63d789f01..4f6be86bcd87 100644
--- a/nova/tests/db/test_migrations.py
+++ b/nova/tests/db/test_migrations.py
@@ -44,9 +44,9 @@ postgres=# create database openstack_baremetal_citest with owner
 import ConfigParser
 import glob
 import os
-import urlparse
 
 from migrate.versioning import repository
+import six.moves.urllib.parse as urlparse
 import sqlalchemy
 import sqlalchemy.exc
 
diff --git a/nova/tests/integrated/api/client.py b/nova/tests/integrated/api/client.py
index 71369f9331a4..c9cd43929623 100644
--- a/nova/tests/integrated/api/client.py
+++ b/nova/tests/integrated/api/client.py
@@ -14,7 +14,8 @@
 
 import httplib
 import urllib
-import urlparse
+
+import six.moves.urllib.parse as urlparse
 
 from nova.openstack.common.gettextutils import _
 from nova.openstack.common import jsonutils
diff --git a/nova/tests/test_cinder.py b/nova/tests/test_cinder.py
index 1e3966d174ee..7e5a23437c16 100644
--- a/nova/tests/test_cinder.py
+++ b/nova/tests/test_cinder.py
@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import urlparse
+import six.moves.urllib.parse as urlparse
 
 from cinderclient import exceptions as cinder_exception
 from nova import context
diff --git a/nova/virt/libvirt/volume.py b/nova/virt/libvirt/volume.py
index da8b36416794..40893b5a93f0 100644
--- a/nova/virt/libvirt/volume.py
+++ b/nova/virt/libvirt/volume.py
@@ -20,10 +20,10 @@ import glob
 import os
 import time
 import urllib2
-import urlparse
 
 from oslo.config import cfg
 import six
+import six.moves.urllib.parse as urlparse
 
 from nova import exception
 from nova.openstack.common.gettextutils import _
diff --git a/nova/virt/vmwareapi/read_write_util.py b/nova/virt/vmwareapi/read_write_util.py
index 5812aed2c52d..e8b64236b0a3 100644
--- a/nova/virt/vmwareapi/read_write_util.py
+++ b/nova/virt/vmwareapi/read_write_util.py
@@ -23,7 +23,8 @@ Collection of classes to handle image upload/download to/from Image service
 import httplib
 import urllib
 import urllib2
-import urlparse
+
+import six.moves.urllib.parse as urlparse
 
 from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
diff --git a/nova/virt/xenapi/driver.py b/nova/virt/xenapi/driver.py
index b605d02bc173..512cdbd14165 100644
--- a/nova/virt/xenapi/driver.py
+++ b/nova/virt/xenapi/driver.py
@@ -36,9 +36,9 @@ A driver for XenServer or Xen Cloud Platform.
 """
 
 import math
-import urlparse
 
 from oslo.config import cfg
+import six.moves.urllib.parse as urlparse
 
 from nova.openstack.common.gettextutils import _
 from nova.openstack.common import jsonutils
diff --git a/nova/virt/xenapi/image/bittorrent.py b/nova/virt/xenapi/image/bittorrent.py
index 18cdeff204ea..48b5a8c40cc1 100644
--- a/nova/virt/xenapi/image/bittorrent.py
+++ b/nova/virt/xenapi/image/bittorrent.py
@@ -14,9 +14,9 @@
 #    under the License.
 
 import pkg_resources
-import urlparse
 
 from oslo.config import cfg
+import six.moves.urllib.parse as urlparse
 
 from nova.openstack.common.gettextutils import _
 import nova.openstack.common.log as logging
diff --git a/nova/virt/xenapi/pool.py b/nova/virt/xenapi/pool.py
index 490675579462..cde596bfd155 100644
--- a/nova/virt/xenapi/pool.py
+++ b/nova/virt/xenapi/pool.py
@@ -17,9 +17,8 @@
 Management class for Pool-related functions (join, eject, etc).
 """
 
-import urlparse
-
 from oslo.config import cfg
+import six.moves.urllib.parse as urlparse
 
 from nova.compute import rpcapi as compute_rpcapi
 from nova import exception
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index ff48daa60326..3538da438973 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -23,12 +23,12 @@ import contextlib
 import os
 import time
 import urllib
-import urlparse
 import uuid
 from xml.parsers import expat
 
 from eventlet import greenthread
 from oslo.config import cfg
+import six.moves.urllib.parse as urlparse
 
 from nova.api.metadata import base as instance_metadata
 from nova import block_device