diff --git a/plugins/debuggercommon/tests/debuggees/CMakeLists.txt b/plugins/debuggercommon/tests/debuggees/CMakeLists.txt
index 9d346f2e3b..add9292421 100644
--- a/plugins/debuggercommon/tests/debuggees/CMakeLists.txt
+++ b/plugins/debuggercommon/tests/debuggees/CMakeLists.txt
@@ -1,92 +1,94 @@
 function(add_debuggable_executable target)
     cmake_parse_arguments(add_debuggable_executable "" "" "SRCS" ${ARGN})
     add_executable(${target} ${add_debuggable_executable_SRCS})
 	ecm_mark_nongui_executable(${target})
     # force debug symbols for our debuggees, disable optimizations
     if (WIN32)
-        set(_flags "/0d")
+        # Avoid "cl : Command line warning D9025 : overriding '/O2' with '/Od'" warnings
+        # Thus set COMPILE_FLAGS_RELEASE instead of COMPILE_FLAGS
+        # COMPILE_FLAGS_DEBUG should already have the desired flags
+        set_target_properties(${target} PROPERTIES COMPILE_FLAGS_RELEASE "/DEBUG /Od")
     else()
-        set(_flags "-O0")
+        set_target_properties(${target} PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} -O0")
     endif()
-    set_target_properties(${target} PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} ${_flags}")
 endfunction()
 
 add_debuggable_executable(debuggee_debugee SRCS debugee.cpp)
 add_debuggable_executable(debuggee_debugeeslow SRCS debugeeslow.cpp)
 add_debuggable_executable(debuggee_crash SRCS debugeecrash.cpp)
 add_debuggable_executable(debuggee_debugeerecursion SRCS debugeerecursion.cpp)
 add_debuggable_executable(debuggee_debugeespace SRCS "debugee space.cpp")
 add_debuggable_executable(debuggee_debugeemultilocbreakpoint SRCS debugeemultilocbreakpoint.cpp)
 add_debuggable_executable(debuggee_debugeemultiplebreakpoint SRCS debugeemultiplebreakpoint.cpp)
 add_debuggable_executable(debuggee_debugeeechoenv SRCS debugeeechoenv.cpp)
 add_debuggable_executable(debuggee_debugeepath SRCS debugeepath.cpp)
 
 add_debuggable_executable(debuggee_debugeethreads SRCS debugeethreads.cpp)
 target_link_libraries(debuggee_debugeethreads Qt5::Core)
 
 add_debuggable_executable(debuggee_debugeeqt SRCS debugeeqt.cpp)
 target_link_libraries(debuggee_debugeeqt Qt5::Core)
 
 add_debuggable_executable(debuggee_debugeeexception SRCS debugeeexception.cpp)
 kde_target_enable_exceptions(debuggee_debugeeexception PRIVATE)
 
 if (HAVE_PATH_WITH_SPACES_TEST)
     add_subdirectory("path with space")
 endif()
 
 add_debuggable_executable(debuggee_qstring SRCS qstring.cpp)
 target_link_libraries(debuggee_qstring Qt5::Core)
 
 add_debuggable_executable(debuggee_qbytearray SRCS qbytearray.cpp)
 target_link_libraries(debuggee_qbytearray Qt5::Core)
 
 add_debuggable_executable(debuggee_qlistcontainer SRCS qlistcontainer.cpp)
 target_link_libraries(debuggee_qlistcontainer Qt5::Core)
 
 add_debuggable_executable(debuggee_qmapint SRCS qmapint.cpp)
 target_link_libraries(debuggee_qmapint Qt5::Core)
 
 add_debuggable_executable(debuggee_qmapstring SRCS qmapstring.cpp)
 target_link_libraries(debuggee_qmapstring Qt5::Core)
 
 add_debuggable_executable(debuggee_qmapstringbool SRCS qmapstringbool.cpp)
 target_link_libraries(debuggee_qmapstringbool Qt5::Core)
 
 add_debuggable_executable(debuggee_qdate SRCS qdate.cpp)
 target_link_libraries(debuggee_qdate Qt5::Core)
 
 add_debuggable_executable(debuggee_qtime SRCS qtime.cpp)
 target_link_libraries(debuggee_qtime Qt5::Core)
 
 add_debuggable_executable(debuggee_qdatetime SRCS qdatetime.cpp)
 target_link_libraries(debuggee_qdatetime Qt5::Core)
 
 add_debuggable_executable(debuggee_qurl SRCS qurl.cpp)
 target_link_libraries(debuggee_qurl Qt5::Core)
 
 add_debuggable_executable(debuggee_qhashint SRCS qhashint.cpp)
 target_link_libraries(debuggee_qhashint Qt5::Core)
 
 add_debuggable_executable(debuggee_qhashstring SRCS qhashstring.cpp)
 target_link_libraries(debuggee_qhashstring Qt5::Core)
 
 add_debuggable_executable(debuggee_qsetint SRCS qsetint.cpp)
 target_link_libraries(debuggee_qsetint Qt5::Core)
 
 add_debuggable_executable(debuggee_qsetstring SRCS qsetstring.cpp)
 target_link_libraries(debuggee_qsetstring Qt5::Core)
 
 add_debuggable_executable(debuggee_qchar SRCS qchar.cpp)
 target_link_libraries(debuggee_qchar Qt5::Core)
 
 add_debuggable_executable(debuggee_quuid SRCS quuid.cpp)
 target_link_libraries(debuggee_quuid Qt5::Core)
 
 add_debuggable_executable(debuggee_qlistpod SRCS qlistpod.cpp)
 target_link_libraries(debuggee_qlistpod Qt5::Core)
 
 add_debuggable_executable(debuggee_ktexteditortypes SRCS ktexteditortypes.cpp)
 target_link_libraries(debuggee_ktexteditortypes Qt5::Core KF5::TextEditor KDev::Util)
 
 add_debuggable_executable(debuggee_kdeveloptypes SRCS kdeveloptypes.cpp)
 target_link_libraries(debuggee_kdeveloptypes Qt5::Core KF5::TextEditor KDev::Util)