Index: zorg/trunk/buildbot/osuosl/master/config/builders.py
===================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py
@@ -970,13 +970,6 @@
                     buildAndroid=False,
                     runTest=True,
                     extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=ON'])},
-        {'name': "lldb-amd64-ninja-netbsd8",
-         'slavenames': ["lldb-amd64-ninja-netbsd8"],
-         'builddir': "netbsd8",
-         'category' : 'lldb',
-         'factory': LLDBBuilder.getLLDBScriptCommandsFactory(
-                    downloadBinary=False,
-                    runTest=True)},
         {'name': "lldb-amd64-ninja-freebsd11",
          'slavenames': ["lldb-amd64-ninja-freebsd11"],
          'builddir': "scratch",
@@ -1545,6 +1538,26 @@
            'builddir': "fuchsia-x86_64-linux",
            'factory': FuchsiaBuilder.getToolchainBuildFactory(),
            'category': 'fuchsia'},
+          {'name': "netbsd-amd64",
+           'slavenames': ["netbsd-amd64"],
+           'builddir': "netbsd8",
+           'category' : 'netbsd',
+           'factory': LLDBBuilder.getLLDBScriptCommandsFactory(
+                      downloadBinary=False,
+                      runTest=True,
+                      depends_on_projects=[
+                          "cfe",
+                          "clang-tools-extra",
+                          "compiler-rt",
+                          "libcxx",
+                          "libcxxabi",
+                          "libunwind",
+                          "lld",
+                          "lldb",
+                          "llvm",
+                          "openmp",
+                          "polly",
+                      ])},
         ]
 
 # Experimental and stopped builders
Index: zorg/trunk/buildbot/osuosl/master/config/slaves.py
===================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py
@@ -223,8 +223,8 @@
         # Ubuntu 16.04.3 LTS x86_64-scei-ps4, 2 x Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz
         create_slave("ps4-buildslave4"),
 
-        # NetBSD 8.x amd64
-        create_slave("lldb-amd64-ninja-netbsd8", properties={'jobs': 8}, max_builds=1),
+        # NetBSD amd64
+        create_slave("netbsd-amd64", properties={'jobs': 8}, max_builds=1),
         # FreeBSD 11.0-CURRENT amd64
         create_slave("lldb-amd64-ninja-freebsd11", properties={'jobs': 3}, max_builds=1),
 
Index: zorg/trunk/buildbot/osuosl/master/config/status.py
===================================================================
--- zorg/trunk/buildbot/osuosl/master/config/status.py
+++ zorg/trunk/buildbot/osuosl/master/config/status.py
@@ -233,8 +233,7 @@
             extraRecipients = ["n54@gmx.com", "mgorny@NetBSD.org"],
             subject="Build %(builder)s Failure",
             mode = "failing",
-            builders = ["lldb-amd64-ninja-netbsd7",
-                        "lldb-amd64-ninja-netbsd8"],
+            builders = ["netbsd-amd64"],
             addLogs=False,
             num_lines = 15),
         InformativeMailNotifier(