diff --git a/scripts/archivebot.py b/scripts/archivebot.py
index 70cb5465f3..7d9b8838c1 100755
--- a/scripts/archivebot.py
+++ b/scripts/archivebot.py
@@ -1019,7 +1019,7 @@ def signal_handler(signum, frame):
                     pywikibot.info(f'{canceled} done')
                     break
 
-                elif not process_page(pg, *botargs):
+                if not process_page(pg, *botargs):
                     break
 
 
diff --git a/tests/interwikidata_tests.py b/tests/interwikidata_tests.py
index 45ae584920..4780a65fdf 100755
--- a/tests/interwikidata_tests.py
+++ b/tests/interwikidata_tests.py
@@ -31,7 +31,7 @@ def create_item(self):
 
     def try_to_add(self):
         """Prevent adding sitelinks to items."""
-        return None
+        return
 
 
 class TestInterwikidataBot(SiteAttributeTestCase):
diff --git a/tests/tools_deprecate_tests.py b/tests/tools_deprecate_tests.py
index 3d25942ac0..76183959db 100755
--- a/tests/tools_deprecate_tests.py
+++ b/tests/tools_deprecate_tests.py
@@ -144,7 +144,7 @@ def deprecated_func_arg3(foo=None):
 @remove_last_args(['foo', 'bar'])
 def deprecated_all():
     """Test remove_last_args with all args removed."""
-    return None
+    return
 
 
 @remove_last_args(['bar'])
@@ -232,7 +232,7 @@ def deprecated_instance_method_and_arg2(self, foo):
     @remove_last_args(['foo', 'bar'])
     def deprecated_all(self):
         """Deprecating positional parameters."""
-        return None
+        return
 
     @remove_last_args(['bar'])
     def deprecated_all2(self, foo):
diff --git a/tests/utils.py b/tests/utils.py
index 3e5e73fbed..c80e3311b3 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -297,7 +297,7 @@ def is_cached(self, key: str) -> bool:
 
     def is_recognised(self, key):
         """Return None."""
-        return None
+        return
 
     def get_requested_time(self, key):
         """Return False."""