diff --git a/deploy-guide/source/conf.py b/deploy-guide/source/conf.py
index d89fc586cd..8dc09ad12f 100644
--- a/deploy-guide/source/conf.py
+++ b/deploy-guide/source/conf.py
@@ -54,9 +54,9 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Kolla-Ansible'
-bug_tag = u'deploy-guide'
-copyright = u'2016, OpenStack contributors'
+project = 'Kolla-Ansible'
+bug_tag = 'deploy-guide'
+copyright = '2016, OpenStack contributors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -224,8 +224,8 @@ latex_elements = {
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    ('index', 'DeployGuide.tex', u'Deploy Guide',
-     u'OpenStack contributors', 'manual'),
+    ('index', 'DeployGuide.tex', 'Deploy Guide',
+     'OpenStack contributors', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -254,8 +254,8 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'deployguide', u'Deploy Guide',
-     [u'OpenStack contributors'], 1)
+    ('index', 'deployguide', 'Deploy Guide',
+     ['OpenStack contributors'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -268,8 +268,8 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    ('index', 'DeployGuide', u'Deploy Guide',
-     u'OpenStack contributors', 'DeployGuide',
+    ('index', 'DeployGuide', 'Deploy Guide',
+     'OpenStack contributors', 'DeployGuide',
      'This guide shows OpenStack end users how to deploy '
      'an OpenStack cloud.', 'Miscellaneous'),
 ]
@@ -292,8 +292,8 @@ locale_dirs = ['locale/']
 # -- Options for PDF output --------------------------------------------------
 
 pdf_documents = [
-    ('index', u'DeployGuide', u'Deploy Guide',
-     u'OpenStack contributors')
+    ('index', 'DeployGuide', 'Deploy Guide',
+     'OpenStack contributors')
 ]
 
 # -- Options for openstackdocstheme -------------------------------------------
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 3b9a4aa108..bba9906a3f 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -37,8 +37,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'kolla-ansible'
-copyright = u'2013, OpenStack Foundation'
+project = 'kolla-ansible'
+copyright = '2013, OpenStack Foundation'
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
 add_function_parentheses = True
@@ -75,8 +75,8 @@ htmlhelp_basename = '%sdoc' % project
 latex_documents = [
     ('index',
      'doc-%s.tex' % project,
-     u'%s Documentation' % project,
-     u'OpenStack Foundation', 'manual'),
+     '%s Documentation' % project,
+     'OpenStack Foundation', 'manual'),
 ]
 
 # Disable usage of xindy https://bugzilla.redhat.com/show_bug.cgi?id=1643664
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 7076898573..d287c857c1 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -51,8 +51,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Kolla Ansible Release Notes'
-copyright = u'2015-2021, Kolla Ansible developers'
+project = 'Kolla Ansible Release Notes'
+copyright = '2015-2021, Kolla Ansible developers'
 
 # Release notes do not need a version number in the title, they
 # cover multiple releases.
@@ -188,8 +188,8 @@ htmlhelp_basename = 'KollaAnsibleReleaseNotesdoc'
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
     ('index', 'KollaAnsibleReleaseNotes.tex',
-     u'Kolla Ansible Release Notes Documentation',
-     u'Kolla Ansible developers', 'manual'),
+     'Kolla Ansible Release Notes Documentation',
+     'Kolla Ansible developers', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -220,8 +220,8 @@ latex_documents = [
 #  dir menu entry, description, category)
 texinfo_documents = [
     ('index', 'KollaAnsibleReleaseNotes',
-     u'Kolla Ansible Release Notes Documentation',
-     u'Kolla Ansible developers', 'KollaAnsibleReleaseNotes',
+     'Kolla Ansible Release Notes Documentation',
+     'Kolla Ansible developers', 'KollaAnsibleReleaseNotes',
      'Kolla-Ansible deploys OpenStack services and infrastructure components '
      'in Docker containers.', 'Miscellaneous'),
 ]
diff --git a/tests/test_kolla_docker.py b/tests/test_kolla_docker.py
index fb724aad8d..29db3111f4 100644
--- a/tests/test_kolla_docker.py
+++ b/tests/test_kolla_docker.py
@@ -558,8 +558,8 @@ class TestContainer(base.BaseTestCase):
         State = {'Dead': False,
                  'ExitCode': 0,
                  'Pid': 12475,
-                 'StartedAt': u'2016-06-07T11:22:37.66876269Z',
-                 'Status': u'running'}
+                 'StartedAt': '2016-06-07T11:22:37.66876269Z',
+                 'Status': 'running'}
         self.fake_data['container_inspect'].update({'State': State})
         self.dw = get_DockerWorker({'name': 'my_container',
                                     'action': 'get_container_state'})
@@ -865,7 +865,7 @@ class TestVolume(base.BaseTestCase):
         self.fake_data = copy.deepcopy(FAKE_DATA)
         self.volumes = {
             'Volumes':
-            [{'Driver': u'local',
+            [{'Driver': 'local',
               'Labels': None,
               'Mountpoint': '/var/lib/docker/volumes/nova_compute/_data',
               'Name': 'nova_compute'},