diff --git a/cmake/doc/CMakeLists.txt b/cmake/doc/CMakeLists.txt
index 807af60c..2bb720bd 100644
--- a/cmake/doc/CMakeLists.txt
+++ b/cmake/doc/CMakeLists.txt
@@ -137,17 +137,20 @@ configure_file(${CMAKE_SOURCE_DIR}/../doc/dbus-daemon.1.xml.in ${CMAKE_BINARY_DI
 configure_file(${CMAKE_SOURCE_DIR}/../doc/dbus-launch.1.xml.in ${CMAKE_BINARY_DIR}/doc/dbus-launch.1.xml)
 configure_file(${CMAKE_SOURCE_DIR}/../doc/dbus-monitor.1.xml.in ${CMAKE_BINARY_DIR}/doc/dbus-monitor.1.xml)
 configure_file(${CMAKE_SOURCE_DIR}/../doc/dbus-send.1.xml.in ${CMAKE_BINARY_DIR}/doc/dbus-send.1.xml)
+configure_file(${CMAKE_SOURCE_DIR}/../doc/dbus-test-tool.1.xml.in ${CMAKE_BINARY_DIR}/doc/dbus-test-tool.1.xml)
 configure_file(${CMAKE_SOURCE_DIR}/../doc/dbus-uuidgen.1.xml.in ${CMAKE_BINARY_DIR}/doc/dbus-uuidgen.1.xml)
 DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-cleanup-sockets.1.xml html-nochunks)
 DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-daemon.1.xml html-nochunks)
 DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-launch.1.xml html-nochunks)
 DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-monitor.1.xml html-nochunks)
 DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-send.1.xml html-nochunks)
+DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-test-tool.1.xml html-nochunks)
 DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-uuidgen.1.xml html-nochunks)
 if (UNIX)
   DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-daemon.1.xml man)
   DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-monitor.1.xml man)
   DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-send.1.xml man)
+  DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-test-tool.1.xml man)
   DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-launch.1.xml man)
   DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-uuidgen.1.xml man)
   DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-cleanup-sockets.1.xml man)
diff --git a/cmake/tools/CMakeLists.txt b/cmake/tools/CMakeLists.txt
index d4eeb708..8ba35891 100644
--- a/cmake/tools/CMakeLists.txt
+++ b/cmake/tools/CMakeLists.txt
@@ -14,6 +14,15 @@ set (dbus_monitor_SOURCES
 	../../tools/tool-common.h
 )
 
+set (dbus_test_tool_SOURCES
+	../../tools/dbus-echo.c
+	../../tools/dbus-spam.c
+	../../tools/tool-common.c
+	../../tools/tool-common.h
+	../../tools/test-tool.c
+	../../tools/test-tool.h
+)
+
 if (WIN32)
 set (dbus_launch_SOURCES
 	../../tools/dbus-launch-win.c
@@ -39,6 +48,10 @@ add_executable(dbus-send ${dbus_send_SOURCES})
 target_link_libraries(dbus-send ${DBUS_LIBRARIES})
 install_targets(/bin dbus-send )
 
+add_executable(dbus-test-tool ${dbus_test_tool_SOURCES})
+target_link_libraries(dbus-test-tool ${DBUS_LIBRARIES})
+install_targets(/bin dbus-test-tool )
+
 add_executable(dbus-launch ${dbus_launch_SOURCES})
 target_link_libraries(dbus-launch )
 if (DBUS_BUILD_X11)