diff --git a/libnm-glib/tests/Makefile.am b/libnm-glib/tests/Makefile.am
index a1b25f62f4..138b2b320e 100644
--- a/libnm-glib/tests/Makefile.am
+++ b/libnm-glib/tests/Makefile.am
@@ -17,7 +17,7 @@ noinst_PROGRAMS = $(TESTS)
 if WITH_VALGRIND
 @VALGRIND_RULES@ --launch-dbus
 else
-LOG_COMPILER = $(srcdir)/libnm-glib-test-launch.sh
+LOG_COMPILER = $(top_srcdir)/tools/run-test-dbus-session.sh
 endif
 TESTS = test-nm-client test-remote-settings-client
 
@@ -50,5 +50,3 @@ test_remote_settings_client_LDADD = \
 ###########################################
 
 endif
-
-EXTRA_DIST = libnm-glib-test-launch.sh
diff --git a/libnm/tests/Makefile.am b/libnm/tests/Makefile.am
index ddcf50be80..fd9edb6fb1 100644
--- a/libnm/tests/Makefile.am
+++ b/libnm/tests/Makefile.am
@@ -21,7 +21,7 @@ noinst_PROGRAMS = $(TESTS)
 if WITH_VALGRIND
 @VALGRIND_RULES@ --launch-dbus
 else
-LOG_COMPILER = $(srcdir)/libnm-test-launch.sh
+LOG_COMPILER = $(top_srcdir)/tools/run-test-dbus-session.sh
 endif
 TESTS = test-nm-client test-remote-settings-client test-secret-agent
 
@@ -40,5 +40,3 @@ test_secret_agent_SOURCES = \
 	$(top_builddir)/shared/nm-test-libnm-utils.h \
 	test-secret-agent.c
 endif
-
-EXTRA_DIST = libnm-test-launch.sh
diff --git a/libnm/tests/libnm-test-launch.sh b/libnm/tests/libnm-test-launch.sh
deleted file mode 100755
index 1064e41223..0000000000
--- a/libnm/tests/libnm-test-launch.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-dbus-run-session -- "$@"
diff --git a/tools/Makefile.am b/tools/Makefile.am
index f008956d9b..27d6bcc417 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -3,5 +3,6 @@ EXTRA_DIST = \
 	debug-helper.py \
 	doc-generator.xsl \
 	run-test-valgrind.sh \
+	run-test-dbus-session.sh \
 	test-networkmanager-service.py \
 	test-sudo-wrapper.sh
diff --git a/libnm-glib/tests/libnm-glib-test-launch.sh b/tools/run-test-dbus-session.sh
similarity index 100%
rename from libnm-glib/tests/libnm-glib-test-launch.sh
rename to tools/run-test-dbus-session.sh