I'd just add DBUS_USE_TEST_BINARY=1 in the script, and "if getenv("DBUS_USE_TEST_BINARY") != NULL in dbus-launch - then dbus-launch can still be sanely run by hand from a development build Havoc