--- a/ui/tests/CMakeLists.txt	Fri Mar 14 09:48:56 2014 +0000
+++ b/ui/tests/CMakeLists.txt	Fri Mar 14 15:25:47 2014 +0000
@@ -3,6 +3,13 @@
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..)
 
 find_package(Qt5Test)
+find_program(HIAWATHA_EXECUTABLE hiawatha)
+
+if (NOT HIAWATHA_EXECUTABLE)
+   message (STATUS "WARNING: hiawatha webserver not found. Downloader tests will fail.")
+else()
+  add_definitions(-DHIAWATHA_EXECUTABLE="${HIAWATHA_EXECUTABLE}")
+endif()
 
 macro(add_m13_test _source _additional_sources)
   set(_test ${_source})
@@ -18,5 +25,6 @@
 # so that it can be used in file names in the tests.
 add_definitions(-DSOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
 add_m13_test(certlistparsertest.cpp "${CERTIFICATELIST_SOURCES}")
+add_m13_test(downloadertest.cpp "${CMAKE_SOURCE_DIR}/ui/downloader.cpp")
 #add_m13_test(${CMAKE_SOURCE_DIR}/ui/main.cpp "${M13UI_SOURCES}")