diff --git a/nixos/tests/pantheon-wayland.nix b/nixos/tests/pantheon-wayland.nix
index 2a99c6cb1272..74bc57eae78c 100644
--- a/nixos/tests/pantheon-wayland.nix
+++ b/nixos/tests/pantheon-wayland.nix
@@ -69,8 +69,7 @@ import ./make-test-python.nix (
             # https://github.com/elementary/gala/pull/2140
             for i in ["gala", "io.elementary.wingpanel", "io.elementary.dock", "gsd-media-keys", "gsd-xsettings", "io.elementary.desktop.agent-polkit"]:
                 machine.wait_until_succeeds(f"pgrep -f {i}")
-            for i in ["io.elementary.files.xdg-desktop-portal.service"]:
-                machine.wait_for_unit(i, "${user.name}")
+            machine.wait_until_succeeds("pgrep -xf ${pkgs.pantheon.elementary-files}/libexec/io.elementary.files.xdg-desktop-portal")
 
         with subtest("Check if various environment variables are set"):
             cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf ${pkgs.pantheon.gala}/bin/gala)/environ"
diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix
index 7a19d6432fb0..b29c6ca6ce8b 100644
--- a/nixos/tests/pantheon.nix
+++ b/nixos/tests/pantheon.nix
@@ -60,8 +60,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
             machine.wait_until_succeeds(f"pgrep -f {i}")
         for i in ["gala", "io.elementary.wingpanel", "io.elementary.dock"]:
             machine.wait_for_window(i)
-        for i in ["io.elementary.files.xdg-desktop-portal.service"]:
-            machine.wait_for_unit(i, "${user.name}")
+        machine.wait_until_succeeds("pgrep -xf ${pkgs.pantheon.elementary-files}/libexec/io.elementary.files.xdg-desktop-portal")
 
     with subtest("Check if various environment variables are set"):
         cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf ${pkgs.pantheon.gala}/bin/gala)/environ"