diff --git a/presets/90-systemd.preset b/presets/90-systemd.preset
index 7406c92a5c..53eb8a7806 100644
--- a/presets/90-systemd.preset
+++ b/presets/90-systemd.preset
@@ -20,6 +20,7 @@ enable systemd-timesyncd.service
 enable systemd-networkd.service
 enable systemd-resolved.service
 enable systemd-repart.service
+enable systemd-homed.service
 
 disable console-getty.service
 disable debug-shell.service
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 9964eb79a4..d8ee6df184 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -201,8 +201,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/'],
diff --git a/units/systemd-homed.service.in b/units/systemd-homed.service.in
index 7cf98e6fa6..8138f5125c 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