tests: move from test/ to tests/

So so annoying.

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

114 files changed, 49 insertions, 49 deletions

diff --git a/.gitignore b/.gitignore
index 11f59227..7003d263 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,24 +73,24 @@ stamp-*
 tags
 TAGS
 /telepathy-mission-control-5*
-/test/account-store
-/test/keyring-command
-/test/test-*
-test/mc-client
-test/twisted/with-session-bus-*.dbus-monitor-logs
-/test/twisted/accounts/.mc_connections
-/test/twisted/accounts/accounts.cfg
-/test/twisted/mc-debug-server
-test/twisted/tools/exec-with-log.sh
-test/twisted/tools/missioncontrol-*.log
-test/twisted/tools/missioncontrol.log
-test/twisted/tools/tmp-session-bus.conf
-/test/twisted/tools/*.service
-/test/twisted/tmp-*/
-/test/twisted/with-session-bus-*.address
-/test/twisted/with-session-bus-*.pid
+/tests/account-store
+/tests/keyring-command
+/tests/test-*
+tests/mc-client
+tests/twisted/with-session-bus-*.dbus-monitor-logs
+/tests/twisted/accounts/.mc_connections
+/tests/twisted/accounts/accounts.cfg
+/tests/twisted/mc-debug-server
+tests/twisted/tools/exec-with-log.sh
+tests/twisted/tools/missioncontrol-*.log
+tests/twisted/tools/missioncontrol.log
+tests/twisted/tools/tmp-session-bus.conf
+/tests/twisted/tools/*.service
+/tests/twisted/tmp-*/
+/tests/twisted/with-session-bus-*.address
+/tests/twisted/with-session-bus-*.pid
 /util/mc-account-convert
 /util/mc-tool
 /util/mc-wait-for-name
 /util/mc-wait-for-name.1
-test/twisted/config.py
+tests/twisted/config.py
diff --git a/Makefile.am b/Makefile.am
index 9d17cbdb..27bde660 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ SUBDIRS = \
     src \
     server \
     util \
-    test \
+    tests \
     doc
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/configure.ac b/configure.ac
index 3cecf7d1..c09e0d92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -371,9 +371,9 @@ mission-control-plugins/Makefile \
 plugins/Makefile \
 server/Makefile \
 src/Makefile \
-test/Makefile \
-test/twisted/Makefile \
-test/twisted/tools/Makefile \
+tests/Makefile \
+tests/twisted/Makefile \
+tests/twisted/tools/Makefile \
 tools/Makefile \
 util/Makefile \
 xml/Makefile \
diff --git a/test/twisted/tools/Client.AbiWord.service.in b/test/twisted/tools/Client.AbiWord.service.in
deleted file mode 100644
index 418bc38e..00000000
--- a/test/twisted/tools/Client.AbiWord.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Telepathy.Client.AbiWord
-Exec=/bin/sh @abs_top_srcdir@/test/twisted/tools/fake-startup.sh org.freedesktop.Telepathy.Client.AbiWord
diff --git a/test/twisted/tools/Client.Logger.service.in b/test/twisted/tools/Client.Logger.service.in
deleted file mode 100644
index 32f22088..00000000
--- a/test/twisted/tools/Client.Logger.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Telepathy.Client.Logger
-Exec=/bin/sh @abs_top_srcdir@/test/twisted/tools/fake-startup.sh org.freedesktop.Telepathy.Client.Logger
diff --git a/test/Makefile.am b/tests/Makefile.am
index 7f6c3996..7f6c3996 100644
--- a/test/Makefile.am
+++ b/tests/Makefile.am
diff --git a/test/account-store-default.c b/tests/account-store-default.c
index 464aa986..464aa986 100644
--- a/test/account-store-default.c
+++ b/tests/account-store-default.c
diff --git a/test/account-store-default.h b/tests/account-store-default.h
index 739f95cc..739f95cc 100644
--- a/test/account-store-default.h
+++ b/tests/account-store-default.h
diff --git a/test/account-store-libaccounts.c b/tests/account-store-libaccounts.c
index 11c24006..11c24006 100644
--- a/test/account-store-libaccounts.c
+++ b/tests/account-store-libaccounts.c
diff --git a/test/account-store-libaccounts.h b/tests/account-store-libaccounts.h
index cb2352b1..cb2352b1 100644
--- a/test/account-store-libaccounts.h
+++ b/tests/account-store-libaccounts.h
diff --git a/test/account-store.c b/tests/account-store.c
index 5483527a..5483527a 100644
--- a/test/account-store.c
+++ b/tests/account-store.c
diff --git a/test/keyring-command.c b/tests/keyring-command.c
index 640f448a..640f448a 100644
--- a/test/keyring-command.c
+++ b/tests/keyring-command.c
diff --git a/test/twisted/Makefile.am b/tests/twisted/Makefile.am
index 1b9a330e..fd2d610b 100644
--- a/test/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -151,19 +151,19 @@ TESTS =
 TMPSUFFIX = foo
 
 BASIC_TESTS_ENVIRONMENT = \
