diff --git a/units/systemd-backlight@.service.in b/units/systemd-backlight@.service.in
index 5e6706c11c..9aa0c7498d 100644
--- a/units/systemd-backlight@.service.in
+++ b/units/systemd-backlight@.service.in
@@ -9,7 +9,6 @@
 Description=Load/Save Screen Backlight Brightness of %i
 Documentation=man:systemd-backlight@.service(8)
 DefaultDependencies=no
-RequiresMountsFor=/var/lib/systemd/backlight
 Conflicts=shutdown.target
 After=systemd-remount-fs.service
 Before=sysinit.target shutdown.target
@@ -20,3 +19,4 @@ RemainAfterExit=yes
 ExecStart=@rootlibexecdir@/systemd-backlight load %i
 ExecStop=@rootlibexecdir@/systemd-backlight save %i
 TimeoutSec=90s
+StateDirectory=systemd/backlight
diff --git a/units/systemd-rfkill.service.in b/units/systemd-rfkill.service.in
index 780a19b996..5cdd747d22 100644
--- a/units/systemd-rfkill.service.in
+++ b/units/systemd-rfkill.service.in
@@ -9,7 +9,6 @@
 Description=Load/Save RF Kill Switch Status
 Documentation=man:systemd-rfkill.service(8)
 DefaultDependencies=no
-RequiresMountsFor=/var/lib/systemd/rfkill
 BindsTo=sys-devices-virtual-misc-rfkill.device
 Conflicts=shutdown.target
 After=sys-devices-virtual-misc-rfkill.device systemd-remount-fs.service
@@ -19,3 +18,4 @@ Before=shutdown.target
 Type=notify
 ExecStart=@rootlibexecdir@/systemd-rfkill
 TimeoutSec=30s
+StateDirectory=systemd/rfkill