diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a4cac75..51a8252b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,6 +136,8 @@ IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
     ADD_DEFINITIONS("-DSFMT_MEXP=19937")
 ENDIF()
 
+FIND_PACKAGE(Threads REQUIRED)
+
 # Find Qt5
 OPTION(UPDATE_TRANSLATIONS "Update translations on compile" OFF)
 MESSAGE(STATUS "UPDATE TRANSLATIONS: ${UPDATE_TRANSLATIONS}")
diff --git a/servatrice/CMakeLists.txt b/servatrice/CMakeLists.txt
index 0c20e54e..37360bef 100644
--- a/servatrice/CMakeLists.txt
+++ b/servatrice/CMakeLists.txt
@@ -85,11 +85,11 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 ADD_EXECUTABLE(servatrice MACOSX_BUNDLE ${servatrice_SOURCES} ${servatrice_RESOURCES_RCC} ${servatrice_MOC_SRCS})
 
 if(MSVC)
-    TARGET_LINK_LIBRARIES(servatrice cockatrice_common ${CMAKE_THREAD_LIBS_INIT} ${SERVATRICE_QT_MODULES} Qt5::WinMain)
+    TARGET_LINK_LIBRARIES(servatrice cockatrice_common Threads::Threads ${SERVATRICE_QT_MODULES} Qt5::WinMain)
 elseif(CMAKE_HOST_SYSTEM MATCHES "FreeBSD")
-    TARGET_LINK_LIBRARIES(servatrice cockatrice_common ${CMAKE_THREAD_LIBS_INIT} ${SERVATRICE_QT_MODULES} ${LIBEXECINFO_LIBRARY})
+    TARGET_LINK_LIBRARIES(servatrice cockatrice_common Threads::Threads ${SERVATRICE_QT_MODULES} ${LIBEXECINFO_LIBRARY})
 else()
-    TARGET_LINK_LIBRARIES(servatrice cockatrice_common ${CMAKE_THREAD_LIBS_INIT} ${SERVATRICE_QT_MODULES})
+    TARGET_LINK_LIBRARIES(servatrice cockatrice_common Threads::Threads ${SERVATRICE_QT_MODULES})
 endif()
 
 # install rules
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8635bda3..aed3d14d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -42,8 +42,8 @@ set(TEST_QT_MODULES Qt5::Widgets)
 
 
 include_directories(${GTEST_INCLUDE_DIRS})
-target_link_libraries(dummy_test ${GTEST_BOTH_LIBRARIES})
-target_link_libraries(expression_test cockatrice_common ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
+target_link_libraries(dummy_test Threads::Threads ${GTEST_BOTH_LIBRARIES})
+target_link_libraries(expression_test cockatrice_common Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
 
 add_subdirectory(carddatabase)
 add_subdirectory(loading_from_clipboard)
diff --git a/tests/carddatabase/CMakeLists.txt b/tests/carddatabase/CMakeLists.txt
index 8d8d255e..aec3f247 100644
--- a/tests/carddatabase/CMakeLists.txt
+++ b/tests/carddatabase/CMakeLists.txt
@@ -28,9 +28,9 @@ endif()
 find_package(Qt5 COMPONENTS Concurrent Network Widgets Svg REQUIRED)
 set(TEST_QT_MODULES Qt5::Concurrent Qt5::Network Qt5::Widgets Qt5::Svg)
 
-target_link_libraries(carddatabase_test ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
-target_link_libraries(filter_string_test ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
+target_link_libraries(carddatabase_test Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
+target_link_libraries(filter_string_test Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
 
 
 add_test(NAME carddatabase_test COMMAND carddatabase_test)
-add_test(NAME filter_string_test COMMAND filter_string_test)
\ No newline at end of file
+add_test(NAME filter_string_test COMMAND filter_string_test)
diff --git a/tests/loading_from_clipboard/CMakeLists.txt b/tests/loading_from_clipboard/CMakeLists.txt
index ddd49756..c778fb7b 100644
--- a/tests/loading_from_clipboard/CMakeLists.txt
+++ b/tests/loading_from_clipboard/CMakeLists.txt
@@ -12,5 +12,5 @@ endif()
 find_package(Qt5 COMPONENTS Concurrent Network Widgets REQUIRED)
 set(TEST_QT_MODULES Qt5::Concurrent Qt5::Network Qt5::Widgets)
 
-target_link_libraries(loading_from_clipboard_test cockatrice_common ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
+target_link_libraries(loading_from_clipboard_test cockatrice_common Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
 add_test(NAME loading_from_clipboard_test COMMAND loading_from_clipboard_test)