-	PYTHONPATH=@abs_top_srcdir@/test/twisted:@abs_top_builddir@/test/twisted \
+	PYTHONPATH=@abs_top_srcdir@/tests/twisted:@abs_top_builddir@/tests/twisted \
 	MC_DEBUG=all \
-	MC_FILTER_PLUGIN_DIR=@abs_top_builddir@/test/twisted/.libs \
-	MC_CHANDLERS_DIR=@abs_top_srcdir@/test/twisted/chandlers \
-	MC_ACCOUNT_DIR=@abs_top_builddir@/test/twisted/tmp-$(TMPSUFFIX) \
-	XDG_CONFIG_HOME=@abs_top_builddir@/test/twisted/tmp-$(TMPSUFFIX) \
-	XDG_CONFIG_DIRS=@abs_top_srcdir@/test/twisted \
-	XDG_DATA_HOME=@abs_top_builddir@/test/twisted/tmp-$(TMPSUFFIX) \
-	XDG_DATA_DIRS=@abs_top_srcdir@/test/twisted \
-	XDG_CACHE_DIR=@abs_top_builddir@/test/twisted/tmp-$(TMPSUFFIX) \
-	XDG_CACHE_HOME=@abs_top_builddir@/test/twisted/tmp-$(TMPSUFFIX) \
-	MC_CLIENTS_DIR=@abs_top_srcdir@/test/twisted/telepathy/clients \
-	MC_MANAGER_DIR=@abs_top_srcdir@/test/twisted/telepathy/managers \
+	MC_FILTER_PLUGIN_DIR=@abs_top_builddir@/tests/twisted/.libs \
+	MC_CHANDLERS_DIR=@abs_top_srcdir@/tests/twisted/chandlers \
+	MC_ACCOUNT_DIR=@abs_top_builddir@/tests/twisted/tmp-$(TMPSUFFIX) \
+	XDG_CONFIG_HOME=@abs_top_builddir@/tests/twisted/tmp-$(TMPSUFFIX) \
+	XDG_CONFIG_DIRS=@abs_top_srcdir@/tests/twisted \
+	XDG_DATA_HOME=@abs_top_builddir@/tests/twisted/tmp-$(TMPSUFFIX) \
+	XDG_DATA_DIRS=@abs_top_srcdir@/tests/twisted \
+	XDG_CACHE_DIR=@abs_top_builddir@/tests/twisted/tmp-$(TMPSUFFIX) \
+	XDG_CACHE_HOME=@abs_top_builddir@/tests/twisted/tmp-$(TMPSUFFIX) \
+	MC_CLIENTS_DIR=@abs_top_srcdir@/tests/twisted/telepathy/clients \
+	MC_MANAGER_DIR=@abs_top_srcdir@/tests/twisted/telepathy/managers \
 	G_DEBUG=fatal_criticals
 
 if ENABLE_GNOME_KEYRING
@@ -172,8 +172,8 @@ endif
 
 if ENABLE_LIBACCOUNTS_SSO
 BASIC_TESTS_ENVIRONMENT += AG_DEBUG=all \
-	ACCOUNTS=@abs_top_builddir@/test/twisted/tmp-$(TMPSUFFIX) \
-	AG_SERVICES=@abs_top_builddir@/test/twisted/tmp-$(TMPSUFFIX)
+	ACCOUNTS=@abs_top_builddir@/tests/twisted/tmp-$(TMPSUFFIX) \
+	AG_SERVICES=@abs_top_builddir@/tests/twisted/tmp-$(TMPSUFFIX)
 endif
 
 WITH_SESSION_BUS = \
diff --git a/test/twisted/README b/tests/twisted/README
index 40be6dae..56f664a8 100644
--- a/test/twisted/README
+++ b/tests/twisted/README
@@ -1,16 +1,16 @@
 To run Twisted tests:
 
-  make -C test/twisted check-twisted
+  make -C tests/twisted check-twisted
 
 To run an individual Twisted test:
 
-  make -C test/twisted check-twisted \
+  make -C tests/twisted check-twisted \
         TWISTED_BASIC_TESTS= \
         TWISTED_SEPARATE_TESTS=dispatcher/create-at-startup.py
 
 To run with debug information:
 
-  make -C test/twisted check-twisted \
+  make -C tests/twisted check-twisted \
         TWISTED_BASIC_TESTS= \
         TWISTED_SEPARATE_TESTS=dispatcher/create-at-startup.py \
         CHECK_TWISTED_VERBOSE=1
