diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 9b4ce42..b2998da 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -40,10 +40,12 @@ file(GLOB sources CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/source/*.cpp)
 add_executable(GreeterTests ${sources})
 target_link_libraries(GreeterTests doctest Greeter)
 
+set_target_properties(GreeterTests PROPERTIES CXX_STANDARD 17)
+
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-  set_target_properties(GreeterTests PROPERTIES CXX_STANDARD 17 COMPILE_FLAGS "-Wall -pedantic -Wextra -Werror")
-else()
-  set_target_properties(GreeterTests PROPERTIES CXX_STANDARD 17)
+  target_compile_options(GreeterTests PRIVATE -Wall -pedantic -Wextra -Werror)
+elseif(MSVC)
+  target_compile_options(GreeterTests PRIVATE /W4)
 endif()
 
 # ---- Add GreeterTests ----