diff --git a/src/daemon/rpm-ostreed.service.in b/src/daemon/rpm-ostreed.service.in
index 43239e2b09..a2062540b7 100644
--- a/src/daemon/rpm-ostreed.service.in
+++ b/src/daemon/rpm-ostreed.service.in
@@ -21,6 +21,9 @@ ProtectHome=true
 # application containers.
 InaccessiblePaths=-/var/lib/containers
 NotifyAccess=main
+# Significantly bump this timeout from the default because
+# we do a lot of stuff on daemon startup.
+TimeoutStartSec=5m
 @SYSTEMD_ENVIRON@
 ExecStart=@bindir@/rpm-ostree start-daemon
 ExecReload=@bindir@/rpm-ostree reload
diff --git a/tests/kolainst/nondestructive/misc.sh b/tests/kolainst/nondestructive/misc.sh
index 4b095d4496..6d5b87e971 100755
--- a/tests/kolainst/nondestructive/misc.sh
+++ b/tests/kolainst/nondestructive/misc.sh
@@ -38,6 +38,9 @@ echo "ok empty pkg arrays, and commit meta correct in status json"
 # All tests which require a booted system, but are nondestructive
 rpm-ostree testutils integration-read-only
 
+systemctl show -p TimeoutStartUSec rpm-ostreed.service > out.txt
+assert_file_has_content out.txt 'TimeoutStartUSec=5m'
+
 # Ensure we return an error when passing a wrong option.
 rpm-ostree --help | awk '/^$/ {in_commands=0} {if(in_commands==1){print $0}} /^Builtin Commands:/ {in_commands=1}' > commands.txt
 while read cmd; do