diff --git a/deps.json b/deps.json
index 473c5148b..9c812c149 100644
--- a/deps.json
+++ b/deps.json
@@ -6,7 +6,7 @@
       "subrepo" : "llvm-mirror/llvm",
       "branch" : "master",
       "subdir" : "third_party/llvm",
-      "commit" : "ef0e051c6d035ff067d4f73fa2ed90bacfaafbae"
+      "commit" : "e35805b8192297a81e795573614274b904785a7d"
     },
     {
       "name" : "clang",
@@ -14,7 +14,7 @@
       "subrepo" : "llvm-mirror/clang",
       "branch" : "master",
       "subdir" : "third_party/clang",
-      "commit" : "44019e8c500fba0cece458d2e44700c967f247c9"
+      "commit" : "834a93f953ac6789f39dbeb86d8144f847807353"
     },
     {
       "name" : "SPIRV-Headers",
diff --git a/kokoro/scripts/windows/build.bat b/kokoro/scripts/windows/build.bat
index 6f4195a5c..f53a1d884 100644
--- a/kokoro/scripts/windows/build.bat
+++ b/kokoro/scripts/windows/build.bat
@@ -19,8 +19,11 @@ set SRC=%cd%\github\clspv
 set BUILD_TYPE=%1
 set VS_VERSION=%2
 
-:: Force usage of python 3.6
-set PATH=C:\python36;%PATH%
+choco install cmake --pre --yes --no-progress
+choco upgrade cmake --pre --yes --no-progress
+
+:: Force usage of python 3.6 and add cmake to the path.
+set PATH=C:\python36;"C:\Program Files\CMake\bin";%PATH%
 
 cd %SRC%
 python utils/fetch_sources.py
@@ -29,15 +32,12 @@ python utils/fetch_sources.py
 :: set up msvc build env
 :: #########################################
 if %VS_VERSION% == 2017 (
-  call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
   set GENERATOR="Visual Studio 15 2017 Win64"
   echo "Using VS 2017..."
 ) else if %VS_VERSION% == 2015 (
-  call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
   set GENERATOR="Visual Studio 14 2015 Win64"
   echo "Using VS 2015..."
 ) else if %VS_VERSION% == 2013 (
-  call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x64
   set GENERATOR="Visual Studio 12 2013 Win64"
   echo "Using VS 2013..."
 )
@@ -56,7 +56,7 @@ if "%KOKORO_GITHUB_COMMIT%." == "." (
   set BUILD_SHA=%KOKORO_GITHUB_COMMIT%
 )
 
-cmake -G%GENERATOR% -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DLLVM_TARGETS_TO_BUILD="" ..
+cmake -G%GENERATOR% -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DLLVM_TARGETS_TO_BUILD="" .. -Thost=x64
 
 if %ERRORLEVEL% GEQ 1 exit /b %ERRORLEVEL%
 
diff --git a/kokoro/windows-msvc-2015-release/build.bat b/kokoro/windows-msvc-2015-release/build.bat
deleted file mode 100644
index 79f71c817..000000000
--- a/kokoro/windows-msvc-2015-release/build.bat
+++ /dev/null
@@ -1,21 +0,0 @@
-:: Copyright 2018 The Clspv Authors. All rights reserved.
-::
-:: 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 out the directory of the common build script.
-set SCRIPT_DIR=%~dp0
-
-:: Call with correct parameter
-call %SCRIPT_DIR%\..\scripts\windows\build.bat Release 2015
diff --git a/kokoro/windows-msvc-2015-release/continuous.cfg b/kokoro/windows-msvc-2015-release/continuous.cfg
deleted file mode 100644
index 3c231d055..000000000
--- a/kokoro/windows-msvc-2015-release/continuous.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2018 The Clspv Authors. All rights reserved.
-#
-# 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: "clspv/kokoro/windows-msvc-2015-release/build.bat"
diff --git a/kokoro/windows-msvc-2015-release/presubmit.cfg b/kokoro/windows-msvc-2015-release/presubmit.cfg
deleted file mode 100644
index 3c231d055..000000000
--- a/kokoro/windows-msvc-2015-release/presubmit.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2018 The Clspv Authors. All rights reserved.
-#
-# 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: "clspv/kokoro/windows-msvc-2015-release/build.bat"