diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 0e5ad81a17b7..d250789cd3e3 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -16,7 +16,7 @@ jobs:
           - os: windows-2016
             standard: 11
           - os: windows-2019
-            standard: 14
+            standard: 17
           - os: windows-2016
             platform: Win32
             build_type: Debug
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index fb9207466154..c50bb398d77c 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -17,12 +17,9 @@ else ()
   target_compile_definitions(gmock PUBLIC GTEST_HAS_PTHREAD=0)
 endif ()
 
-target_compile_definitions(gmock PUBLIC GTEST_LANG_CXX11=0)
+target_compile_definitions(gmock PUBLIC GTEST_LANG_CXX11=1)
 
 if (MSVC)
-  # Workaround a bug in implementation of variadic templates in MSVC11.
-  target_compile_definitions(gmock PUBLIC _VARIADIC_MAX=10)
-  
   # Disable MSVC warnings of _CRT_INSECURE_DEPRECATE functions.
   target_compile_definitions(gmock PRIVATE _CRT_SECURE_NO_WARNINGS)
   if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -31,11 +28,6 @@ if (MSVC)
   endif ()
 endif ()
 
-# GTest doesn't detect <tuple> with clang.
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-  target_compile_definitions(gmock PUBLIC GTEST_USE_OWN_TR1_TUPLE=1)
-endif ()
-
 # Silence MSVC tr1 deprecation warning in gmock.
 target_compile_definitions(gmock
   PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING=1)