diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd373e9c..d6850aa5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ if (WIN32)
 else()
     set(Boost_USE_STATIC_LIBS ON)
     set(Boost_USE_MULTITHREADED ON)
-    find_package(Boost REQUIRED COMPONENTS filesystem program_options system)
+    find_package(Boost REQUIRED COMPONENTS coroutine context thread filesystem program_options system)
     include_directories(${Boost_INCLUDE_DIRS})
     link_directories(${Boost_LIBRARY_DIR})
 
@@ -20,7 +20,7 @@ else()
     find_package(Threads)
 
     set(CMAKE_CXX_FLAGS
-      "${CMAKE_CXX_FLAGS} -g -std=c++11 -Wall /Wextra /Wpedantic /Wconversion -Wno-unused-variable")
+      "${CMAKE_CXX_FLAGS} -g -std=c++11 -Wall -Wextra -Wpedantic -Wconversion -Wno-unused-variable")
 endif()
 
 message ("cxx Flags: " ${CMAKE_CXX_FLAGS})
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1b4a4a42..6c8bb2b7 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -14,5 +14,5 @@ add_executable (lib-tests
 )
 
 if (NOT WIN32)
-    target_link_libraries(core-tests ${Boost_LIBRARIES})
+    target_link_libraries(lib-tests ${Boost_LIBRARIES})
 endif()
diff --git a/test/http/CMakeLists.txt b/test/http/CMakeLists.txt
index 420bf509..f3959b5b 100644
--- a/test/http/CMakeLists.txt
+++ b/test/http/CMakeLists.txt
@@ -30,7 +30,7 @@ add_executable (http-tests
 )
 
 if (NOT WIN32)
-    target_link_libraries(http-tests ${Boost_LIBRARIES})
+    target_link_libraries(http-tests ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
 endif()
 
 add_executable (bench-tests
@@ -39,3 +39,7 @@ add_executable (bench-tests
     nodejs_parser.cpp
     parser_bench.cpp
 )
+
+if (NOT WIN32)
+    target_link_libraries(bench-tests ${Boost_LIBRARIES})
+endif()