diff --git a/CMakeLists.txt b/CMakeLists.txt
index 14720ab6..e085e1b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,7 +79,7 @@ list(REMOVE_ITEM SOURCES ${MAIN_SOURCE_FILE})
 add_library(clang-umllib OBJECT ${SOURCES})
 
 add_executable(clang-uml ${MAIN_SOURCE_FILE})
-target_link_libraries(clang-uml ${LIBCLANG_LIBRARIES} ${YAML_CPP_LIBRARIES} cppast clang-umllib ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(clang-uml ${LIBCLANG_LIBRARIES} ${YAML_CPP_LIBRARIES} cppast clang-umllib Threads::Threads)
 
 target_compile_features(clang-uml PRIVATE cxx_std_17)
 
diff --git a/packaging/debian/rules b/packaging/debian/rules
index 758e58b2..785bf144 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -4,7 +4,7 @@ export DH_VERBOSE=1
 export CLANGUML_GIT_TOPLEVEL_DIR=$(CURDIR)
 
 override_dh_auto_configure:
-	dh_auto_configure --buildsystem=cmake -- -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_REQUIRED_LIBRARIES="pthread"
+	dh_auto_configure --buildsystem=cmake -- -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=/usr
 
 
 %:
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e8165f01..0a9031ed 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -10,130 +10,54 @@ file(GLOB_RECURSE TEST_CASE_SOURCES t*/*.cc)
 file(GLOB_RECURSE TEST_CASE_CONFIGS t*/.clang-uml)
 file(GLOB_RECURSE TEST_CONFIG_YMLS test_config_data/*.yml)
 
-set(CLANG_UML_TEST_UTIL_SRC
-    test_util.cc
-    ${TEST_UTIL_SOURCES}
-)
-set(CLANG_UML_TEST_UTIL_HEADER
-    catch.h
-)
+set(CLANG_UML_TEST_LIBRARIES
+        ${LIBCLANG_LIBRARIES}
+        ${YAML_CPP_LIBRARIES}
+        clang-umllib
+        cppast
+        Threads::Threads)
 
-set(CLANG_UML_TEST_MODEL_SRC
-        test_model.cc
-        ${TEST_MODEL_SOURCES}
-        )
-set(CLANG_UML_TEST_MODEL_HEADER
-        catch.h
-        )
+set(CLANG_UML_TEST_UTIL_SRC test_util.cc ${TEST_UTIL_SOURCES})
+set(CLANG_UML_TEST_UTIL_HEADER catch.h)
 
-set(CLANG_UML_TEST_CASES_SRC
-    test_cases.cc
-    ${TEST_CASE_SOURCES}
-)
-set(CLANG_UML_TEST_CASES_HEADER
-    catch.h
-)
+set(CLANG_UML_TEST_MODEL_SRC test_model.cc ${TEST_MODEL_SOURCES})
+set(CLANG_UML_TEST_MODEL_HEADER catch.h)
 
-set(CLANG_UML_TEST_DECORATOR_PARSER_SRC
-    test_decorator_parser.cc
-    ${TEST_UTIL_SOURCES}
-)
-set(CLANG_UML_TEST_DECORATOR_PARSER_HEADER
-    catch.h
-)
+set(CLANG_UML_TEST_CASES_SRC test_cases.cc ${TEST_CASE_SOURCES})
+set(CLANG_UML_TEST_CASES_HEADER catch.h)
 
-set(CLANG_UML_TEST_CONFIG_SRC
-        test_config.cc
-        ${TEST_UTIL_SOURCES}
-        )
-set(CLANG_UML_TEST_CONFIG_HEADER
-        catch.h
-        )
+set(CLANG_UML_TEST_DECORATOR_PARSER_SRC test_decorator_parser.cc ${TEST_UTIL_SOURCES})
+set(CLANG_UML_TEST_DECORATOR_PARSER_HEADER catch.h)
 
-set(CLANG_UML_TEST_FILTERS_SRC
-        test_filters.cc
-        ${TEST_FILTERS_SOURCES}
-        )
-set(CLANG_UML_TEST_FILTERS_HEADER
-        catch.h
-        )
+set(CLANG_UML_TEST_CONFIG_SRC test_config.cc ${TEST_UTIL_SOURCES})
+set(CLANG_UML_TEST_CONFIG_HEADER catch.h)
 
-set(CLANG_UML_TEST_THREAD_POOL_EXECUTOR_SRC
-        test_thread_pool_executor.cc
-        )
-set(CLANG_UML_TEST_THREAD_POOL_EXECUTOR_HEADER
-        catch.h
-        )
+set(CLANG_UML_TEST_FILTERS_SRC test_filters.cc ${TEST_FILTERS_SOURCES})
+set(CLANG_UML_TEST_FILTERS_HEADER catch.h)
 
-add_executable(test_util
-    ${CLANG_UML_TEST_UTIL_SRC}
-    ${CLANG_UML_TEST_UTIL_HEADER})
+set(CLANG_UML_TEST_THREAD_POOL_EXECUTOR_SRC test_thread_pool_executor.cc)
+set(CLANG_UML_TEST_THREAD_POOL_EXECUTOR_HEADER catch.h)
 
-target_link_libraries(test_util
-    PRIVATE
-    ${LIBCLANG_LIBRARIES}
-    ${YAML_CPP_LIBRARIES}
-    clang-umllib cppast ${CMAKE_THREAD_LIBS_INIT})
+add_executable(test_util ${CLANG_UML_TEST_UTIL_SRC} ${CLANG_UML_TEST_UTIL_HEADER})
+target_link_libraries(test_util PRIVATE ${CLANG_UML_TEST_LIBRARIES})
 
-add_executable(test_model
-    ${CLANG_UML_TEST_MODEL_SRC}
-    ${CLANG_UML_TEST_MODEL_HEADER})
+add_executable(test_model ${CLANG_UML_TEST_MODEL_SRC} ${CLANG_UML_TEST_MODEL_HEADER})
+target_link_libraries(test_model PRIVATE ${CLANG_UML_TEST_LIBRARIES})
 
-target_link_libraries(test_model
-    PRIVATE
-    ${LIBCLANG_LIBRARIES}
-    ${YAML_CPP_LIBRARIES}
-    clang-umllib cppast ${CMAKE_THREAD_LIBS_INIT})
+add_executable(test_decorator_parser ${CLANG_UML_TEST_DECORATOR_PARSER_SRC} ${CLANG_UML_TEST_DECORATOR_PARSER_HEADER})
+target_link_libraries(test_decorator_parser PRIVATE ${CLANG_UML_TEST_LIBRARIES})
 
-add_executable(test_decorator_parser
-    ${CLANG_UML_TEST_DECORATOR_PARSER_SRC}
-    ${CLANG_UML_TEST_DECORATOR_PARSER_HEADER})
+add_executable(test_config ${CLANG_UML_TEST_CONFIG_SRC} ${CLANG_UML_TEST_CONFIG_HEADER})
+target_link_libraries(test_config PRIVATE ${CLANG_UML_TEST_LIBRARIES})
 
-target_link_libraries(test_decorator_parser
-    PRIVATE
-    ${LIBCLANG_LIBRARIES}
-    ${YAML_CPP_LIBRARIES}
-    clang-umllib cppast ${CMAKE_THREAD_LIBS_INIT})
+add_executable(test_filters ${CLANG_UML_TEST_FILTERS_SRC} ${CLANG_UML_TEST_FILTERS_HEADER})
+target_link_libraries(test_filters PRIVATE ${CLANG_UML_TEST_LIBRARIES})
 
-add_executable(test_config
-    ${CLANG_UML_TEST_CONFIG_SRC}
-    ${CLANG_UML_TEST_CONFIG_HEADER})
+add_executable(test_thread_pool_executor ${CLANG_UML_TEST_THREAD_POOL_EXECUTOR_SRC} ${CLANG_UML_TEST_THREAD_POOL_EXECUTOR_HEADER})
+target_link_libraries(test_thread_pool_executor PRIVATE ${CLANG_UML_TEST_LIBRARIES})
 
-target_link_libraries(test_config
-    PRIVATE
-    ${LIBCLANG_LIBRARIES}
-    ${YAML_CPP_LIBRARIES}
-    clang-umllib cppast ${CMAKE_THREAD_LIBS_INIT})
-
-add_executable(test_filters
-    ${CLANG_UML_TEST_FILTERS_SRC}
-    ${CLANG_UML_TEST_FILTERS_HEADER})
-
-target_link_libraries(test_filters
-    PRIVATE
-    ${LIBCLANG_LIBRARIES}
-    ${YAML_CPP_LIBRARIES}
-    clang-umllib cppast ${CMAKE_THREAD_LIBS_INIT})
-
-add_executable(test_thread_pool_executor
-    ${CLANG_UML_TEST_THREAD_POOL_EXECUTOR_SRC}
-    ${CLANG_UML_TEST_THREAD_POOL_EXECUTOR_HEADER})
-
-target_link_libraries(test_thread_pool_executor
-    PRIVATE
-    ${LIBCLANG_LIBRARIES}
-    ${YAML_CPP_LIBRARIES}
-    clang-umllib cppast ${CMAKE_THREAD_LIBS_INIT})
-
-add_executable(test_cases
-    ${CLANG_UML_TEST_CASES_SRC}
-    ${CLANG_UML_TEST_CASES_HEADER})
-
-target_link_libraries(test_cases
-    PRIVATE
-    ${LIBCLANG_LIBRARIES}
-    ${YAML_CPP_LIBRARIES}
-    clang-umllib cppast ${CMAKE_THREAD_LIBS_INIT})
+add_executable(test_cases ${CLANG_UML_TEST_CASES_SRC} ${CLANG_UML_TEST_CASES_HEADER})
+target_link_libraries(test_cases PRIVATE ${CLANG_UML_TEST_LIBRARIES})
 
 foreach(TEST_CASE_CONFIG ${TEST_CASE_CONFIGS})
     file(RELATIVE_PATH