diff --git a/libnm-glib/tests/libnm-glib-test-launch.sh b/libnm-glib/tests/libnm-glib-test-launch.sh
index 1db656ad06..42d9fbe26d 100755
--- a/libnm-glib/tests/libnm-glib-test-launch.sh
+++ b/libnm-glib/tests/libnm-glib-test-launch.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
 
+# Spawn DBus if there's none
 if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
-    exec dbus-launch --exit-with-session "$@"
-else
-    exec "$@"
+    eval `dbus-launch --sh-syntax`
+    trap "kill $DBUS_SESSION_BUS_PID" EXIT
 fi
+
+"$@"
diff --git a/libnm/tests/libnm-test-launch.sh b/libnm/tests/libnm-test-launch.sh
index 1db656ad06..42d9fbe26d 100755
--- a/libnm/tests/libnm-test-launch.sh
+++ b/libnm/tests/libnm-test-launch.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
 
+# Spawn DBus if there's none
 if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
-    exec dbus-launch --exit-with-session "$@"
-else
-    exec "$@"
+    eval `dbus-launch --sh-syntax`
+    trap "kill $DBUS_SESSION_BUS_PID" EXIT
 fi
+
+"$@"