diff --git a/Makefile.am b/Makefile.am
index 60fe178..be70526 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,8 @@
 # Generic definitions
-SUBDIRS = lib doc utils test-tool examples
+SUBDIRS = lib doc utils examples
+if BUILD_TEST_TOOL
+SUBDIRS += test-tool
+endif
 if BUILD_TESTS
 SUBDIRS += tests
 endif
diff --git a/configure.ac b/configure.ac
index 69cefd5..b95a5d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,6 +47,14 @@ AC_ARG_ENABLE([manpages],
 AM_CONDITIONAL(BUILD_MANPAGES,
                [expr "$ENABLE_MANPAGES" : yes > /dev/null 2>&1])
 
+AC_ARG_ENABLE([test_tool],
+              [AC_HELP_STRING([--enable-test-tool],
+                              [Enable building test-tool (to test a remote server)])],
+              [ENABLE_TEST_TOOL=$enableval],
+              [ENABLE_TEST_TOOL=yes])
+AM_CONDITIONAL([BUILD_TEST_TOOL],
+               [expr "$ENABLE_TEST_TOOL" : yes > /dev/null 2>&1])
+
 AC_ARG_ENABLE([tests],
               [AC_HELP_STRING([--enable-tests],
                               [Enable building tests])],