Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -723,6 +723,21 @@
                                         '-DLLVM_HOST_TRIPLE=sparcv9-pc-solaris2.11',
                                         '-DCLANG_DEFAULT_LINKER=/usr/bin/ld',
                                         '-DLLVM_PARALLEL_LINK_JOBS=4'])},
+
+        {'name' : "clang-x64-ninja-win7",
+         'slavenames' : ["windows7-buildbot"],
+         'builddir' : "clang-x64-ninja-win7",
+         'factory' : ClangBuilder.getClangCMakeBuildFactory(
+                        clean=False,
+                        checkout_lld=False,
+                        vs="autodetect",
+                        target_arch='x64',
+                        testStage1=True,
+                        useTwoStage=True,
+                        stage1_config='Release',
+                        stage2_config='Release',
+                        extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=ON',
+                                          '-DLLVM_TARGETS_TO_BUILD=X86'])},
     ]
 
 # Polly builders.
Index: buildbot/osuosl/master/config/slaves.py
===================================================================
--- buildbot/osuosl/master/config/slaves.py
+++ buildbot/osuosl/master/config/slaves.py
@@ -203,4 +203,6 @@
         create_slave("solaris11-amd64", properties={'jobs' : 8}, max_builds=1),
         create_slave("solaris11-sparcv9", properties={'jobs' : 8}, max_builds=1),
 
+        # Windows 7 Intel(R) Core(TM) CPU i7-4790K (4.00GHz), 16GB of RAM
+        create_slave("windows7-buildbot", properties={'jobs': 2}, max_builds=1),
         ]
Index: buildbot/osuosl/master/config/status.py
===================================================================
--- buildbot/osuosl/master/config/status.py
+++ buildbot/osuosl/master/config/status.py
@@ -94,7 +94,7 @@
             extraRecipients = ["mstester.llvm@gmail.com"],
             subject="Build %(builder)s Failure",
             mode = "failing",
-            builders = ["clang-atom-d525-fedora-rel"],
+            builders = ["clang-atom-d525-fedora-rel", "clang-x64-ninja-win7"],
             addLogs=False,
             num_lines = 15),
         InformativeMailNotifier(