diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index 7d7a8167308960..72935f862aa0a6 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -8,7 +8,7 @@ env:
 
 jobs:
   build-windows:
-    runs-on: windows-2016
+    runs-on: windows-2019
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ env.PYTHON_VERSION }}
diff --git a/vcbuild.bat b/vcbuild.bat
index 86788bd8608ae5..f43dbfb65a0984 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -244,7 +244,7 @@ if %target_arch%==x86 if %msvs_host_arch%==x86 set vcvarsall_arg=x86
 if defined target_env if "%target_env%" NEQ "vs2017" goto vs-set-2019
 echo Looking for Visual Studio 2017
 call tools\msvs\vswhere_usability_wrapper.cmd "[15.0,16.0)"
-if "_%VCINSTALLDIR%_" == "__" goto msbuild-not-found
+if "_%VCINSTALLDIR%_" == "__" goto vs-set-2019
 if defined msi (
   echo Looking for WiX installation for Visual Studio 2017...
   if not exist "%WIX%\SDK\VS2017" (