diff --git a/cmake/Macros.cmake b/cmake/Macros.cmake
index b705ec3d8..286103ef6 100644
--- a/cmake/Macros.cmake
+++ b/cmake/Macros.cmake
@@ -268,9 +268,6 @@ macro(sfml_add_example target)
         add_executable(${target} ${target_input})
     endif()
 
-    # enable C++17 support
-    target_compile_features(${target} PUBLIC cxx_std_17)
-
     set_file_warnings(${target_input})
 
     # set the debug suffix
@@ -308,16 +305,11 @@ function(sfml_add_test target SOURCES DEPENDS)
     # create the target
     add_executable(${target} ${SOURCES})
 
-    # enable C++17 support
-    target_compile_features(${target} PUBLIC cxx_std_17)
-
     # set the target's folder (for IDEs that support it, e.g. Visual Studio)
     set_target_properties(${target} PROPERTIES FOLDER "Tests")
 
     # link the target to its SFML dependencies
-    if(DEPENDS)
-        target_link_libraries(${target} PRIVATE ${DEPENDS})
-    endif()
+    target_link_libraries(${target} PRIVATE ${DEPENDS})
 
     # Add the test
     add_test(${target} ${target})