diff --git a/Makefile.am b/Makefile.am
index 62ca7cd..0ec77ef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -169,6 +169,8 @@ EXTRA_DIST += src/genbuiltin src/bluetooth.conf src/org.bluez.service \
 			profiles/input/input.conf profiles/proximity/proximity.conf \
 			profiles/audio/audio.conf
 
+test_scripts =
+
 include Makefile.tools
 include Makefile.obexd
 
@@ -186,6 +188,13 @@ rules_DATA = $(foreach file,$(udev_files), tools/97-$(notdir $(file)))
 
 CLEANFILES += $(rules_DATA)
 
+if TEST
+testdir = $(pkglibdir)/test
+test_SCRIPTS = $(test_scripts)
+endif
+
+EXTRA_DIST += $(test_scripts)
+
 EXTRA_DIST += doc/adapter-api.txt doc/device-api.txt doc/profile-api.txt \
 		doc/service-api.txt doc/agent-api.txt doc/attribute-api.txt \
 		doc/network-api.txt doc/control-api.txt doc/health-api.txt \
diff --git a/Makefile.tools b/Makefile.tools
index ef58588..b5df18a 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -152,7 +152,7 @@ profiles_cups_bluetooth_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ \
 				lib/libbluetooth-private.la
 endif
 
-EXTRA_DIST += test/sap_client.py test/bluezutils.py \
+test_scripts += test/sap_client.py test/bluezutils.py \
 		test/dbusdef.py test/monitor-bluetooth test/list-devices \
 		test/test-discovery test/test-manager test/test-adapter \
 		test/test-device test/test-service test/simple-agent \