diff --git a/buffet/etc/init/buffet.conf b/buffet/etc/init/buffet.conf
index 1e27a53..49c7b7f 100644
--- a/buffet/etc/init/buffet.conf
+++ b/buffet/etc/init/buffet.conf
@@ -27,3 +27,6 @@
     --config_path="${BUFFET_CONFIG_PATH}" \
     --state_path="${BUFFET_STATE_PATH}" \
     --test_definitions_path="${BUFFET_TEST_DEFINITIONS_PATH}"
+
+# Wait for daemon to claim its D-Bus name before transitioning to started.
+post-start exec gdbus wait --system --timeout 30 org.chromium.Buffet