diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 05b0223f4..d593a7a9d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,44 +1,45 @@
 set(SRCROOT "${PROJECT_SOURCE_DIR}/test/src")
 
-include_directories("${PROJECT_SOURCE_DIR}/include")
-include_directories("${PROJECT_SOURCE_DIR}/extlibs/headers")
-include_directories("${SRCROOT}/TestUtilities")
+add_library(sfml-test-main STATIC "${SRCROOT}/CatchMain.cpp")
+target_include_directories(sfml-test-main PUBLIC "${PROJECT_SOURCE_DIR}/extlibs/headers" "${SRCROOT}/TestUtilities")
+target_compile_features(sfml-test-main PRIVATE cxx_std_17)
 
 # System is always built
 SET(SYSTEM_SRC
-    "${SRCROOT}/CatchMain.cpp"
     "${SRCROOT}/System/Vector2.cpp"
     "${SRCROOT}/System/Vector3.cpp"
     "${SRCROOT}/TestUtilities/SystemUtil.hpp"
     "${SRCROOT}/TestUtilities/SystemUtil.cpp"
 )
-sfml_add_test(test-sfml-system "${SYSTEM_SRC}"  sfml-system)
+
+sfml_add_test(test-sfml-system "${SYSTEM_SRC}" sfml-system)
+target_link_libraries(test-sfml-system PRIVATE sfml-test-main)
 
 if(SFML_BUILD_WINDOW)
     SET(WINDOW_SRC
-        "${SRCROOT}/CatchMain.cpp"
         "${SRCROOT}/TestUtilities/WindowUtil.hpp"
         "${SRCROOT}/TestUtilities/WindowUtil.cpp"
     )
     sfml_add_test(test-sfml-window "${WINDOW_SRC}" sfml-window)
+    target_link_libraries(test-sfml-window PRIVATE sfml-test-main)
 endif()
 
 if(SFML_BUILD_GRAPHICS)
     SET(GRAPHICS_SRC
-        "${SRCROOT}/CatchMain.cpp"
         "${SRCROOT}/Graphics/Rect.cpp"
         "${SRCROOT}/TestUtilities/GraphicsUtil.hpp"
         "${SRCROOT}/TestUtilities/GraphicsUtil.cpp"
     )
     sfml_add_test(test-sfml-graphics "${GRAPHICS_SRC}" sfml-graphics)
+    target_link_libraries(test-sfml-graphics PRIVATE sfml-test-main)
 endif()
 
 if(SFML_BUILD_NETWORK)
     SET(NETWORK_SRC
-        "${SRCROOT}/CatchMain.cpp"
         "${SRCROOT}/Network/Packet.cpp"
     )
     sfml_add_test(test-sfml-network "${NETWORK_SRC}" sfml-network)
+    target_link_libraries(test-sfml-network PRIVATE sfml-test-main)
 endif()
 
 # Automatically run the tests at the end of the build