diff --git a/test/common/testlib.py b/test/common/testlib.py
index 32b74dc9b4ea..00f4428074b7 100644
--- a/test/common/testlib.py
+++ b/test/common/testlib.py
@@ -1540,6 +1540,7 @@ def cleanup_home_dirs():
                         "    done; "
                         "    while fuser --mount /dev/$dev --kill; do sleep 0.1; done; "
                         "    umount /dev/$dev || true; "
+                        "    swapon --show=NAME --noheadings | grep $dev | xargs -r swapoff; "
                         "done; until rmmod scsi_debug; do sleep 0.2; done", stdout=None)
 
         def terminate_sessions():