diff --git a/doc/source/conf.py b/doc/source/conf.py
index dd01295..df05ebb 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -39,8 +39,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Mistral Extra'
-copyright = u'2013, OpenStack Foundation'
+project = 'Mistral Extra'
+copyright = '2013, OpenStack Foundation'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -175,8 +175,8 @@ latex_elements = {
 # (source start file, target name, title, author,
 #  documentclass [howto/manual]).
 latex_documents = [
-    ('index', 'MistralExtra.tex', u'Mistral Extra Documentation',
-     u'OpenStack Foundation', 'manual'),
+    ('index', 'MistralExtra.tex', 'Mistral Extra Documentation',
+     'OpenStack Foundation', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -205,8 +205,8 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'mistral_extra', u'Mistral Extra Documentation',
-     [u'OpenStack Foundation'], 1)
+    ('index', 'mistral_extra', 'Mistral Extra Documentation',
+     ['OpenStack Foundation'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -219,8 +219,8 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    ('index', 'MistralExtra', u'Mistral Extra Documentation',
-     u'OpenStack Foundation', 'MistralExtra',
+    ('index', 'MistralExtra', 'Mistral Extra Documentation',
+     'OpenStack Foundation', 'MistralExtra',
      'One line description of project.', 'Miscellaneous'),
 ]
 
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 8322900..8838362 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -54,8 +54,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'mistral-extra Release Notes'
-copyright = u'2016, OpenStack Foundation'
+project = 'mistral-extra Release Notes'
+copyright = '2016, OpenStack Foundation'
 
 # Release notes are version independent
 
@@ -200,8 +200,8 @@ latex_elements = {
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
     ('index', 'MistralExtraReleaseNotes.tex',
-     u'Mistral Extra Release Notes Documentation', u'Mistral '
-     u'Extra Developers', 'manual'),
+     'Mistral Extra Release Notes Documentation', 'Mistral '
+     'Extra Developers', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -230,8 +230,8 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'mistralextrareleasenotes', u'Mistral Extra Release Notes '
-     u'Documentation', [u'Mistral Extra Developers'], 1)
+    ('index', 'mistralextrareleasenotes', 'Mistral Extra Release Notes '
+     'Documentation', ['Mistral Extra Developers'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -244,8 +244,8 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    ('index', 'MistralExtraReleaseNotes', u'Mistral Library Release Notes '
-     u'Documentation', u'Mistral Extra Developers',
+    ('index', 'MistralExtraReleaseNotes', 'Mistral Library Release Notes '
+     'Documentation', 'Mistral Extra Developers',
      'MistralExtraReleaseNotes', 'One line description of project.',
      'Miscellaneous'),
 ]