diff --git a/config/RConfigure.in b/config/RConfigure.in
index 6642e67fff376..a0e683ede7a8a 100644
--- a/config/RConfigure.in
+++ b/config/RConfigure.in
@@ -24,7 +24,7 @@
 #define ROOT__cplusplus @__cplusplus@
 #if defined(__cplusplus) && (__cplusplus != ROOT__cplusplus)
 # if defined(_MSC_VER)
-#  pragma message("The C++ standard in this build does not match ROOT configuration (@__cplusplus@); this might cause unexpected issues. And please make sure you are using the -Zc:__cplusplus compilation flag")
+#  pragma message(__FILE__ ": Warning: The C++ standard in this build does not match ROOT configuration (@__cplusplus@); this might cause unexpected issues. And please make sure you are using the -Zc:__cplusplus compilation flag")
 # else
 #  warning "The C++ standard in this build does not match ROOT configuration (@__cplusplus@); this might cause unexpected issues"
 # endif
diff --git a/roottest/CMakeLists.txt b/roottest/CMakeLists.txt
index b80cc81fd2c31..6353f94955119 100644
--- a/roottest/CMakeLists.txt
+++ b/roottest/CMakeLists.txt
@@ -3,7 +3,6 @@ if(MSVC)
   set(CMAKE_SUPPRESS_REGENERATION TRUE)
   set(libsuffix .dll)
   set(exesuffix .exe)
-  set(CMAKE_CXX_FLAGS "/nologo /Zc:__cplusplus /MD /GR /EHsc- /W3 /D_WIN32")
   set(grep_cmd "findstr")
 
   set(build_config "--config $<CONFIG>")
@@ -22,7 +21,6 @@ if(MSVC)
     set(WILLFAIL_ON_WIN32 WILLFAIL)
   endif()
 
-  set(CMAKE_CXX_FLAGS ${ROOT_CXX_FLAGS})
   # ROOT_BINDIR is set by ROOTConfig.cmake
   set(ROOT_CONFIG_EXECUTABLE ${ROOT_BINDIR}/root-config.bat)
   execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--prefix" OUTPUT_VARIABLE ROOTSYS RESULT_VARIABLE RETVAR OUTPUT_STRIP_TRAILING_WHITESPACE)