diff --git a/tests/interactive.fish b/tests/interactive.fish
index 207651863..df93be0d5 100644
--- a/tests/interactive.fish
+++ b/tests/interactive.fish
@@ -14,7 +14,7 @@ end
 set -gx FISH_UNIT_TESTS_RUNNING 1
 
 # Change to directory containing this script
-cd (dirname (status -f))
+cd (status dirname)
 
 # These env vars should not be inherited from the user environment because they can affect the
 # behavior of the tests. So either remove them or set them to a known value.
diff --git a/tests/test.fish b/tests/test.fish
index 3f727ffb6..0ab8092c9 100644
--- a/tests/test.fish
+++ b/tests/test.fish
@@ -9,7 +9,7 @@
 set -x FISH_UNIT_TESTS_RUNNING 1
 
 # Change to directory containing this script
-cd (dirname (status -f))
+cd (status dirname)
 
 # Test files specified on commandline, or all checks.
 set -l files_to_test