diff --git a/test/lib/test-lib.sh b/test/lib/test-lib.sh
index ea91742f0..968627be5 100644
--- a/test/lib/test-lib.sh
+++ b/test/lib/test-lib.sh
@@ -96,7 +96,10 @@ test_launch_ipfs_daemon() {
 
 test_mount_ipfs() {
 
+	# make sure stuff is unmounted first.
 	test_expect_success FUSE "'ipfs mount' succeeds" '
+		umount $(pwd)/ipfs || true &&
+		umount $(pwd)/ipns || true &&
 		ipfs mount >actual
 	'