diff --git a/tests/checks/features-qmark1.fish b/tests/checks/features-qmark1.fish
index 89ad81575..73a244331 100644
--- a/tests/checks/features-qmark1.fish
+++ b/tests/checks/features-qmark1.fish
@@ -1,2 +1,2 @@
-#RUN: env HOME="$(mktemp -d)" XDG_CONFIG_HOME="$(mktemp -d)" %fish --features '' -c 'string match --quiet "??" ab ; echo "qmarkon: $status"'
+#RUN: env %fish --features '' -c 'string match --quiet "??" ab ; echo "qmarkon: $status"'
 #CHECK: qmarkon: 0
diff --git a/tests/checks/set.fish b/tests/checks/set.fish
index 08681beb9..fa1288934 100644
--- a/tests/checks/set.fish
+++ b/tests/checks/set.fish
@@ -1,4 +1,4 @@
-# RUN: env XDG_CONFIG_HOME="$(mktemp -d)" FISH=%fish %fish %s
+# RUN: env FISH=%fish %fish %s
 # Environment variable tests
 
 # Test if variables can be properly set
@@ -476,7 +476,7 @@ echo "global-vs-universal 4: $__fish_test_global_vs_universal"
 
 set -e -U __fish_test_global_vs_universal
 echo "global-vs-universal 5: $__fish_test_global_vs_universal"
-# CHECK: global-vs-universal 5: 
+# CHECK: global-vs-universal 5:
 
 # Export local variables from all parent scopes (issue #6153).
 function func
@@ -711,14 +711,14 @@ true
 
 set "" foo
 #CHECKERR: set: Variable name '' is not valid. See `help identifiers`.
-#CHECKERR: {{.*}}set.fish (line {{\d+}}): 
+#CHECKERR: {{.*}}set.fish (line {{\d+}}):
 #CHECKERR: set "" foo
 #CHECKERR: ^
 #CHECKERR: (Type 'help set' for related documentation)
 
 set --show ""
 #CHECKERR: set: Variable name '' is not valid. See `help identifiers`.
-#CHECKERR: {{.*}}set.fish (line {{\d+}}): 
+#CHECKERR: {{.*}}set.fish (line {{\d+}}):
 #CHECKERR: set --show ""
 #CHECKERR: ^
 #CHECKERR: (Type 'help set' for related documentation)
diff --git a/tests/checks/symlinks-not-overwritten.fish b/tests/checks/symlinks-not-overwritten.fish
index dd77300da..1aec377a6 100644
--- a/tests/checks/symlinks-not-overwritten.fish
+++ b/tests/checks/symlinks-not-overwritten.fish
@@ -1,10 +1,7 @@
 #RUN: %fish -C 'set -g fish %fish' %s
 
-set -gx XDG_CONFIG_HOME (mktemp -d)
-set -gx XDG_DATA_HOME $XDG_CONFIG_HOME
 mkdir -p $XDG_CONFIG_HOME/fish
 
-
 # fish_variables
 set -l target_file $XDG_CONFIG_HOME/fish/target_fish_variables
 set -l fish_variables $XDG_CONFIG_HOME/fish/fish_variables