diff --git a/test/units/autorelabel.service b/test/units/autorelabel.service
index aad7d111d5a..dd0df8161bf 100644
--- a/test/units/autorelabel.service
+++ b/test/units/autorelabel.service
@@ -12,7 +12,7 @@ ConditionPathExists=|/.autorelabel
 [Service]
 ExecStart=sh -xec 'echo 0 >/sys/fs/selinux/enforce; fixfiles -f -F relabel; rm /.autorelabel; systemctl --force reboot'
 Type=oneshot
-TimeoutSec=0
+TimeoutSec=infinity
 RemainAfterExit=yes
 StandardOutput=journal+console
 
diff --git a/units/rc-local.service.in b/units/rc-local.service.in
index 55e83dfe007..6fb0838cdb4 100644
--- a/units/rc-local.service.in
+++ b/units/rc-local.service.in
@@ -18,6 +18,6 @@ After=network.target
 [Service]
 Type=forking
 ExecStart={{RC_LOCAL_PATH}} start
-TimeoutSec=0
+TimeoutSec=infinity
 RemainAfterExit=yes
 GuessMainPID=no
diff --git a/units/systemd-fsck-root.service.in b/units/systemd-fsck-root.service.in
index 8378df84c71..8cfbe7ce987 100644
--- a/units/systemd-fsck-root.service.in
+++ b/units/systemd-fsck-root.service.in
@@ -21,4 +21,4 @@ OnFailureJobMode=replace-irreversibly
 Type=oneshot
 RemainAfterExit=yes
 ExecStart={{ROOTLIBEXECDIR}}/systemd-fsck
-TimeoutSec=0
+TimeoutSec=infinity
diff --git a/units/systemd-fsck@.service.in b/units/systemd-fsck@.service.in
index 06b91aea39c..d773229812e 100644
--- a/units/systemd-fsck@.service.in
+++ b/units/systemd-fsck@.service.in
@@ -20,4 +20,4 @@ Before=systemd-quotacheck.service shutdown.target
 Type=oneshot
 RemainAfterExit=yes
 ExecStart={{ROOTLIBEXECDIR}}/systemd-fsck %f
-TimeoutSec=0
+TimeoutSec=infinity
diff --git a/units/systemd-growfs-root.service.in b/units/systemd-growfs-root.service.in
index 61b825672d2..0468774cb00 100644
--- a/units/systemd-growfs-root.service.in
+++ b/units/systemd-growfs-root.service.in
@@ -20,4 +20,4 @@ Before=shutdown.target
 Type=oneshot
 RemainAfterExit=yes
 ExecStart={{ROOTLIBEXECDIR}}/systemd-growfs /
-TimeoutSec=0
+TimeoutSec=infinity
diff --git a/units/systemd-growfs@.service.in b/units/systemd-growfs@.service.in
index d7c90e96fce..90fb0a86619 100644
--- a/units/systemd-growfs@.service.in
+++ b/units/systemd-growfs@.service.in
@@ -21,4 +21,4 @@ Before=shutdown.target
 Type=oneshot
 RemainAfterExit=yes
 ExecStart={{ROOTLIBEXECDIR}}/systemd-growfs %f
-TimeoutSec=0
+TimeoutSec=infinity
diff --git a/units/systemd-quotacheck.service.in b/units/systemd-quotacheck.service.in
index 05c14ff8b6e..60b56496fa8 100644
--- a/units/systemd-quotacheck.service.in
+++ b/units/systemd-quotacheck.service.in
@@ -22,4 +22,4 @@ Before=shutdown.target
 Type=oneshot
 RemainAfterExit=yes
 ExecStart={{ROOTLIBEXECDIR}}/systemd-quotacheck
-TimeoutSec=0
+TimeoutSec=infinity