diff --git a/presets/90-systemd.preset b/presets/90-systemd.preset
index dc9d02f0b9..db61ef12d3 100644
--- a/presets/90-systemd.preset
+++ b/presets/90-systemd.preset
@@ -19,6 +19,9 @@ enable getty@.service
 enable systemd-timesyncd.service
 enable systemd-networkd.service
 enable systemd-resolved.service
+enable systemd-repart.service
+enable systemd-homed.service
+enable systemd-userdbd.socket
 
 disable console-getty.service
 disable debug-shell.service
diff --git a/test/test-functions b/test/test-functions
index ead815f2fa..fbdc92c96e 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -1964,7 +1964,7 @@ test_setup() {
     if [ ${TEST_REQUIRE_INSTALL_TESTS} -ne 0 ] && \
             type -P meson >/dev/null && \
             [[ "$(meson configure $BUILD_DIR | grep install-tests | awk '{ print $2 }')" != "true" ]]; then
-        dfatal "Needs to be built with -Dinstall-tests=true"
+        dfatal "$BUILD_DIR needs to be built with -Dinstall-tests=true"
         exit 1
     fi
 
diff --git a/test/units/testsuite-46.service b/test/units/testsuite-46.service
index da359cbb23..7698f35979 100644
--- a/test/units/testsuite-46.service
+++ b/test/units/testsuite-46.service
@@ -1,7 +1,9 @@
 [Unit]
 Description=TEST-46-HOMED
-Before=getty-pre.target
 Wants=getty-pre.target
+Before=getty-pre.target
+Wants=systemd-homed.service
+After=systemd-homed.service
 
 [Service]
 ExecStartPre=rm -f /failed /testok
diff --git a/units/meson.build b/units/meson.build
index ea91f0cc9e..8ec9eb94e4 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -139,8 +139,7 @@ units = [
          'sysinit.target.wants/'],
         ['systemd-udevd-kernel.socket',         '',
          'sockets.target.wants/'],
-        ['systemd-userdbd.socket',              'ENABLE_USERDB',
-         'sockets.target.wants/'],
+        ['systemd-userdbd.socket',              'ENABLE_USERDB'],
         ['time-set.target',                     ''],
         ['time-sync.target',                    ''],
         ['timers.target',                       ''],
@@ -201,8 +200,7 @@ in_units = [
         ['systemd-portabled.service',            'ENABLE_PORTABLED',
          'dbus-org.freedesktop.portable1.service'],
         ['systemd-userdbd.service',              'ENABLE_USERDB'],
-        ['systemd-homed.service',                'ENABLE_HOMED',
-         'multi-user.target.wants/ dbus-org.freedesktop.home1.service'],
+        ['systemd-homed.service',                'ENABLE_HOMED'],
         ['systemd-quotacheck.service',           'ENABLE_QUOTACHECK'],
         ['systemd-random-seed.service',          'ENABLE_RANDOMSEED',
          'sysinit.target.wants/'],
@@ -228,8 +226,7 @@ in_units = [
          'multi-user.target.wants/'],
         ['systemd-vconsole-setup.service',       'ENABLE_VCONSOLE'],
         ['systemd-volatile-root.service',        ''],
-        ['systemd-repart.service',               'ENABLE_REPART',
-         'sysinit.target.wants/ initrd-root-fs.target.wants/'],
+        ['systemd-repart.service',               'ENABLE_REPART'],
         ['user-runtime-dir@.service',            ''],
         ['user@.service',                        ''],
 ]
diff --git a/units/systemd-homed.service.in b/units/systemd-homed.service.in
index 6490f48a15..91dabee034 100644
--- a/units/systemd-homed.service.in
+++ b/units/systemd-homed.service.in
@@ -34,3 +34,7 @@ SystemCallArchitectures=native
 SystemCallErrorNumber=EPERM
 SystemCallFilter=@system-service @mount
 @SERVICE_WATCHDOG@
+
+[Install]
+WantedBy=multi-user.target
+Alias=dbus-org.freedesktop.home1.service
diff --git a/units/systemd-repart.service.in b/units/systemd-repart.service.in
index 7ce6aefd29..41a9d82b93 100644
--- a/units/systemd-repart.service.in
+++ b/units/systemd-repart.service.in
@@ -21,5 +21,9 @@ Type=oneshot
 RemainAfterExit=yes
 ExecStart=@rootbindir@/systemd-repart --dry-run=no
 
-# The tool returns 77 if there's no GPT partition table pre-existing
+# The tool returns 77 if there's no existing GPT partition table
 SuccessExitStatus=77
+
+[Install]
+WantedBy=sysinit.target
+WantedBy=initrd-root-fs.target
diff --git a/units/systemd-userdbd.service.in b/units/systemd-userdbd.service.in
index e30ed2109e..3b76705373 100644
--- a/units/systemd-userdbd.service.in
+++ b/units/systemd-userdbd.service.in
@@ -39,3 +39,6 @@ SystemCallErrorNumber=EPERM
 SystemCallFilter=@system-service
 Type=notify
 @SERVICE_WATCHDOG@
+
+[Install]
+Also=systemd-userdbd.socket
diff --git a/units/systemd-userdbd.socket b/units/systemd-userdbd.socket
index 1c749ea1d2..2b4bb7a87a 100644
--- a/units/systemd-userdbd.socket
+++ b/units/systemd-userdbd.socket
@@ -17,3 +17,6 @@ Before=sockets.target
 ListenStream=/run/systemd/userdb/io.systemd.Multiplexer
 Symlinks=/run/systemd/userdb/io.systemd.NameServiceSwitch
 SocketMode=0666
+
+[Install]
+WantedBy=sockets.target