diff --git a/test/twisted/account-manager/account-basics.py b/tests/twisted/account-manager/account-basics.py
index 51328ce9..51328ce9 100644
--- a/test/twisted/account-manager/account-basics.py
+++ b/tests/twisted/account-manager/account-basics.py
diff --git a/test/twisted/account-manager/auto-away.py b/tests/twisted/account-manager/auto-away.py
index 6d2fc81b..6d2fc81b 100644
--- a/test/twisted/account-manager/auto-away.py
+++ b/tests/twisted/account-manager/auto-away.py
diff --git a/test/twisted/account-manager/auto-connect.py b/tests/twisted/account-manager/auto-connect.py
index badcf7fc..badcf7fc 100644
--- a/test/twisted/account-manager/auto-connect.py
+++ b/tests/twisted/account-manager/auto-connect.py
diff --git a/test/twisted/account-manager/avatar-persist.py b/tests/twisted/account-manager/avatar-persist.py
index e1334435..e1334435 100644
--- a/test/twisted/account-manager/avatar-persist.py
+++ b/tests/twisted/account-manager/avatar-persist.py
diff --git a/test/twisted/account-manager/avatar-refresh.py b/tests/twisted/account-manager/avatar-refresh.py
index 7cc2d2c8..7cc2d2c8 100644
--- a/test/twisted/account-manager/avatar-refresh.py
+++ b/tests/twisted/account-manager/avatar-refresh.py
diff --git a/test/twisted/account-manager/avatar.py b/tests/twisted/account-manager/avatar.py
index c616e146..c616e146 100644
--- a/test/twisted/account-manager/avatar.py
+++ b/tests/twisted/account-manager/avatar.py
diff --git a/test/twisted/account-manager/bad-cm.py b/tests/twisted/account-manager/bad-cm.py
index dea5860a..dea5860a 100644
--- a/test/twisted/account-manager/bad-cm.py
+++ b/tests/twisted/account-manager/bad-cm.py
diff --git a/test/twisted/account-manager/create-auto-connect.py b/tests/twisted/account-manager/create-auto-connect.py
index fa2cb470..fa2cb470 100644
--- a/test/twisted/account-manager/create-auto-connect.py
+++ b/tests/twisted/account-manager/create-auto-connect.py
diff --git a/test/twisted/account-manager/create-twice.py b/tests/twisted/account-manager/create-twice.py
index 2f0c0e0c..2f0c0e0c 100644
--- a/test/twisted/account-manager/create-twice.py
+++ b/tests/twisted/account-manager/create-twice.py
diff --git a/test/twisted/account-manager/create-with-properties.py b/tests/twisted/account-manager/create-with-properties.py
index 5aabfc76..5aabfc76 100644
--- a/test/twisted/account-manager/create-with-properties.py
+++ b/tests/twisted/account-manager/create-with-properties.py
diff --git a/test/twisted/account-manager/device-idle.py b/tests/twisted/account-manager/device-idle.py
index 089a0661..089a0661 100644
--- a/test/twisted/account-manager/device-idle.py
+++ b/tests/twisted/account-manager/device-idle.py
diff --git a/test/twisted/account-manager/enable-auto-connect.py b/tests/twisted/account-manager/enable-auto-connect.py
index 2cb91c31..2cb91c31 100644
--- a/test/twisted/account-manager/enable-auto-connect.py
+++ b/tests/twisted/account-manager/enable-auto-connect.py
diff --git a/test/twisted/account-manager/enable.py b/tests/twisted/account-manager/enable.py
index 50e489d1..50e489d1 100644
--- a/test/twisted/account-manager/enable.py
+++ b/tests/twisted/account-manager/enable.py
diff --git a/test/twisted/account-manager/make-valid.py b/tests/twisted/account-manager/make-valid.py
index 17d58049..17d58049 100644
--- a/test/twisted/account-manager/make-valid.py
+++ b/tests/twisted/account-manager/make-valid.py
diff --git a/test/twisted/account-manager/nickname.py b/tests/twisted/account-manager/nickname.py
index 8e2fe799..8e2fe799 100644
--- a/test/twisted/account-manager/nickname.py
+++ b/tests/twisted/account-manager/nickname.py
diff --git a/test/twisted/account-manager/param-types.py b/tests/twisted/account-manager/param-types.py
index 8dafd7f1..8dafd7f1 100644
--- a/test/twisted/account-manager/param-types.py
+++ b/tests/twisted/account-manager/param-types.py
diff --git a/test/twisted/account-manager/presence.py b/tests/twisted/account-manager/presence.py
index abef3b00..abef3b00 100755
--- a/test/twisted/account-manager/presence.py
+++ b/tests/twisted/account-manager/presence.py
diff --git a/test/twisted/account-manager/reconnect.py b/tests/twisted/account-manager/reconnect.py
index 0c6ea3ad..0c6ea3ad 100644
--- a/test/twisted/account-manager/reconnect.py
+++ b/tests/twisted/account-manager/reconnect.py
diff --git a/test/twisted/account-manager/recover-from-disconnect.py b/tests/twisted/account-manager/recover-from-disconnect.py
index aba60598..aba60598 100644
--- a/test/twisted/account-manager/recover-from-disconnect.py
+++ b/tests/twisted/account-manager/recover-from-disconnect.py
diff --git a/test/twisted/account-manager/request-online.py b/tests/twisted/account-manager/request-online.py
index 83f34f43..83f34f43 100644
--- a/test/twisted/account-manager/request-online.py
+++ b/tests/twisted/account-manager/request-online.py
diff --git a/test/twisted/account-manager/server-drops-us.py b/tests/twisted/account-manager/server-drops-us.py
index b4db423f..b4db423f 100644
--- a/test/twisted/account-manager/server-drops-us.py
+++ b/tests/twisted/account-manager/server-drops-us.py
diff --git a/test/twisted/account-manager/service.py b/tests/twisted/account-manager/service.py
index f7df9903..f7df9903 100644
--- a/test/twisted/account-manager/service.py
+++ b/tests/twisted/account-manager/service.py
diff --git a/test/twisted/account-manager/update-parameters.py b/tests/twisted/account-manager/update-parameters.py
index 347a3135..347a3135 100644
--- a/test/twisted/account-manager/update-parameters.py
+++ b/tests/twisted/account-manager/update-parameters.py
diff --git a/test/twisted/account-requests/cancel.py b/tests/twisted/account-requests/cancel.py
index d5776ae6..d5776ae6 100644
--- a/test/twisted/account-requests/cancel.py
+++ b/tests/twisted/account-requests/cancel.py
diff --git a/test/twisted/account-requests/create-text.py b/tests/twisted/account-requests/create-text.py
index 6488f99c..6488f99c 100644
--- a/test/twisted/account-requests/create-text.py
+++ b/tests/twisted/account-requests/create-text.py
diff --git a/test/twisted/account-requests/delete-account-during-request.py b/tests/twisted/account-requests/delete-account-during-request.py
index dd24fe4c..dd24fe4c 100644
--- a/test/twisted/account-requests/delete-account-during-request.py
+++ b/tests/twisted/account-requests/delete-account-during-request.py
diff --git a/test/twisted/account-storage/default-keyring-storage.py b/tests/twisted/account-storage/default-keyring-storage.py
index 5d066d6a..5d066d6a 100644
--- a/test/twisted/account-storage/default-keyring-storage.py
+++ b/tests/twisted/account-storage/default-keyring-storage.py
diff --git a/test/twisted/account-storage/diverted-storage.py b/tests/twisted/account-storage/diverted-storage.py
index 46b66b1b..46b66b1b 100644
--- a/test/twisted/account-storage/diverted-storage.py
+++ b/tests/twisted/account-storage/diverted-storage.py
diff --git a/test/twisted/account-storage/libaccounts-sso-storage.py b/tests/twisted/account-storage/libaccounts-sso-storage.py
index c6b68b6c..c6b68b6c 100644
--- a/test/twisted/account-storage/libaccounts-sso-storage.py
+++ b/tests/twisted/account-storage/libaccounts-sso-storage.py
diff --git a/test/twisted/account/addressing.py b/tests/twisted/account/addressing.py
index 84faae99..84faae99 100755
--- a/test/twisted/account/addressing.py
+++ b/tests/twisted/account/addressing.py
diff --git a/test/twisted/accounts/README b/tests/twisted/accounts/README
index 27bd48fd..27bd48fd 100644
--- a/test/twisted/accounts/README
+++ b/tests/twisted/accounts/README
diff --git a/test/twisted/capabilities/contact-caps.py b/tests/twisted/capabilities/contact-caps.py
index 7a348df0..7a348df0 100644
--- a/test/twisted/capabilities/contact-caps.py
+++ b/tests/twisted/capabilities/contact-caps.py
diff --git a/test/twisted/capabilities/draft-1.py b/tests/twisted/capabilities/draft-1.py
index 4924e74b..4924e74b 100644
--- a/test/twisted/capabilities/draft-1.py
+++ b/tests/twisted/capabilities/draft-1.py
diff --git a/test/twisted/capabilities/legacy-caps.py b/tests/twisted/capabilities/legacy-caps.py
index 81d99ab6..81d99ab6 100644
--- a/test/twisted/capabilities/legacy-caps.py
+++ b/tests/twisted/capabilities/legacy-caps.py
diff --git a/test/twisted/chandlers/README b/tests/twisted/chandlers/README
index 2980ceba..2980ceba 100644
--- a/test/twisted/chandlers/README
+++ b/tests/twisted/chandlers/README
diff --git a/test/twisted/constants.py b/tests/twisted/constants.py
index dbedd44b..dbedd44b 100644
--- a/test/twisted/constants.py
+++ b/tests/twisted/constants.py
diff --git a/test/twisted/crash-recovery/crash-recovery.py b/tests/twisted/crash-recovery/crash-recovery.py
index da632949..da632949 100644
--- a/test/twisted/crash-recovery/crash-recovery.py
+++ b/tests/twisted/crash-recovery/crash-recovery.py
diff --git a/test/twisted/dispatcher/already-has-channel.py b/tests/twisted/dispatcher/already-has-channel.py
index e744425a..e744425a 100644
--- a/test/twisted/dispatcher/already-has-channel.py
+++ b/tests/twisted/dispatcher/already-has-channel.py
diff --git a/test/twisted/dispatcher/already-has-obsolete.py b/tests/twisted/dispatcher/already-has-obsolete.py
index 05dcb115..05dcb115 100644
--- a/test/twisted/dispatcher/already-has-obsolete.py
+++ b/tests/twisted/dispatcher/already-has-obsolete.py
diff --git a/test/twisted/dispatcher/approver-fails.py b/tests/twisted/dispatcher/approver-fails.py
index 67ce36a3..67ce36a3 100644
--- a/test/twisted/dispatcher/approver-fails.py
+++ b/tests/twisted/dispatcher/approver-fails.py
diff --git a/test/twisted/dispatcher/bypass-approval.py b/tests/twisted/dispatcher/bypass-approval.py
index 0655a9a9..0655a9a9 100644
--- a/test/twisted/dispatcher/bypass-approval.py
+++ b/tests/twisted/dispatcher/bypass-approval.py
diff --git a/test/twisted/dispatcher/bypass-observers.py b/tests/twisted/dispatcher/bypass-observers.py
index d8b02660..d8b02660 100644
--- a/test/twisted/dispatcher/bypass-observers.py
+++ b/tests/twisted/dispatcher/bypass-observers.py
diff --git a/test/twisted/dispatcher/cancel.py b/tests/twisted/dispatcher/cancel.py
index f47a297c..f47a297c 100644
--- a/test/twisted/dispatcher/cancel.py
+++ b/tests/twisted/dispatcher/cancel.py
diff --git a/test/twisted/dispatcher/capture-bundle.py b/tests/twisted/dispatcher/capture-bundle.py
index de773844..de773844 100644
--- a/test/twisted/dispatcher/capture-bundle.py
+++ b/tests/twisted/dispatcher/capture-bundle.py
diff --git a/test/twisted/dispatcher/connect-for-request.py b/tests/twisted/dispatcher/connect-for-request.py
index 5cbb9757..5cbb9757 100644
--- a/test/twisted/dispatcher/connect-for-request.py
+++ b/tests/twisted/dispatcher/connect-for-request.py
diff --git a/test/twisted/dispatcher/create-at-startup.py b/tests/twisted/dispatcher/create-at-startup.py
index ceec48bd..ceec48bd 100644
--- a/test/twisted/dispatcher/create-at-startup.py
+++ b/tests/twisted/dispatcher/create-at-startup.py
diff --git a/test/twisted/dispatcher/create-delayed-by-mini-plugin.py b/tests/twisted/dispatcher/create-delayed-by-mini-plugin.py
index b99e29f5..b99e29f5 100644
--- a/test/twisted/dispatcher/create-delayed-by-mini-plugin.py
+++ b/tests/twisted/dispatcher/create-delayed-by-mini-plugin.py
diff --git a/test/twisted/dispatcher/create-delayed-by-plugin.py b/tests/twisted/dispatcher/create-delayed-by-plugin.py
index 8a37d228..8a37d228 100644
--- a/test/twisted/dispatcher/create-delayed-by-plugin.py
+++ b/tests/twisted/dispatcher/create-delayed-by-plugin.py
diff --git a/test/twisted/dispatcher/create-handler-fails.py b/tests/twisted/dispatcher/create-handler-fails.py
index c5ab0967..c5ab0967 100644
--- a/test/twisted/dispatcher/create-handler-fails.py
+++ b/tests/twisted/dispatcher/create-handler-fails.py
diff --git a/test/twisted/dispatcher/create-hints.py b/tests/twisted/dispatcher/create-hints.py
index 9894276a..9894276a 100644
--- a/test/twisted/dispatcher/create-hints.py
+++ b/tests/twisted/dispatcher/create-hints.py
diff --git a/test/twisted/dispatcher/create-no-preferred-handler.py b/tests/twisted/dispatcher/create-no-preferred-handler.py
index 15579b01..15579b01 100644
--- a/test/twisted/dispatcher/create-no-preferred-handler.py
+++ b/tests/twisted/dispatcher/create-no-preferred-handler.py
diff --git a/test/twisted/dispatcher/create-rejected-by-mini-plugin.py b/tests/twisted/dispatcher/create-rejected-by-mini-plugin.py
index 2f517589..2f517589 100644
--- a/test/twisted/dispatcher/create-rejected-by-mini-plugin.py
+++ b/tests/twisted/dispatcher/create-rejected-by-mini-plugin.py
diff --git a/test/twisted/dispatcher/create-text.py b/tests/twisted/dispatcher/create-text.py
index 0a05f9d0..0a05f9d0 100644
--- a/test/twisted/dispatcher/create-text.py
+++ b/tests/twisted/dispatcher/create-text.py
diff --git a/test/twisted/dispatcher/created-behind-our-back.py b/tests/twisted/dispatcher/created-behind-our-back.py
index 55d1b4b0..55d1b4b0 100644
--- a/test/twisted/dispatcher/created-behind-our-back.py
+++ b/tests/twisted/dispatcher/created-behind-our-back.py
diff --git a/test/twisted/dispatcher/dispatch-activatable.py b/tests/twisted/dispatcher/dispatch-activatable.py
index cb7b9cb1..cb7b9cb1 100644
--- a/test/twisted/dispatcher/dispatch-activatable.py
+++ b/tests/twisted/dispatcher/dispatch-activatable.py
diff --git a/test/twisted/dispatcher/dispatch-before-connected.py b/tests/twisted/dispatcher/dispatch-before-connected.py
index 9925e0fe..9925e0fe 100644
--- a/test/twisted/dispatcher/dispatch-before-connected.py
+++ b/tests/twisted/dispatcher/dispatch-before-connected.py
diff --git a/test/twisted/dispatcher/dispatch-delayed-by-mini-plugin.py b/tests/twisted/dispatcher/dispatch-delayed-by-mini-plugin.py
index 50bc8033..50bc8033 100644
--- a/test/twisted/dispatcher/dispatch-delayed-by-mini-plugin.py
+++ b/tests/twisted/dispatcher/dispatch-delayed-by-mini-plugin.py
diff --git a/test/twisted/dispatcher/dispatch-delayed-by-plugin.py b/tests/twisted/dispatcher/dispatch-delayed-by-plugin.py
index 24a47092..24a47092 100644
--- a/test/twisted/dispatcher/dispatch-delayed-by-plugin.py
+++ b/tests/twisted/dispatcher/dispatch-delayed-by-plugin.py
diff --git a/test/twisted/dispatcher/dispatch-obsolete.py b/tests/twisted/dispatcher/dispatch-obsolete.py
index 4431631a..4431631a 100644
--- a/test/twisted/dispatcher/dispatch-obsolete.py
+++ b/tests/twisted/dispatcher/dispatch-obsolete.py
diff --git a/test/twisted/dispatcher/dispatch-rejected-by-mini-plugin.py b/tests/twisted/dispatcher/dispatch-rejected-by-mini-plugin.py
index eeb6e9ec..eeb6e9ec 100644
--- a/test/twisted/dispatcher/dispatch-rejected-by-mini-plugin.py
+++ b/tests/twisted/dispatcher/dispatch-rejected-by-mini-plugin.py
diff --git a/test/twisted/dispatcher/dispatch-rejected-by-plugin.py b/tests/twisted/dispatcher/dispatch-rejected-by-plugin.py
index 272eac37..272eac37 100644
--- a/test/twisted/dispatcher/dispatch-rejected-by-plugin.py
+++ b/tests/twisted/dispatcher/dispatch-rejected-by-plugin.py
diff --git a/test/twisted/dispatcher/dispatch-text.py b/tests/twisted/dispatcher/dispatch-text.py
index b1f6ce60..b1f6ce60 100644
--- a/test/twisted/dispatcher/dispatch-text.py
+++ b/tests/twisted/dispatcher/dispatch-text.py
diff --git a/test/twisted/dispatcher/ensure-and-redispatch.py b/tests/twisted/dispatcher/ensure-and-redispatch.py
index 42e60c5d..42e60c5d 100644
--- a/test/twisted/dispatcher/ensure-and-redispatch.py
+++ b/tests/twisted/dispatcher/ensure-and-redispatch.py
diff --git a/test/twisted/dispatcher/ensure-is-approval.py b/tests/twisted/dispatcher/ensure-is-approval.py
index a2fb0850..a2fb0850 100644
--- a/test/twisted/dispatcher/ensure-is-approval.py
+++ b/tests/twisted/dispatcher/ensure-is-approval.py
diff --git a/test/twisted/dispatcher/ensure-rapidly.py b/tests/twisted/dispatcher/ensure-rapidly.py
index 17be46a5..17be46a5 100644
--- a/test/twisted/dispatcher/ensure-rapidly.py
+++ b/tests/twisted/dispatcher/ensure-rapidly.py
diff --git a/test/twisted/dispatcher/exploding-bundles.py b/tests/twisted/dispatcher/exploding-bundles.py
index a62a7009..a62a7009 100644
--- a/test/twisted/dispatcher/exploding-bundles.py
+++ b/tests/twisted/dispatcher/exploding-bundles.py
diff --git a/test/twisted/dispatcher/fdo-21034.py b/tests/twisted/dispatcher/fdo-21034.py
index 4766631a..4766631a 100644
--- a/test/twisted/dispatcher/fdo-21034.py
+++ b/tests/twisted/dispatcher/fdo-21034.py
diff --git a/test/twisted/dispatcher/handle-channels-fails.py b/tests/twisted/dispatcher/handle-channels-fails.py
index 04b51ef7..04b51ef7 100644
--- a/test/twisted/dispatcher/handle-channels-fails.py
+++ b/tests/twisted/dispatcher/handle-channels-fails.py
diff --git a/test/twisted/dispatcher/lose-text.py b/tests/twisted/dispatcher/lose-text.py
index d652658c..d652658c 100644
--- a/test/twisted/dispatcher/lose-text.py
+++ b/tests/twisted/dispatcher/lose-text.py
diff --git a/test/twisted/dispatcher/recover-from-disconnect.py b/tests/twisted/dispatcher/recover-from-disconnect.py
index 9ae81e51..9ae81e51 100644
--- a/test/twisted/dispatcher/recover-from-disconnect.py
+++ b/tests/twisted/dispatcher/recover-from-disconnect.py
diff --git a/test/twisted/dispatcher/request-disabled-account.py b/tests/twisted/dispatcher/request-disabled-account.py
index 325961db..325961db 100644
--- a/test/twisted/dispatcher/request-disabled-account.py
+++ b/tests/twisted/dispatcher/request-disabled-account.py
diff --git a/test/twisted/dispatcher/respawn-activatable-observers.py b/tests/twisted/dispatcher/respawn-activatable-observers.py
index 8f83ffbb..8f83ffbb 100644
--- a/test/twisted/dispatcher/respawn-activatable-observers.py
+++ b/tests/twisted/dispatcher/respawn-activatable-observers.py
diff --git a/test/twisted/dispatcher/respawn-observers.py b/tests/twisted/dispatcher/respawn-observers.py
index 73847bec..73847bec 100644
--- a/test/twisted/dispatcher/respawn-observers.py
+++ b/tests/twisted/dispatcher/respawn-observers.py
diff --git a/test/twisted/dispatcher/undispatchable.py b/tests/twisted/dispatcher/undispatchable.py
index 35b5f44f..35b5f44f 100644
--- a/test/twisted/dispatcher/undispatchable.py
+++ b/tests/twisted/dispatcher/undispatchable.py
diff --git a/test/twisted/dispatcher/vanishing-client.py b/tests/twisted/dispatcher/vanishing-client.py
index 92a4079b..92a4079b 100644
--- a/test/twisted/dispatcher/vanishing-client.py
+++ b/tests/twisted/dispatcher/vanishing-client.py
diff --git a/test/twisted/fakeclient.py b/tests/twisted/fakeclient.py
index d3c43813..d3c43813 100644
--- a/test/twisted/fakeclient.py
+++ b/tests/twisted/fakeclient.py
diff --git a/test/twisted/fakecm.py b/tests/twisted/fakecm.py
index fb534e7b..fb534e7b 100644
--- a/test/twisted/fakecm.py
+++ b/tests/twisted/fakecm.py
diff --git a/test/twisted/mc-debug-server.c b/tests/twisted/mc-debug-server.c
index 3bcbc4d0..3bcbc4d0 100644
--- a/test/twisted/mc-debug-server.c
+++ b/tests/twisted/mc-debug-server.c
diff --git a/test/twisted/mcp-account-diversion.c b/tests/twisted/mcp-account-diversion.c
index 0994e25d..0994e25d 100644
--- a/test/twisted/mcp-account-diversion.c
+++ b/tests/twisted/mcp-account-diversion.c
diff --git a/test/twisted/mcp-dbus-caller-permission.c b/tests/twisted/mcp-dbus-caller-permission.c
index 96162baf..96162baf 100644
--- a/test/twisted/mcp-dbus-caller-permission.c
+++ b/tests/twisted/mcp-dbus-caller-permission.c
diff --git a/test/twisted/mcp-plugin.c b/tests/twisted/mcp-plugin.c
index 53aa1731..53aa1731 100644
--- a/test/twisted/mcp-plugin.c
+++ b/tests/twisted/mcp-plugin.c
diff --git a/test/twisted/mctest.py b/tests/twisted/mctest.py
index e67b8cd1..e67b8cd1 100644
--- a/test/twisted/mctest.py
+++ b/tests/twisted/mctest.py
diff --git a/test/twisted/servicetest.py b/tests/twisted/servicetest.py
index 700c05ad..700c05ad 100644
--- a/test/twisted/servicetest.py
+++ b/tests/twisted/servicetest.py
diff --git a/test/twisted/telepathy/clients/AbiWord.client b/tests/twisted/telepathy/clients/AbiWord.client
index 2ec84949..2ec84949 100644
--- a/test/twisted/telepathy/clients/AbiWord.client
+++ b/tests/twisted/telepathy/clients/AbiWord.client
diff --git a/test/twisted/telepathy/clients/Logger.client b/tests/twisted/telepathy/clients/Logger.client
index b46d0d51..b46d0d51 100644
--- a/test/twisted/telepathy/clients/Logger.client
+++ b/tests/twisted/telepathy/clients/Logger.client
diff --git a/test/twisted/telepathy/clients/README b/tests/twisted/telepathy/clients/README
index 7b725bf9..7b725bf9 100644
--- a/test/twisted/telepathy/clients/README
+++ b/tests/twisted/telepathy/clients/README
diff --git a/test/twisted/telepathy/managers/README b/tests/twisted/telepathy/managers/README
index d77437cb..d77437cb 100644
--- a/test/twisted/telepathy/managers/README
+++ b/tests/twisted/telepathy/managers/README
diff --git a/test/twisted/telepathy/managers/fakecm.manager b/tests/twisted/telepathy/managers/fakecm.manager
index 23a074e5..23a074e5 100644
--- a/test/twisted/telepathy/managers/fakecm.manager
+++ b/tests/twisted/telepathy/managers/fakecm.manager
diff --git a/test/twisted/telepathy/managers/onewitheverything.manager b/tests/twisted/telepathy/managers/onewitheverything.manager
index 222daddb..222daddb 100644
--- a/test/twisted/telepathy/managers/onewitheverything.manager
+++ b/tests/twisted/telepathy/managers/onewitheverything.manager
diff --git a/test/twisted/test-plugin.c b/tests/twisted/test-plugin.c
index 89171a32..89171a32 100644
--- a/test/twisted/test-plugin.c
+++ b/tests/twisted/test-plugin.c
diff --git a/tests/twisted/tools/Client.AbiWord.service.in b/tests/twisted/tools/Client.AbiWord.service.in
new file mode 100644
index 00000000..300bd5b0
--- /dev/null
+++ b/tests/twisted/tools/Client.AbiWord.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.Telepathy.Client.AbiWord
+Exec=/bin/sh @abs_top_srcdir@/tests/twisted/tools/fake-startup.sh org.freedesktop.Telepathy.Client.AbiWord
diff --git a/tests/twisted/tools/Client.Logger.service.in b/tests/twisted/tools/Client.Logger.service.in
new file mode 100644
index 00000000..9fd4bfb1
--- /dev/null
+++ b/tests/twisted/tools/Client.Logger.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.Telepathy.Client.Logger
+Exec=/bin/sh @abs_top_srcdir@/tests/twisted/tools/fake-startup.sh org.freedesktop.Telepathy.Client.Logger
diff --git a/test/twisted/tools/Makefile.am b/tests/twisted/tools/Makefile.am
index 57ba5045..57ba5045 100644
--- a/test/twisted/tools/Makefile.am
+++ b/tests/twisted/tools/Makefile.am
diff --git a/test/twisted/tools/MissionControl5.service.in b/tests/twisted/tools/MissionControl5.service.in
index 8967b3e3..e8f41c41 100644
--- a/test/twisted/tools/MissionControl5.service.in
+++ b/tests/twisted/tools/MissionControl5.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.freedesktop.Telepathy.MissionControl5
-Exec=@abs_top_builddir@/test/twisted/tools/exec-with-log.sh
+Exec=@abs_top_builddir@/tests/twisted/tools/exec-with-log.sh
diff --git a/test/twisted/tools/exec-with-log.sh.in b/tests/twisted/tools/exec-with-log.sh.in
index 73f3a3d2..0b40a24b 100644
--- a/test/twisted/tools/exec-with-log.sh.in
+++ b/tests/twisted/tools/exec-with-log.sh.in
@@ -18,7 +18,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA
 
