diff --git a/tests/checks/cd.fish b/tests/checks/cd.fish
index 3232e11f1..d9eb97cb7 100644
--- a/tests/checks/cd.fish
+++ b/tests/checks/cd.fish
@@ -19,8 +19,8 @@ begin
     cd x
     pwd
 end
-rm -rf $tmp
 cd $oldpwd
+rm -rf $tmp
 
 # Create a test directory to store our stuff.
 set -l base /tmp/cdcomp_test
diff --git a/tests/checks/wildcard.fish b/tests/checks/wildcard.fish
index 2758d6b2e..0384c63de 100644
--- a/tests/checks/wildcard.fish
+++ b/tests/checks/wildcard.fish
@@ -2,6 +2,7 @@
 
 # Ensure that, if variable expansion results in multiple strings
 # and one of them fails a glob, that we don't fail the entire expansion.
+set -l oldpwd (pwd)
 set dir (mktemp -d)
 cd $dir
 mkdir a
@@ -12,4 +13,5 @@ set dirs ./a ./b
 echo $dirs/*.txt
 # CHECK: ./b/file.txt
 
+cd $oldpwd
 rm -Rf $dir