diff --git a/test/units/testsuite-17.00.sh b/test/units/testsuite-17.00.sh
index 0203af88c4..a72c0fb792 100755
--- a/test/units/testsuite-17.00.sh
+++ b/test/units/testsuite-17.00.sh
@@ -11,6 +11,9 @@ set -o pipefail
 assert_in "systemd-tmpfiles-setup-dev.service" "$(systemctl show --property After --value systemd-udevd.service)"
 assert_in "systemd-udevd.service" "$(systemctl show --property Before --value systemd-tmpfiles-setup-dev.service)"
 
+assert_in "systemd-tmpfiles-setup.service" "$(systemctl show --property After --value systemd-udevd.service)"
+assert_in "systemd-udevd.service" "$(systemctl show --property Before --value systemd-tmpfiles-setup.service)"
+
 if [[ -f /dev/vfio/vfio ]]; then
    assert_in "crw-rw-rw-" "$(stat --format=%A /dev/vfio/vfio)"
 fi
diff --git a/units/systemd-tmpfiles-setup.service b/units/systemd-tmpfiles-setup.service
index 6c5e3de8fd..2e04733a5d 100644
--- a/units/systemd-tmpfiles-setup.service
+++ b/units/systemd-tmpfiles-setup.service
@@ -13,7 +13,7 @@ Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
 
 DefaultDependencies=no
 After=local-fs.target systemd-sysusers.service systemd-journald.service
-Before=sysinit.target
+Before=sysinit.target systemd-udevd.service
 Conflicts=shutdown.target initrd-switch-root.target
 Before=shutdown.target initrd-switch-root.target
 RefuseManualStop=yes
diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in
index 7682baeec1..b59fdef9b0 100644
--- a/units/systemd-udevd.service.in
+++ b/units/systemd-udevd.service.in
@@ -12,7 +12,6 @@ Description=Rule-based Manager for Device Events and Files
 Documentation=man:systemd-udevd.service(8) man:udev(7)
 DefaultDependencies=no
 After=systemd-sysusers.service systemd-hwdb-update.service
-After=systemd-tmpfiles-setup-dev.service
 Before=sysinit.target
 ConditionPathIsReadWrite=/sys