fs/test.sh | 14 ++++++++------

diff --git a/fs/test.sh b/fs/test.sh
index e969f5fe9b210bdfa43394800167f589dd86f4a8..e174f9cb6ca8744f537372eaaff6a3b25322c1d0 100755
--- a/fs/test.sh
+++ b/fs/test.sh
@@ -1,15 +1,17 @@
+set -ex
 repopath=$(cd $(dirname $0)/..; pwd)
+d=$(mktemp -d)
+pushd "$d"
 mkdir mnt torrents
-umount mnt
-set -e
 GOPPROF=http godo github.com/anacrolix/torrent/cmd/torrentfs -mountDir=mnt -metainfoDir=torrents &
-cd torrents
+trap 'set +e; sudo umount -f mnt; pushd; rm -rv "$d"' EXIT
+pushd torrents
 cp "$repopath"/testdata/debian-9.1.0-amd64-netinst.iso.torrent .
 echo 'magnet:?xt=urn:btih:6a9759bffd5c0af65319979fb7832189f4f3c35d&dn=sintel.mp4' > sintel.magnet
-cd ..
+popd
 file=debian-9.1.0-amd64-netinst.iso
 # file=sintel.mp4
 while [ ! -e "mnt/$file" ]; do sleep 1; done
 pv "mnt/$file" | md5sum
-sudo umount mnt
-wait
+umount mnt
+wait || echo "wait returned" $?