diff --git a/doc/source/conf.py b/doc/source/conf.py
index a26e020a0..ba2a55207 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -25,7 +25,7 @@ extensions = [
 master_doc = 'index'
 
 # General information about the project.
-copyright = u'2015, OpenStack Foundation'
+copyright = '2015, OpenStack Foundation'
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
 add_function_parentheses = True
@@ -62,7 +62,7 @@ openstackdocs_bug_tag = ''
 # (source start file, target name, title, author, documentclass
 # [howto/manual]).
 latex_documents = [
-    ('index', 'doc-os-brick.tex', u'OS Brick Documentation',
+    ('index', 'doc-os-brick.tex', 'OS Brick Documentation',
      'Cinder Contributors', 'manual')
 ]
 
diff --git a/os_brick/tests/test_executor.py b/os_brick/tests/test_executor.py
index c42940b3d..63fbfcb31 100644
--- a/os_brick/tests/test_executor.py
+++ b/os_brick/tests/test_executor.py
@@ -48,8 +48,8 @@ class TestExecutor(base.TestCase):
         executor = brick_executor.Executor(root_helper=None)
         exc = self.assertRaises(putils.ProcessExecutionError,
                                 executor._execute)
-        self.assertEqual(u'Espa\xf1a', exc.stdout)
-        self.assertEqual(u'Z\xfcrich', exc.stderr)
+        self.assertEqual('Espa\xf1a', exc.stdout)
+        self.assertEqual('Z\xfcrich', exc.stderr)
 
     @mock.patch('sys.stdin', encoding='UTF-8')
     @mock.patch('os_brick.executor.priv_rootwrap.execute')
@@ -58,8 +58,8 @@ class TestExecutor(base.TestCase):
 
         executor = brick_executor.Executor(root_helper=None)
         stdout, stderr = executor._execute()
-        self.assertEqual(u'Espa\xf1a', stdout)
-        self.assertEqual(u'Z\xfcrich', stderr)
+        self.assertEqual('Espa\xf1a', stdout)
+        self.assertEqual('Z\xfcrich', stderr)
 
     @mock.patch('sys.stdin', encoding='UTF-8')
     @mock.patch('os_brick.executor.priv_rootwrap.execute')
@@ -71,8 +71,8 @@ class TestExecutor(base.TestCase):
         executor = brick_executor.Executor(root_helper=None)
         exc = self.assertRaises(putils.ProcessExecutionError,
                                 executor._execute)
-        self.assertEqual(u'Espa\xf1a', exc.stdout)
-        self.assertEqual(u'Z\xfcrich', exc.stderr)
+        self.assertEqual('Espa\xf1a', exc.stdout)
+        self.assertEqual('Z\xfcrich', exc.stderr)
 
     @mock.patch('sys.stdin', encoding='UTF-8')
     @mock.patch('os_brick.executor.priv_rootwrap.execute')
@@ -82,8 +82,8 @@ class TestExecutor(base.TestCase):
 
         executor = brick_executor.Executor(root_helper=None)
         stdout, stderr = executor._execute()
-        self.assertEqual(u'Espa\xf1a', stdout)
-        self.assertEqual(u'Z\xfcrich', stderr)
+        self.assertEqual('Espa\xf1a', stdout)
+        self.assertEqual('Z\xfcrich', stderr)
 
 
 class TestThread(base.TestCase):
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 6cf7d8abd..475e253dc 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -34,7 +34,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-copyright = u'2015, Cinder Developers'
+copyright = '2015, Cinder Developers'
 
 # Release notes are unversioned, so we don't need to set version and release
 version = ''