diff --git a/src/borg/testsuite/archiver/__init__.py b/src/borg/testsuite/archiver/__init__.py
index e140d829d..df50b20d1 100644
--- a/src/borg/testsuite/archiver/__init__.py
+++ b/src/borg/testsuite/archiver/__init__.py
@@ -514,10 +514,12 @@ def fuse_mount(archiver, mountpoint=None, *options, fork=True, os_fork=False, **
             # with the call to `cmd`, above.
             yield
             return
-    wait_for_mountstate(mountpoint, mounted=True)
-    yield
-    umount(mountpoint)
-    wait_for_mountstate(mountpoint, mounted=False)
-    os.rmdir(mountpoint)
+    try:
+        wait_for_mountstate(mountpoint, mounted=True)
+        yield
+    finally:
+        umount(mountpoint)
+        wait_for_mountstate(mountpoint, mounted=False)
+        os.rmdir(mountpoint)
     # Give the daemon some time to exit
     time.sleep(0.2)
diff --git a/src/borg/testsuite/platform/freebsd_test.py b/src/borg/testsuite/platform/freebsd_test.py
index c64c544ee..8d313fd6e 100644
--- a/src/borg/testsuite/platform/freebsd_test.py
+++ b/src/borg/testsuite/platform/freebsd_test.py
@@ -86,11 +86,11 @@ def test_access_acl():
 
 @skipif_acls_not_working
 def test_default_acl():
-    tmpdir = tempfile.mkdtemp()
-    assert get_acl(tmpdir) == {}
-    set_acl(tmpdir, access=ACCESS_ACL, default=DEFAULT_ACL)
-    assert get_acl(tmpdir)["acl_access"] == ACCESS_ACL
-    assert get_acl(tmpdir)["acl_default"] == DEFAULT_ACL
+    with tempfile.TemporaryDirectory() as tmpdir:
+        assert get_acl(tmpdir) == {}
+        set_acl(tmpdir, access=ACCESS_ACL, default=DEFAULT_ACL)
+        assert get_acl(tmpdir)["acl_access"] == ACCESS_ACL
+        assert get_acl(tmpdir)["acl_default"] == DEFAULT_ACL
 
 
 # nfs4 acls testing not implemented.
diff --git a/src/borg/testsuite/platform/linux_test.py b/src/borg/testsuite/platform/linux_test.py
index 605dc35b7..04d5be525 100644
--- a/src/borg/testsuite/platform/linux_test.py
+++ b/src/borg/testsuite/platform/linux_test.py
@@ -72,11 +72,11 @@ def test_access_acl():
 
 @skipif_acls_not_working
 def test_default_acl():
-    tmpdir = tempfile.mkdtemp()
-    assert get_acl(tmpdir) == {}
-    set_acl(tmpdir, access=ACCESS_ACL, default=DEFAULT_ACL)
-    assert get_acl(tmpdir)["acl_access"] == ACCESS_ACL
-    assert get_acl(tmpdir)["acl_default"] == DEFAULT_ACL
+    with tempfile.TemporaryDirectory() as tmpdir:
+        assert get_acl(tmpdir) == {}
+        set_acl(tmpdir, access=ACCESS_ACL, default=DEFAULT_ACL)
+        assert get_acl(tmpdir)["acl_access"] == ACCESS_ACL
+        assert get_acl(tmpdir)["acl_default"] == DEFAULT_ACL
 
 
 @skipif_acls_not_working