diff --git a/kokoro/scripts/windows/build.bat b/kokoro/scripts/windows/build.bat
index 807094e24..3b659764a 100644
--- a/kokoro/scripts/windows/build.bat
+++ b/kokoro/scripts/windows/build.bat
@@ -17,6 +17,7 @@
 set BUILD_ROOT=%cd%
 set SRC=%cd%\github\amber
 set BUILD_TYPE=%1
+set VS_VERSION=%2
 
 :: Force usage of python 3.12
 set PATH=C:\python312;%PATH%
@@ -29,8 +30,10 @@ python tools\git-sync-deps
 :: #########################################
 :: set up msvc build env
 :: #########################################
-call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
-echo "Using VS 2019..."
+if %VS_VERSION% == 2019 (
+  call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
+  echo "Using VS 2019..."
+)
 
 cmake --version
 
diff --git a/kokoro/windows-msvc-2017-debug/build.bat b/kokoro/windows-msvc-2017-debug/build.bat
deleted file mode 100644
index 2319b2a6d..000000000
--- a/kokoro/windows-msvc-2017-debug/build.bat
+++ /dev/null
@@ -1,20 +0,0 @@
-:: Copyright The Amber Authors.
-::
-:: Licensed under the Apache License, Version 2.0 (the "License");
-:: you may not use this file except in compliance with the License.
-:: You may obtain a copy of the License at
-::
-::     http://www.apache.org/licenses/LICENSE-2.0
-::
-:: Unless required by applicable law or agreed to in writing, software
-:: distributed under the License is distributed on an "AS IS" BASIS,
-:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-:: See the License for the specific language governing permissions and
-:: limitations under the License.
-
-@echo on
-
-:: Find the directory of the common build script.
-set SCRIPT_DIR=%~dp0
-
-call %SCRIPT_DIR%\..\scripts\windows\build.bat Debug
diff --git a/kokoro/windows-msvc-2017-debug/continuous.cfg b/kokoro/windows-msvc-2017-debug/continuous.cfg
deleted file mode 100644
index abb0eb288..000000000
--- a/kokoro/windows-msvc-2017-debug/continuous.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright The Amber Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-build_file: "amber/kokoro/windows-msvc-2017-debug/build.bat"
diff --git a/kokoro/windows-msvc-2017-debug/presubmit.cfg b/kokoro/windows-msvc-2017-debug/presubmit.cfg
deleted file mode 100644
index abb0eb288..000000000
--- a/kokoro/windows-msvc-2017-debug/presubmit.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright The Amber Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-build_file: "amber/kokoro/windows-msvc-2017-debug/build.bat"
diff --git a/kokoro/windows-msvc-2017-release/build.bat b/kokoro/windows-msvc-2017-release/build.bat
deleted file mode 100644
index 82d353cbe..000000000
--- a/kokoro/windows-msvc-2017-release/build.bat
+++ /dev/null
@@ -1,20 +0,0 @@
-:: Copyright The Amber Authors.
-::
-:: Licensed under the Apache License, Version 2.0 (the "License");
-:: you may not use this file except in compliance with the License.
-:: You may obtain a copy of the License at
-::
-::     http://www.apache.org/licenses/LICENSE-2.0
-::
-:: Unless required by applicable law or agreed to in writing, software
-:: distributed under the License is distributed on an "AS IS" BASIS,
-:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-:: See the License for the specific language governing permissions and
-:: limitations under the License.
-
-@echo on
-
-:: Find the directory of the common build script.
-set SCRIPT_DIR=%~dp0
-
-call %SCRIPT_DIR%\..\scripts\windows\build.bat RelWithDebInfo
diff --git a/kokoro/windows-msvc-2017-release/continuous.cfg b/kokoro/windows-msvc-2017-release/continuous.cfg
deleted file mode 100644
index 4830e5404..000000000
--- a/kokoro/windows-msvc-2017-release/continuous.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright The Amber Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-build_file: "amber/kokoro/windows-msvc-2017-release/build.bat"
diff --git a/kokoro/windows-msvc-2017-release/presubmit.cfg b/kokoro/windows-msvc-2017-release/presubmit.cfg
deleted file mode 100644
index 4830e5404..000000000
--- a/kokoro/windows-msvc-2017-release/presubmit.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright The Amber Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-build_file: "amber/kokoro/windows-msvc-2017-release/build.bat"
diff --git a/kokoro/windows-msvc-2019-debug/build.bat b/kokoro/windows-msvc-2019-debug/build.bat
index 2319b2a6d..2611fd433 100644
--- a/kokoro/windows-msvc-2019-debug/build.bat
+++ b/kokoro/windows-msvc-2019-debug/build.bat
@@ -17,4 +17,4 @@
 :: Find the directory of the common build script.
 set SCRIPT_DIR=%~dp0
 
-call %SCRIPT_DIR%\..\scripts\windows\build.bat Debug
+call %SCRIPT_DIR%\..\scripts\windows\build.bat Debug 2019
diff --git a/kokoro/windows-msvc-2019-release/build.bat b/kokoro/windows-msvc-2019-release/build.bat
index 82d353cbe..6a6aa0594 100644
--- a/kokoro/windows-msvc-2019-release/build.bat
+++ b/kokoro/windows-msvc-2019-release/build.bat
@@ -17,4 +17,5 @@
 :: Find the directory of the common build script.
 set SCRIPT_DIR=%~dp0
 
-call %SCRIPT_DIR%\..\scripts\windows\build.bat RelWithDebInfo
+call %SCRIPT_DIR%\..\scripts\windows\build.bat RelWithDebInfo 2019
+