diff --git a/tests/misc-tests/029-send-p-different-mountpoints/test.sh b/tests/misc-tests/029-send-p-different-mountpoints/test.sh
index 5a5ec159..e092f8bb 100755
--- a/tests/misc-tests/029-send-p-different-mountpoints/test.sh
+++ b/tests/misc-tests/029-send-p-different-mountpoints/test.sh
@@ -11,28 +11,28 @@ setup_root_helper
 prepare_test_dev
 
 # we need two mount points, cannot nest the subvolume under TEST_MNT
-SUBVOL_MNT="$TEST_MNT/subvol"
-TOPLEVEL_MNT="$TEST_MNT/toplevel"
-TEST_MNT="$TOPLEVEL_MNT"
-run_check $SUDO_HELPER mkdir -p "$TOPLEVEL_MNT" "$SUBVOL_MNT"
+SUBVOL_MNT="`pwd`/subvol_mnt"
+# the 2nd mount directory is created here, add a fallback in case we're on NFS
+run_mayfail $SUDO_HELPER mkdir -p "$SUBVOL_MNT" ||
+	run_check mkdir -p "$SUBVOL_MNT"
 
 run_check_mkfs_test_dev
 run_check_mount_test_dev
 
-run_check $SUDO_HELPER "$TOP/btrfs" subvolume create "$TOPLEVEL_MNT/subv1"
+run_check $SUDO_HELPER "$TOP/btrfs" subvolume create "$TEST_MNT/subv1"
 run_check $SUDO_HELPER mount -t btrfs -o subvol=subv1 "$TEST_DEV" "$SUBVOL_MNT"
 
-run_check $SUDO_HELPER "$TOP/btrfs" subvolume create "$TOPLEVEL_MNT/test-subvol"
+run_check $SUDO_HELPER "$TOP/btrfs" subvolume create "$TEST_MNT/test-subvol"
 run_check $SUDO_HELPER "$TOP/btrfs" subvolume snapshot -r \
-	"$TOPLEVEL_MNT/test-subvol" "$SUBVOL_MNT/test-subvol-mnt-subvol"
+	"$TEST_MNT/test-subvol" "$SUBVOL_MNT/test-subvol-mnt-subvol"
 run_check $SUDO_HELPER "$TOP/btrfs" subvolume snapshot -r \
-	"$TOPLEVEL_MNT/test-subvol" "$TOPLEVEL_MNT/test-subvol-mnt-root"
+	"$TEST_MNT/test-subvol" "$TEST_MNT/test-subvol-mnt-root"
 
 run_mustfail_stdout "send -p on 2 mount points" \
 	$SUDO_HELPER "$TOP/btrfs" send -f /dev/null -p \
-	"$SUBVOL_MNT/test-subvol-mnt-subvol" "$TOPLEVEL_MNT/test-subvol-mnt-root" \
+	"$SUBVOL_MNT/test-subvol-mnt-subvol" "$TEST_MNT/test-subvol-mnt-root" \
 	| _log_stdout \
-	| grep -q "not on mount point.*/toplevel" \
+	| grep -q "not on mount point: .*/mnt" \
 	|| _fail "expected output not found, please check the logs"
 
 # without a fix, this leads to a corrupted path, with something like:
@@ -45,7 +45,7 @@ run_mustfail_stdout "send -p on 2 mount points" \
 # ERROR: not on mount point: .../tests/mnt/toplevel
 
 run_check_umount_test_dev "$SUBVOL_MNT"
-run_check_umount_test_dev "$TOPLEVEL_MNT"
+run_check_umount_test_dev "$TEST_MNT"
 
-run_check $SUDO_HELPER rmdir "$SUBVOL_MNT"
-run_check $SUDO_HELPER rmdir "$TOPLEVEL_MNT"
+run_mayfail $SUDO_HELPER rmdir "$SUBVOL_MNT"
+run_mayfail rmdir "$SUBVOL_MNT"