diff --git a/nixos/tests/systemd-repart.nix b/nixos/tests/systemd-repart.nix
index a991709a5c66..ebc487a8c1bc 100644
--- a/nixos/tests/systemd-repart.nix
+++ b/nixos/tests/systemd-repart.nix
@@ -303,10 +303,14 @@ in
             systemd = {
               enable = true;
               # avoids reaching cryptsetup.target before recreation of the
-              # "state" volume completed, during the factory reset
+              # "state" volume completed, during the factory reset and tries to
+              # ensure that devices are retriggered before trying to work with them.
               services.systemd-repart.before = [
                 "systemd-cryptsetup@state.service"
               ];
+              services.systemd-factory-reset-complete.before = [
+                "systemd-cryptsetup@state.service"
+              ];
               repart = {
                 enable = true;
                 extraArgs = [