diff --git a/src/borg/repository.py b/src/borg/repository.py
index 94fb6f9be..30494ef75 100644
--- a/src/borg/repository.py
+++ b/src/borg/repository.py
@@ -749,7 +749,7 @@ class Repository:
                     try:
                         compact_working_space += self.io.segment_size(segment) - free
                     except FileNotFoundError:
-                        # looks like self.compact is referring to a non-existent segment file, ignore it.
+                        # looks like self.compact is referring to a nonexistent segment file, ignore it.
                         pass
                 logger.debug("check_free_space: Few segments, not requiring a full free segment")
                 compact_working_space = min(compact_working_space, full_segment_size)
diff --git a/src/borg/testsuite/archiver/diff_cmd.py b/src/borg/testsuite/archiver/diff_cmd.py
index d8015f512..91c35a351 100644
--- a/src/borg/testsuite/archiver/diff_cmd.py
+++ b/src/borg/testsuite/archiver/diff_cmd.py
@@ -116,7 +116,7 @@ class ArchiverTestCase(ArchiverTestCaseBase):
             if are_hardlinks_supported():
                 assert "added       2.05 kB input/hardlink_added" in output
 
-            # check if a diff between non-existent and empty new file is found
+            # check if a diff between nonexistent and empty new file is found
             assert "added           0 B input/file_empty_added" in output
 
             # The inode has two links and both of them are deleted. They should
@@ -198,7 +198,7 @@ class ArchiverTestCase(ArchiverTestCaseBase):
             if are_hardlinks_supported():
                 assert {"type": "added", "size": 2048} in get_changes("input/hardlink_added", joutput)
 
-            # check if a diff between non-existent and empty new file is found
+            # check if a diff between nonexistent and empty new file is found
             assert {"type": "added", "size": 0} in get_changes("input/file_empty_added", joutput)
 
             # The inode has two links and both of them are deleted. They should