diff --git a/ADSL/src/CMakeLists.txt b/ADSL/src/CMakeLists.txt
index d4fc2ea7..68dff07b 100644
--- a/ADSL/src/CMakeLists.txt
+++ b/ADSL/src/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
 
+find_package(Threads ${THREADS_PACKAGE_CONFIG})
 add_library(ADSL SHARED
     DirectiveRouter.cpp
     DirectiveSequencer.cpp
@@ -9,5 +10,6 @@ target_include_directories(ADSL PUBLIC
     "${ADSL_SOURCE_DIR}/include"
     "${AVSCommon_INCLUDE_DIRS}")
 target_link_libraries(ADSL
+    ${CMAKE_THREAD_LIBS_INIT}
     AVSCommon
     AVSUtils)
diff --git a/AVSCommon/test/CMakeLists.txt b/AVSCommon/test/CMakeLists.txt
index 0ff5e3a3..2614f85b 100644
--- a/AVSCommon/test/CMakeLists.txt
+++ b/AVSCommon/test/CMakeLists.txt
@@ -1,6 +1,9 @@
 cmake_minimum_required(VERSION 3.0)
 
+find_package(Threads ${THREADS_PACKAGE_CONFIG})
+
 set(INCLUDES "${AVSCommon_SOURCE_DIR}/include" "${AVSUtils_SOURCE_DIR}/include" "${ACL_SOURCE_DIR}/ACL/include"
         "${ACL_SOURCE_DIR}/test" "${RAPIDJSON_INCLUDE_DIR}")
 
-discover_unit_tests("${INCLUDES}" AVSCommon)
+set(LIBRARIES AVSCommon ${CMAKE_THREAD_LIBS_INIT})
+discover_unit_tests("${INCLUDES}" "${LIBRARIES}")
diff --git a/AVSUtils/src/CMakeLists.txt b/AVSUtils/src/CMakeLists.txt
index 09900ba3..0b78bf11 100644
--- a/AVSUtils/src/CMakeLists.txt
+++ b/AVSUtils/src/CMakeLists.txt
@@ -1,6 +1,7 @@
 find_package(CURL ${CURL_PACKAGE_CONFIG})
+find_package(Threads ${THREADS_PACKAGE_CONFIG})
 
 file(GLOB_RECURSE AVSUtils_SRC "${AVSUtils_SOURCE_DIR}/src/*.cpp")
 add_library(AVSUtils SHARED ${AVSUtils_SRC})
 target_include_directories(AVSUtils PUBLIC ${CURL_INCLUDE_DIRS} "${AVSUtils_SOURCE_DIR}/include")
-target_link_libraries(AVSUtils ${CURL_LIBRARIES})
+target_link_libraries(AVSUtils ${CURL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
diff --git a/AVSUtils/test/CMakeLists.txt b/AVSUtils/test/CMakeLists.txt
index 963c6848..15ed9646 100644
--- a/AVSUtils/test/CMakeLists.txt
+++ b/AVSUtils/test/CMakeLists.txt
@@ -1 +1,5 @@
-discover_unit_tests("${AVSUtils_SOURCE_DIR}/include" AVSUtils)
+find_package(Threads ${THREADS_PACKAGE_CONFIG})
+
+set(LIBRARIES AVSUtils ${CMAKE_THREAD_LIBS_INIT})
+
+discover_unit_tests("${AVSUtils_SOURCE_DIR}/include" "${LIBRARIES}")