diff --git a/neutron/agent/metadata/agent.py b/neutron/agent/metadata/agent.py
index ce275163067..6209ebee82e 100644
--- a/neutron/agent/metadata/agent.py
+++ b/neutron/agent/metadata/agent.py
@@ -20,12 +20,12 @@ import hashlib
 import hmac
 import os
 import socket
-import urlparse
 
 import eventlet
 import httplib2
 from neutronclient.v2_0 import client
 from oslo.config import cfg
+import six.moves.urllib.parse as urlparse
 import webob
 
 from neutron.agent.common import config as agent_conf
diff --git a/neutron/agent/metadata/namespace_proxy.py b/neutron/agent/metadata/namespace_proxy.py
index 9b8bcdddbbe..c6addb8fee0 100644
--- a/neutron/agent/metadata/namespace_proxy.py
+++ b/neutron/agent/metadata/namespace_proxy.py
@@ -18,11 +18,12 @@
 
 import httplib
 import socket
-import urlparse
+
 
 import eventlet
 import httplib2
 from oslo.config import cfg
+import six.moves.urllib.parse as urlparse
 import webob
 
 from neutron.agent.linux import daemon
diff --git a/neutron/api/v2/router.py b/neutron/api/v2/router.py
index 1a4196c5038..f1b5787d9db 100644
--- a/neutron/api/v2/router.py
+++ b/neutron/api/v2/router.py
@@ -13,10 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import urlparse
-
 from oslo.config import cfg
 import routes as routes_mapper
+import six.moves.urllib.parse as urlparse
 import webob
 import webob.dec
 import webob.exc
diff --git a/neutron/plugins/nicira/api_client/request.py b/neutron/plugins/nicira/api_client/request.py
index c54ed1bdfe5..beaf1b4d915 100644
--- a/neutron/plugins/nicira/api_client/request.py
+++ b/neutron/plugins/nicira/api_client/request.py
@@ -24,9 +24,9 @@ import copy
 import httplib
 import logging
 import time
-import urlparse
 
 import six
+import six.moves.urllib.parse as urlparse
 
 from neutron.openstack.common import excutils
 from neutron.plugins.nicira.api_client.common import (
diff --git a/neutron/tests/unit/nicira/fake_nvpapiclient.py b/neutron/tests/unit/nicira/fake_nvpapiclient.py
index 577be6c51fd..a367b246bd4 100644
--- a/neutron/tests/unit/nicira/fake_nvpapiclient.py
+++ b/neutron/tests/unit/nicira/fake_nvpapiclient.py
@@ -15,7 +15,8 @@
 #    under the License.
 
 import json
-import urlparse
+
+import six.moves.urllib.parse as urlparse
 
 from neutron.openstack.common import log as logging
 from neutron.openstack.common import uuidutils
diff --git a/neutron/tests/unit/test_api_v2.py b/neutron/tests/unit/test_api_v2.py
index 61e3eb371a7..1539c52b776 100644
--- a/neutron/tests/unit/test_api_v2.py
+++ b/neutron/tests/unit/test_api_v2.py
@@ -16,10 +16,10 @@
 #    under the License.
 
 import os
-import urlparse
 
 import mock
 from oslo.config import cfg
+import six.moves.urllib.parse as urlparse
 import webob
 from webob import exc
 import webtest