diff --git a/clang/utils/ci/buildkite-pipeline.yml b/clang/utils/ci/buildkite-pipeline.yml
--- a/clang/utils/ci/buildkite-pipeline.yml
+++ b/clang/utils/ci/buildkite-pipeline.yml
@@ -31,7 +31,7 @@
 
   - wait
 
-  - label: "Building and testing clang"
+  - label: "Building and testing clang (Linux)"
     commands:
       - "clang/utils/ci/run-buildbot build-clang"
     agents:
@@ -42,6 +42,18 @@
           limit: 2
     timeout_in_minutes: 120
 
+  - label: "Building and testing clang (Windows)"
+    commands:
+      - "C:\\BuildTools\\Common7\\Tools\\VsDevCmd.bat -arch=amd64 -host_arch=amd64"
+      - "bash clang/utils/ci/run-buildbot build-clang-windows"
+    agents:
+      queue: "windows"
+    retry:
+      automatic:
+        - exit_status: -1  # Agent was lost
+          limit: 2
+    timeout_in_minutes: 120
+
   - wait
 
   - label: "Running libc++ test suite in C++03"
diff --git a/clang/utils/ci/run-buildbot b/clang/utils/ci/run-buildbot
--- a/clang/utils/ci/run-buildbot
+++ b/clang/utils/ci/run-buildbot
@@ -95,6 +95,21 @@
 
     ninja -C ${BUILD_DIR} check-clang
 ;;
+build-clang-windows)
+    cmake -S llvm -B ${BUILD_DIR} -G Ninja                                      \
+        -D CMAKE_C_COMPILER_LAUNCHER=sccache                                    \
+        -D CMAKE_CXX_COMPILER_LAUNCHER=sccache                                  \
+        -D CMAKE_BUILD_TYPE=Release                                             \
+        -D CMAKE_INSTALL_PREFIX=install-windows                                 \
+        -D LLVM_ENABLE_PROJECTS="clang;compiler-rt"                             \
+        -D LLVM_ENABLE_ASSERTIONS=ON                                            \
+        -D LLVM_BUILD_EXAMPLES=ON                                               \
+        -D COMPILER_RT_BUILD_LIBFUZZER=OFF                                      \
+        -D COMPILER_RT_BUILD_ORC=OFF
+
+    ninja -C ${BUILD_DIR} install-clang install-clang-resource-headers
+    ninja -C ${BUILD_DIR} check-clang
+;;
 generic-cxx03)
     buildkite-agent artifact download install.tar.xz .
     tar -xvf install.tar.xz