diff --git a/tools/run-test-dbus-session.sh b/tools/run-test-dbus-session.sh
index 1064e4122..0235d65b7 100755
--- a/tools/run-test-dbus-session.sh
+++ b/tools/run-test-dbus-session.sh
@@ -1,3 +1,10 @@
 #!/bin/sh
 
+if ! which dbus-run-session &>/dev/null; then
+    eval `dbus-launch --sh-syntax`
+    trap "kill $DBUS_SESSION_BUS_PID" EXIT
+    "$@"
+    exit $?
+fi
+
 dbus-run-session -- "$@"