diff --git a/ci/windows-presubmit.bat b/ci/windows-presubmit.bat
index 765bd127..cce732b3 100644
--- a/ci/windows-presubmit.bat
+++ b/ci/windows-presubmit.bat
@@ -19,6 +19,7 @@ IF %errorlevel% neq 0 EXIT /B 1
 SET CMAKE_BUILD_PATH=cmake_msvc2022
 MKDIR %CMAKE_BUILD_PATH%
 CD %CMAKE_BUILD_PATH%
+SET CXXFLAGS="/WX"
 
 %CMAKE_BIN% %GTEST_ROOT% ^
   -G "Visual Studio 17 2022" ^
@@ -37,6 +38,7 @@ IF %errorlevel% neq 0 EXIT /B 1
 %CTEST_BIN% -C Debug --timeout 600
 IF %errorlevel% neq 0 EXIT /B 1
 
+SET "CXXFLAGS="
 CD %GTEST_ROOT%
 RMDIR /S /Q %CMAKE_BUILD_PATH%
 
diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake
index 4ce3717f..ea68cfb9 100644
--- a/googletest/cmake/internal_utils.cmake
+++ b/googletest/cmake/internal_utils.cmake
@@ -77,7 +77,7 @@ macro(config_compiler_and_linker)
 
     # Newlines inside flags variables break CMake's NMake generator.
     # TODO(vladl@google.com): Add -RTCs and -RTCu to debug builds.
-    set(cxx_base_flags "-GS -W4 -WX -wd4251 -wd4275 -nologo -J")
+    set(cxx_base_flags "-GS -W4 -wd4251 -wd4275 -nologo -J")
     set(cxx_base_flags "${cxx_base_flags} -D_UNICODE -DUNICODE -DWIN32 -D_WIN32")
     set(cxx_base_flags "${cxx_base_flags} -DSTRICT -DWIN32_LEAN_AND_MEAN")
     set(cxx_exception_flags "-EHsc -D_HAS_EXCEPTIONS=1")