diff --git a/nixos/tests/fish.nix b/nixos/tests/fish.nix
index 36dfd6b373d9..a134bf1f68c1 100644
--- a/nixos/tests/fish.nix
+++ b/nixos/tests/fish.nix
@@ -24,6 +24,10 @@
       machine.succeed(
           "fish -ic 'echo $fish_complete_path' | grep -q '/share/fish/vendor_completions.d /etc/fish/generated_completions /root/.cache/fish/generated_completions$'"
       )
+      machine.wait_for_file("/etc/fish/nixos-env-preinit.fish")
+      machine.succeed(
+          "env -u __NIXOS_SET_ENVIRONMENT_DONE fish -lc 'set -q __NIXOS_SET_ENVIRONMENT_DONE'"
+      )
       machine.wait_for_file("/etc/fish/config.fish")
       config = machine.succeed("fish_indent -c /etc/fish/config.fish")
     '';