4 files changed, 6 insertions, 3 deletions
diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index f653758..60c0c09 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -77,6 +77,9 @@ telepathy_logger_debug_LDADD = \
 telepathy_logger_debug_LDFLAGS = -export-dynamic
 
 AM_CFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/tests \
+	-I$(top_builddir) \
 	$(ERROR_CFLAGS)	\
 	${TPL_CFLAGS}
 
diff --git a/tests/twisted/main-debug.c b/tests/twisted/main-debug.c
index 870fb66..4a343f6 100644
--- a/tests/twisted/main-debug.c
+++ b/tests/twisted/main-debug.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "../tpl-channel-test.h"
+#include <tpl-channel-test.h>
 
 #include <stdlib.h>
 
diff --git a/tests/twisted/tools/Makefile.am b/tests/twisted/tools/Makefile.am
index adbe42d..466ca33 100644
--- a/tests/twisted/tools/Makefile.am
+++ b/tests/twisted/tools/Makefile.am
@@ -13,7 +13,7 @@ exec-with-log.sh: exec-with-log.sh.in
 # Don't use the full filename for the .in if > 99 character: >99 char filenames
 # in tarballs are non-portable (and automake 1.8 doesn't let us build
 # non-archaic tarballs)
-service_in_files = org.freedesktop.Telepathy.Client.TelepathyLogger.service.in
+service_in_files = org.freedesktop.Telepathy.Client.Logger.service.in
 service_files = $(service_in_files:.service.in=.service)
 
 # D-Bus config file for testing
diff --git a/tests/twisted/tools/org.freedesktop.Telepathy.Client.TelepathyLogger.service.in b/tests/twisted/tools/org.freedesktop.Telepathy.Client.Logger.service.in
index dea0473..3deff28 100644
--- a/tests/twisted/tools/org.freedesktop.Telepathy.Client.TelepathyLogger.service.in
+++ b/tests/twisted/tools/org.freedesktop.Telepathy.Client.Logger.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.freedesktop.Telepathy.Client.TelepathyLogger
+Name=org.freedesktop.Telepathy.Client.Logger
 Exec=@abs_top_builddir@/tests/twisted/tools/exec-with-log.sh