diff --git a/reviewrot/__init__.py b/reviewrot/__init__.py
index af0eaaa..d15ed7a 100644
--- a/reviewrot/__init__.py
+++ b/reviewrot/__init__.py
@@ -400,7 +400,7 @@ def dict_constructor(loader, node):
     #  format the output to print a blank scalar rather than null
     def represent_none(self, _):
         """TODO: docstring goes here."""
-        return self.represent_scalar("tag:yaml.org,2002:null", u"")
+        return self.represent_scalar("tag:yaml.org,2002:null", "")
 
     yaml.add_representer(type(None), represent_none)
 
diff --git a/reviewrot/pagurestack.py b/reviewrot/pagurestack.py
index e322770..a125c9b 100644
--- a/reviewrot/pagurestack.py
+++ b/reviewrot/pagurestack.py
@@ -216,7 +216,7 @@ def _avatar(self, username, ssl_verify=True):
                 "Fallback to construct based on username"
             )
             query = urllib.parse.urlencode(avatar_query)
-            openid = u"http://%s.id.fedoraproject.org/" % username
+            openid = "http://%s.id.fedoraproject.org/" % username
             idx = hashlib.sha256(openid.encode("utf-8")).hexdigest()
             avatar_url = "https://seccdn.libravatar.org/avatar/%s?%s" % (idx, query)
 
diff --git a/test/github_tests/mock_github.py b/test/github_tests/mock_github.py
index c93af77..21b058d 100644
--- a/test/github_tests/mock_github.py
+++ b/test/github_tests/mock_github.py
@@ -35,14 +35,14 @@ class MockValueOlder:
 class MockGithubComments:
     """Mocks Github Comments object."""
 
-    totalCount = int(1)
+    totalCount = int(1)  # noqa: N815
     reversed = [MockValue]
 
 
 class MockGithubCommentsOlder:
     """Mocks Github Comments object."""
 
-    totalCount = int(1)
+    totalCount = int(1)  # noqa: N815
     reversed = [MockValueOlder]
 
 
@@ -51,7 +51,7 @@ class MockGithubCommentsEmpty:
 
     # Simulate the bug from the PyGithub package, where
     # totalCount is non-zero when there are no comments.
-    totalCount = int(2)
+    totalCount = int(2)  # noqa: N815
     reversed = []