diff --git a/test/dub_test_root.sh b/test/dub_test_root.sh
index c5ce710..7c0f50b 100755
--- a/test/dub_test_root.sh
+++ b/test/dub_test_root.sh
@@ -7,12 +7,13 @@
 
 TMPDIR=$(mktemp -d "$(basename "$0").XXXXXX")
 
+pushd "$TMPDIR"
 function cleanup {
+    popd
     rm -rf "$TMPDIR"
 }
 trap cleanup EXIT
 
-cd "$TMPDIR"
 
 echo 'name "foo"' > dub.sdl