diff --git a/contrib/tempest/tempest/api/share/admin/test_share_servers.py b/contrib/tempest/tempest/api/share/admin/test_share_servers.py
index a182dff39f..7dffde8fc7 100644
--- a/contrib/tempest/tempest/api/share/admin/test_share_servers.py
+++ b/contrib/tempest/tempest/api/share/admin/test_share_servers.py
@@ -15,6 +15,8 @@
 
 import re
 
+import six  # noqa
+
 from tempest.api.share import base
 from tempest import config_share as config
 from tempest import exceptions
@@ -206,8 +208,8 @@ class ShareServersAdminTest(base.BaseSharesAdminTest):
         self.assertIn(int(resp["status"]), test.HTTP_SUCCESS)
         # If details are present they and their values should be only strings
         for k, v in details.iteritems():
-            self.assertTrue(isinstance(k, basestring))
-            self.assertTrue(isinstance(v, basestring))
+            self.assertTrue(isinstance(k, six.string_types))
+            self.assertTrue(isinstance(v, six.string_types))
 
     @test.attr(type=["gate", "smoke", ])
     def test_delete_share_server(self):
diff --git a/manila/api/contrib/types_extra_specs.py b/manila/api/contrib/types_extra_specs.py
index cdfdd6c6df..aaa5bcb457 100644
--- a/manila/api/contrib/types_extra_specs.py
+++ b/manila/api/contrib/types_extra_specs.py
@@ -50,12 +50,13 @@ class VolumeTypeExtraSpecsController(wsgi.Controller):
         # with length in range(1, 256)
         is_valid = True
         for k, v in six.iteritems(extra_specs):
-            if not (isinstance(k, basestring) and len(k) in range(1, 256)):
+            if not (isinstance(k, six.string_types) and
+                    len(k) in range(1, 256)):
                 is_valid = False
                 break
             if isinstance(v, dict):
                 self._verify_extra_specs(v)
-            elif isinstance(v, basestring):
+            elif isinstance(v, six.string_types):
                 if len(v) not in range(1, 256):
                     is_valid = False
                     break
diff --git a/manila/api/xmlutil.py b/manila/api/xmlutil.py
index 8485afd5ee..25947c3626 100644
--- a/manila/api/xmlutil.py
+++ b/manila/api/xmlutil.py
@@ -18,6 +18,7 @@
 import os.path
 
 from lxml import etree
+import six
 
 from manila import utils
 
@@ -205,7 +206,7 @@ class TemplateElement(object):
     def __getitem__(self, idx):
         """Retrieve a child node by index or name."""
 
-        if isinstance(idx, basestring):
+        if isinstance(idx, six.string_types):
             # Allow access by node name
             return self._childmap[idx]
         else:
diff --git a/manila/context.py b/manila/context.py
index b798dbba01..82e8b458c7 100644
--- a/manila/context.py
+++ b/manila/context.py
@@ -22,6 +22,8 @@
 import copy
 import uuid
 
+import six
+
 from manila.openstack.common import local
 from manila.openstack.common import log as logging
 from manila.openstack.common import timeutils
@@ -73,7 +75,7 @@ class RequestContext(object):
         self.remote_address = remote_address
         if not timestamp:
             timestamp = timeutils.utcnow()
-        if isinstance(timestamp, basestring):
+        if isinstance(timestamp, six.string_types):
             timestamp = timeutils.parse_strtime(timestamp)
         self.timestamp = timestamp
         if service_catalog:
diff --git a/manila/quota.py b/manila/quota.py
index 45f6c85725..5466766800 100644
--- a/manila/quota.py
+++ b/manila/quota.py
@@ -736,7 +736,7 @@ class QuotaEngine(object):
             return self.__driver
         if not self._driver_cls:
             self._driver_cls = CONF.quota_driver
-        if isinstance(self._driver_cls, basestring):
+        if isinstance(self._driver_cls, six.string_types):
             self._driver_cls = importutils.import_object(self._driver_cls)
         self.__driver = self._driver_cls
         return self.__driver
diff --git a/manila/tests/fake_utils.py b/manila/tests/fake_utils.py
index 180c3f6ae3..39efd4867d 100644
--- a/manila/tests/fake_utils.py
+++ b/manila/tests/fake_utils.py
@@ -19,6 +19,7 @@
 import re
 
 from eventlet import greenthread
+import six
 
 from manila import exception
 from manila.openstack.common import log as logging
@@ -80,7 +81,7 @@ def fake_execute(*cmd_parts, **kwargs):
             LOG.debug('Faked command matched %s' % fake_replier[0])
             break
 
-    if isinstance(reply_handler, basestring):
+    if isinstance(reply_handler, six.string_types):
         # If the reply handler is a string, return it as stdout
         reply = reply_handler, ''
     else:
diff --git a/tools/conf/extract_opts.py b/tools/conf/extract_opts.py
index 53fa50ed04..ff27dd0316 100644
--- a/tools/conf/extract_opts.py
+++ b/tools/conf/extract_opts.py
@@ -29,6 +29,7 @@ import sys
 import textwrap
 
 from oslo.config import cfg
+import six
 
 from manila.openstack.common import importutils
 
@@ -164,7 +165,7 @@ def _print_opt(opt):
         if opt_default is None:
             print('#%s=<None>' % opt_name)
         elif opt_type == STROPT:
-            assert(isinstance(opt_default, basestring))
+            assert(isinstance(opt_default, six.string_types))
             print('#%s=%s' % (opt_name, _sanitize_default(opt_default)))
         elif opt_type == BOOLOPT:
             assert(isinstance(opt_default, bool))