diff --git a/wscript b/wscript
index 078a9bf..b5e60a8 100644
--- a/wscript
+++ b/wscript
@@ -29,11 +29,14 @@
                uselib = 'BOOST BOOST_IOSTREAMS SSL'
                )
 
-    bld.program (target="testapp",
-                 source = "test/testapp.cc",
+    # Unit tests
+    bld.program (target="utit-tests",
+                 source = bld.path.ant_glob(['test/**/*.cc']),
                  features=['cxx', 'cxxprogram'],
                  use = 'BOOST_TEST sync')
 
+
+# doxygen docs
 from waflib.Build import BuildContext
 class doxy (BuildContext):
     cmd = "doxygen"