diff --git a/doc/source/conf.py b/doc/source/conf.py
index 070fc083..1a6afbc4 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -187,7 +187,7 @@ latex_elements = {
 # (source start file, target name, title, author, documentclass [howto/manual])
 latex_documents = [
     ('index', 'python-heatclient.tex', 'python-heatclient Documentation',
-     u'OpenStack Foundation', 'manual'),
+     'OpenStack Foundation', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -217,8 +217,8 @@ latex_documents = [
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('man/heat', 'heat',
-     u'Command line access to the heat project.',
-     [u'Heat Developers'], 1),
+     'Command line access to the heat project.',
+     ['Heat Developers'], 1),
 ]
 
 # If true, show URL addresses after external links.
@@ -231,8 +231,8 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    ('index', 'Heat', u'Heat Documentation',
-     u'Heat Developers', 'Heat', 'One line description of project.',
+    ('index', 'Heat', 'Heat Documentation',
+     'Heat Developers', 'Heat', 'One line description of project.',
      'Miscellaneous'),
 ]
 
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 175ad70d..e88c5933 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -64,9 +64,9 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Python-heatclient releasenotes'
-copyright = u'2017, Heat team'
-author = u'Heat team'
+project = 'Python-heatclient releasenotes'
+copyright = '2017, Heat team'
+author = 'Heat team'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -146,8 +146,8 @@ latex_elements = {
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
     (master_doc, 'Python-heatclientreleasenotes.tex',
-     u'Python-heatclient releasenotes Documentation',
-     u'Heat team', 'manual'),
+     'Python-heatclient releasenotes Documentation',
+     'Heat team', 'manual'),
 ]
 
 
@@ -157,7 +157,7 @@ latex_documents = [
 # (source start file, name, description, authors, manual section).
 man_pages = [
     (master_doc, 'python-heatclientreleasenotes',
-     u'Python-heatclient releasenotes Documentation',
+     'Python-heatclient releasenotes Documentation',
      [author], 1)
 ]
 
@@ -169,7 +169,7 @@ man_pages = [
 #  dir menu entry, description, category)
 texinfo_documents = [
     (master_doc, 'Python-heatclientreleasenotes',
-     u'Python-heatclient releasenotes Documentation',
+     'Python-heatclient releasenotes Documentation',
      author, 'Python-heatclientreleasenotes',
      'One line description of project.',
      'Miscellaneous'),