-cd "@abs_top_builddir@/test/twisted/tools"
+cd "@abs_top_builddir@/tests/twisted/tools"
 
 ulimit -c unlimited
 exec > missioncontrol-$$.log 2>&1
@@ -37,7 +37,7 @@ if test -n "$MISSIONCONTROL_TEST_VALGRIND"; then
 	MISSIONCONTROL_WRAPPER="valgrind --leak-check=full --num-callers=20"
 	MISSIONCONTROL_WRAPPER="$MISSIONCONTROL_WRAPPER --track-origins=yes"
 	MISSIONCONTROL_WRAPPER="$MISSIONCONTROL_WRAPPER -v"
-	MISSIONCONTROL_WRAPPER="$MISSIONCONTROL_WRAPPER --suppressions=@abs_top_srcdir@/test/twisted/tools/valgrind.supp"
+	MISSIONCONTROL_WRAPPER="$MISSIONCONTROL_WRAPPER --suppressions=@abs_top_srcdir@/tests/twisted/tools/valgrind.supp"
 	MISSIONCONTROL_WRAPPER="$MISSIONCONTROL_WRAPPER --gen-suppressions=all"
 	MISSIONCONTROL_WRAPPER="$MISSIONCONTROL_WRAPPER --show-reachable=yes"
 elif test -n "$MISSIONCONTROL_TEST_REFDBG"; then
