diff --git a/cinderclient/utils.py b/cinderclient/utils.py
index c25b5d4cd..6e8712921 100644
--- a/cinderclient/utils.py
+++ b/cinderclient/utils.py
@@ -278,7 +278,7 @@ def slugify(value):
     """
     import unicodedata
     if not isinstance(value, unicode):
-        value = unicode(value)
+        value = six.text_type(value)
     value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore')
-    value = unicode(_slugify_strip_re.sub('', value).strip().lower())
+    value = six.text_type(_slugify_strip_re.sub('', value).strip().lower())
     return _slugify_hyphenate_re.sub('-', value)
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 7abb3d0ef..a89528da8 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -42,8 +42,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'python-cinderclient'
-copyright = u'Rackspace, based on work by Jacob Kaplan-Moss'
+project = 'python-cinderclient'
+copyright = 'Rackspace, based on work by Jacob Kaplan-Moss'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -179,8 +179,8 @@ htmlhelp_basename = 'python-cinderclientdoc'
 # (source start file, target name, title, author, documentclass [howto/manual])
 # .
 latex_documents = [
-    ('index', 'python-cinderclient.tex', u'python-cinderclient Documentation',
-    u'Rackspace - based on work by Jacob Kaplan-Moss', 'manual'),
+    ('index', 'python-cinderclient.tex', 'python-cinderclient Documentation',
+    'Rackspace - based on work by Jacob Kaplan-Moss', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of