Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -159,6 +159,20 @@
 # Clang builders.
 def _get_clang_builders():
     return [
+        {'name': "clang-atom-d525-fedora-rel",
+         'slavenames':["atom1-buildbot"],
+         'builddir':"clang-atom-d525-fedora-rel",
+         'factory' : ClangBuilder.getClangCMakeBuildFactory(
+                       clean=False,
+                       checkout_compiler_rt=False,
+                       checkout_lld=False,
+                       useTwoStage=False,
+                       stage1_config='Release',
+                       test=True,
+                       testStage1=True,
+                       extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=ON',
+                                         '-DLLVM_USE_INTEL_JITEVENTS=TRUE'])},
+
         # Cortex-A15 LNT test-suite in Benchmark mode
         {'name' : "clang-native-arm-lnt-perf",
          'slavenames':["linaro-tk1-02"],
@@ -676,6 +690,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",
+                        vs_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
@@ -58,6 +58,9 @@
         # AArch64 build cache slave
         create_slave("packet-linux-aarch64-slave-1", properties={'jobs' : 64}, max_builds=1),
 
+        # Intel(R) Atom(TM) CPU D525 @ 1.8GHz, Fedora x86_64
+        create_slave("atom1-buildbot", properties={'jobs': 2}, max_builds=1),
+
         # Windows Server 2016 Intel Xeon(R) Quad 2.30 GHz, 56GB of RAM
         create_slave("win-py3-buildbot", properties={'jobs' : 64}, max_builds=1),
 
@@ -190,4 +193,7 @@
         # Solaris 11
         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
@@ -80,6 +80,15 @@
             builders = ["clang-x86_64-debian-fast"],
             addLogs=False,
             num_lines = 15),
+        InformativeMailNotifier(
+            fromaddr = "llvm.buildmaster@lab.llvm.org",
+            sendToInterestedUsers= False,
+            extraRecipients = ["mstester.llvm@gmail.com"],
+            subject="Build %(builder)s Failure",
+            mode = "failing",
+            builders = ["clang-atom-d525-fedora-rel", "clang-x64-ninja-win7"],
+            addLogs=False,
+            num_lines = 15),
         InformativeMailNotifier(
             fromaddr = "llvm.buildmaster@lab.llvm.org",
             sendToInterestedUsers= False,