@@ -51,7 +51,7 @@ elif test -n "$MISSIONCONTROL_TEST_REFDBG"; then
 fi
 
 if test "z$MC_EXECUTABLE" = z; then
-        MC_EXECUTABLE=@abs_top_builddir@/test/twisted/mc-debug-server
+        MC_EXECUTABLE=@abs_top_builddir@/tests/twisted/mc-debug-server
 fi
 
 if test -f "$MC_ACCOUNT_DIR/gnome-keyring-env"; then
diff --git a/test/twisted/tools/fake-startup.sh b/tests/twisted/tools/fake-startup.sh
index d571c015..d571c015 100644
--- a/test/twisted/tools/fake-startup.sh
+++ b/tests/twisted/tools/fake-startup.sh
diff --git a/test/twisted/tools/tmp-session-bus.conf.in b/tests/twisted/tools/tmp-session-bus.conf.in
index 0fca3770..84d8d656 100644
--- a/test/twisted/tools/tmp-session-bus.conf.in
+++ b/tests/twisted/tools/tmp-session-bus.conf.in
@@ -10,7 +10,7 @@
 
   <listen>unix:tmpdir=/tmp</listen>
 
-  <servicedir>@abs_top_builddir@/test/twisted/tools</servicedir>
+  <servicedir>@abs_top_builddir@/tests/twisted/tools</servicedir>
 
   <policy context="default">
     <!-- Allow everything to be sent -->
diff --git a/test/twisted/tools/valgrind.supp b/tests/twisted/tools/valgrind.supp
index 1a87dd31..1a87dd31 100644
--- a/test/twisted/tools/valgrind.supp
+++ b/tests/twisted/tools/valgrind.supp
diff --git a/test/twisted/tools/with-session-bus.sh b/tests/twisted/tools/with-session-bus.sh
index 987b9cde..987b9cde 100644
--- a/test/twisted/tools/with-session-bus.sh
+++ b/tests/twisted/tools/with-session-bus.sh
diff --git a/test/value-is-same.c b/tests/value-is-same.c
index 0b64032f..0b64032f 100644
--- a/test/value-is-same.c
+++ b/tests/value-is-same.c