diff --git a/zorg/buildbot/builders/annotated/standalone-build.sh b/zorg/buildbot/builders/annotated/standalone-build.sh
--- a/zorg/buildbot/builders/annotated/standalone-build.sh
+++ b/zorg/buildbot/builders/annotated/standalone-build.sh
@@ -89,9 +89,8 @@
     cd "${LLVM_ROOT}"/llvm/utils/lit
     python3 setup.py build '--executable=/usr/bin/python3 -s'
 
-    # TODO(kkleine): Fix failing test: FAIL: lit :: shtest-not.py (43 of 50)
-    #build_step "Testing python-lit"
-    #python3 lit.py tests
+    build_step "Testing python-lit"
+    python3 lit.py tests
 
     build_step "Installing python-lit"
     rm -rf ${PYTHON_LIT_INSTALL_DIR}
@@ -129,7 +128,6 @@
         -DLLVM_BUILD_LLVM_DYLIB=ON \
         -DLLVM_LINK_LLVM_DYLIB=ON \
         -DLLVM_INCLUDE_BENCHMARKS=OFF \
-        -DLLVM_INSTALL_UTILS=ON \
         -DCMAKE_INSTALL_PREFIX=${LLVM_INSTALL_DIR} \
         -DLLVM_EXTERNAL_LIT=${PYTHON_LIT_INSTALL_DIR}/usr/local/bin/lit \
         -DLLVM_INCLUDE_UTILS:BOOL=ON \
@@ -170,17 +168,19 @@
         -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
         -DCLANG_LINK_CLANG_DYLIB=ON \
         -DCLANG_INCLUDE_TESTS=ON \
-        -DLLVM_EXTERNAL_LIT=${PYTHON_LIT_INSTALL_DIR}/usr/local/bin/lit \
         -DCMAKE_INSTALL_PREFIX=${CLANG_INSTALL_DIR} \
         -DLLVM_ROOT=${LLVM_INSTALL_DIR} \
         -DLLVM_ENABLE_ASSERTIONS=ON \
-        -DLLVM_TABLEGEN_EXE=${LLVM_INSTALL_DIR}/bin/llvm-tblgen \
-        -DLLVM_CCACHE_BUILD=ON
+        -DCMAKE_PREFIX_PATH=${LLVM_INSTALL_DIR}/lib/cmake/llvm \
+        -DLLVM_EXTERNAL_LIT=${PYTHON_LIT_INSTALL_DIR}/usr/local/bin/lit \
+        -DCMAKE_C_COMPILER_LAUNCHER="ccache" \
+        -DCMAKE_CXX_COMPILER_LAUNCHER="ccache"
 
     build_step "Building clang"
     LD_LIBRARY_PATH="${LLVM_INSTALL_DIR}/lib64" cmake --build ${CLANG_BUILD_DIR} ${CMAKE_VERBOSE_BUILD_CLANG}
 
-    # TODO(kwk): Add Clang check
+    build_step "Testing clang"
+    LD_LIBRARY_PATH="${LLVM_INSTALL_DIR}/lib64" cmake --build ${CLANG_BUILD_DIR} --target check-clang ${CMAKE_VERBOSE_CHECK_CLANG}
 
     build_step "Installing clang"
     rm -rf ${CLANG_INSTALL_DIR}
@@ -218,9 +218,11 @@
         -DLLVM_LINK_LLVM_DYLIB=ON \
         -DCMAKE_INSTALL_PREFIX=${LLD_INSTALL_DIR} \
         -DLLVM_ROOT=${LLVM_INSTALL_DIR} \
-        -DLLVM_CCACHE_BUILD=ON \
         -DLLVM_INCLUDE_TESTS=ON \
-        -DLLVM_EXTERNAL_LIT=${PYTHON_LIT_INSTALL_DIR}/usr/local/bin/lit
+        -DLLVM_EXTERNAL_LIT=${PYTHON_LIT_INSTALL_DIR}/usr/local/bin/lit \
+        -DCMAKE_PREFIX_PATH=${LLVM_INSTALL_DIR}/lib/cmake/llvm \
+        -DCMAKE_C_COMPILER_LAUNCHER="ccache" \
+        -DCMAKE_CXX_COMPILER_LAUNCHER="ccache"
 
     build_step "Building lld"
     LD_LIBRARY_PATH="${LLVM_INSTALL_DIR}/lib64" cmake --build ${LLD_BUILD_DIR} ${CMAKE_VERBOSE_BUILD_LLD}