diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0519c85ba..4fbacec7b 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -20,5 +20,5 @@ add_custom_target (build_tests DEPENDS ${test_SRCS}
 
 foreach (src_FILE ${test_SRCS})
   add_executable (${src_FILE} "${src_FILE}.cpp" test.cpp)
-  target_link_libraries (${src_FILE} task commands columns ${TASK_LIBRARIES})
+  target_link_libraries (${src_FILE} task commands task columns ${TASK_LIBRARIES})
 endforeach (src_FILE)
diff --git a/test/json_test.cpp b/test/json_test.cpp
index 1639450da..77adf4ce2 100644
--- a/test/json_test.cpp
+++ b/test/json_test.cpp
@@ -26,6 +26,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <iostream>
+#include <string.h>
 #include <File.h>
 #include <JSON.h>
 #include <Context.h>
diff --git a/test/lexer.t.cpp b/test/lexer.t.cpp
index a0c2bcb78..d4dd51c76 100644
--- a/test/lexer.t.cpp
+++ b/test/lexer.t.cpp
@@ -27,7 +27,7 @@
 
 #include <Lexer.h>
 #include <Context.h>
-#include <Test.h>
+#include <test.h>
 
 Context context;