diff --git a/etc/rootwrap.conf b/etc/rootwrap.conf
index 3b56b6a3e49..9cd93527fdb 100644
--- a/etc/rootwrap.conf
+++ b/etc/rootwrap.conf
@@ -26,6 +26,9 @@ syslog_log_facility=syslog
 # ERROR means only log unsuccessful attempts
 syslog_log_level=ERROR
 
+# Rootwrap daemon exits after this seconds of inactivity
+daemon_timeout=600
+
 [xenapi]
 # XenAPI configuration is only required by the L2 agent if it is to
 # target a XenServer/XCP compute host's dom0.
diff --git a/tools/deploy_rootwrap.sh b/tools/deploy_rootwrap.sh
index ec392ae825b..9669a6981c3 100755
--- a/tools/deploy_rootwrap.sh
+++ b/tools/deploy_rootwrap.sh
@@ -55,6 +55,7 @@ sed -i "s:^exec_dirs=\(.*\)$:exec_dirs=${target_bin_path},${fullstack_path},\1:"
 if [[ "$OS_SUDO_TESTING" = "1" ]]; then
     sed -i 's/use_syslog=False/use_syslog=True/g' ${dst_conf}
     sed -i 's/syslog_log_level=ERROR/syslog_log_level=DEBUG/g' ${dst_conf}
+    sed -i 's/daemon_timeout=600/daemon_timeout=7800/g' ${dst_conf}
     cp -p ${neutron_path}/neutron/tests/contrib/testing.filters \
         ${dst_rootwrap_path}/
 fi