diff --git a/configure.ac b/configure.ac
index 53a095f8..899d4744 100644
--- a/configure.ac
+++ b/configure.ac
@@ -213,6 +213,7 @@ AC_CONFIG_FILES([
 	examples/c/Makefile
 	examples/c++-lib/Makefile
 	dbus/Makefile
+	dbus/testsuite/Makefile
 	server/Makefile
 	client/Makefile
 	client/utils/Makefile
diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 560b02f3..9c0456a2 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -2,6 +2,8 @@
 # Makefile.am for snapper/dbus
 #
 
+SUBDIRS = . testsuite
+
 AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
 
 noinst_LTLIBRARIES = libdbus.la
diff --git a/dbus/testsuite/.gitignore b/dbus/testsuite/.gitignore
new file mode 100644
index 00000000..85f0d0bb
--- /dev/null
+++ b/dbus/testsuite/.gitignore
@@ -0,0 +1,5 @@
+*.log
+*.o
+*.test
+*.trs
+test-suite.log
diff --git a/dbus/testsuite/Makefile.am b/dbus/testsuite/Makefile.am
new file mode 100644
index 00000000..52ec8242
--- /dev/null
+++ b/dbus/testsuite/Makefile.am
@@ -0,0 +1,14 @@
+#
+# Makefile.am for snapper/dbus/testsuite
+#
+
+AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
+
+LDADD = ../../snapper/libsnapper.la ../libdbus.la -lboost_unit_test_framework
+
+check_PROGRAMS = escape.test
+
+TESTS = $(check_PROGRAMS)
+
+AM_DEFAULT_SOURCE_EXT = .cc
+
diff --git a/testsuite/dbus-escape.cc b/dbus/testsuite/escape.cc
similarity index 100%
rename from testsuite/dbus-escape.cc
rename to dbus/testsuite/escape.cc
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index ccb84d37..4ae904b7 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
 LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework
 
 check_PROGRAMS = sysconfig-get1.test dirname1.test basename1.test 		\
-	equal-date.test dbus-escape.test cmp-lt.test humanstring.test uuid.test	\
+	equal-date.test cmp-lt.test humanstring.test uuid.test			\
 	table.test table-formatter.test csv-formatter.test json-formatter.test	\
 	getopts.test scan-datetime.test root-prefix.test range.test limit.test