diff --git a/scripts/xapi.service b/scripts/xapi.service
index e08cbff1067..58923c0a92c 100644
--- a/scripts/xapi.service
+++ b/scripts/xapi.service
@@ -1,6 +1,8 @@
 [Unit]
 Description=XenAPI server (XAPI)
 
+Requires=systemd-tmpfiles-setup.service
+After=systemd-tmpfiles-setup.service
 After=attach-static-vdis.service
 After=forkexecd.service
 After=message-switch.service