diff --git a/freezer_tempest_plugin/common.py b/freezer_tempest_plugin/common.py
index cfb90ce..0d30d9e 100644
--- a/freezer_tempest_plugin/common.py
+++ b/freezer_tempest_plugin/common.py
@@ -27,7 +27,7 @@ import paramiko
 
 from oslo_serialization import jsonutils as json
 
-from six.moves import range
+# from six.moves import range
 
 FREEZERC = distutils.spawn.find_executable('freezer-agent')
 
diff --git a/freezer_tempest_plugin/services/freezer_api_client.py b/freezer_tempest_plugin/services/freezer_api_client.py
index fd80f6a..9aa0a84 100644
--- a/freezer_tempest_plugin/services/freezer_api_client.py
+++ b/freezer_tempest_plugin/services/freezer_api_client.py
@@ -14,9 +14,10 @@
 
 # import urllib
 
+import urllib.parse
+
 from oslo_log import log
 from oslo_serialization import jsonutils as json
-from six.moves.urllib import parse as urllib
 from tempest import config
 from tempest.lib.common import rest_client
 
@@ -53,7 +54,7 @@ class FreezerApiClient(rest_client.RestClient):
         if backup_id is None:
             uri = '/v2/{0}/backups'.format(self.tenant_id)
             if params:
-                uri += '?%s' % urllib.urlencode(params)
+                uri += '?%s' % urllib.parse.urlencode(params)
         else:
             uri = '/v2/{0}/backups/{1}'.format(self.tenant_id, backup_id)
 
@@ -81,7 +82,8 @@ class FreezerApiClient(rest_client.RestClient):
         if client_id is None:
             uri = '/v2/{0}/clients'.format(self.tenant_id)
             if params:
-                uri += '?%s' % urllib.urlencode(params)
+                uri += '?%s' % urllib.parse.urlencode(params)
+
         else:
             uri = 'v2/{0}/clients/{1}'.format(self.tenant_id, client_id)
 
@@ -106,7 +108,7 @@ class FreezerApiClient(rest_client.RestClient):
         if job_id is None:
             uri = '/v2/{0}/jobs'.format(self.tenant_id)
             if params:
-                uri += '?%s' % urllib.urlencode(params)
+                uri += '?%s' % urllib.parse.urlencode(params)
         else:
             uri = '/v2/{0}/jobs/{1}'.format(self.tenant_id, job_id)
 
@@ -131,7 +133,7 @@ class FreezerApiClient(rest_client.RestClient):
         if action_id is None:
             uri = '/v2/{0}/actions'.format(self.tenant_id)
             if params:
-                uri += '?%s' % urllib.urlencode(params)
+                uri += '?%s' % urllib.parse.urlencode(params)
         else:
             uri = '/v2/{0}/actions/{1}'.format(self.tenant_id, action_id)
 
@@ -169,7 +171,7 @@ class FreezerApiClient(rest_client.RestClient):
         if session_id is None:
             uri = '/v2/{0}/sessions'.format(self.tenant_id)
             if params:
-                uri += '?%s' % urllib.urlencode(params)
+                uri += '?%s' % urllib.parse.urlencode(params)
         else:
             uri = '/v2/{0}/sessions/'.format(self.tenant_id, session_id)
 
diff --git a/requirements.txt b/requirements.txt
index 7ad2f43..d81a36f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,5 +7,4 @@ oslo.serialization>=2.25.0 # Apache-2.0
 oslo.utils>=3.33.0 # Apache-2.0
 oslo.config>=5.2.0 # Apache-2.0
 paramiko>=2.0.0 # LGPLv2.1+
-six>=1.10.0 # MIT
 tempest>=17.1.0 # Apache-2.0