diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py
--- a/buildbot/osuosl/master/config/builders.py
+++ b/buildbot/osuosl/master/config/builders.py
@@ -1859,4 +1859,22 @@
                         "-DTENSORFLOW_AOT_PATH=/var/lib/buildbot/.local/lib/python3.7/site-packages/tensorflow"
                     ])},
 
+    # build clangd with remote-index enabled and check with TSan
+    {'name': "clangd-ubuntu-tsan",
+     'tags': ["clangd"],
+     'workernames': ["clangd-ubuntu-clang"],
+     'builddir': "clangd-ubuntu-tsan",
+     'factory': UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
+         clean=True,
+         depends_on_projects=['"clang;clang-tools-extra'],
+         checks=['check-clangd'],
+         extra_configure_args=[
+             '-DLLVM_CCACHE_BUILD="ON"',
+             '-DLLVM_USE_SANITIZER="Thread"',
+             '-DCMAKE_BUILD_TYPE="RELEASE"',
+             '-DCLANGD_ENABLE_REMOTE="ON"',
+             '-DLLVM_ENABLE_ASSERTIONS="ON"',
+         ])},
+
+
 ]
diff --git a/buildbot/osuosl/master/config/workers.py b/buildbot/osuosl/master/config/workers.py
--- a/buildbot/osuosl/master/config/workers.py
+++ b/buildbot/osuosl/master/config/workers.py
@@ -204,9 +204,13 @@
         # CentOS 7.5.1804 on Intel(R) Xeon(R) Gold 6126 CPU @ 2.60GHz, 96GB RAM
         create_worker("nec-arrproto41", properties={'jobs': 12}, max_builds=1),
 
-        # Uubntu 18.04 amd64 on Google Cloud, 16 core, Nvidia Tesla T4
+        # Ubuntu 18.04 amd64 on Google Cloud, 16 core, Nvidia Tesla T4
         create_worker("mlir-nvidia", properties={'jobs': 16}, max_builds=1),
 
+        # Ubuntu 18.04 on Google Cloud, for machine configuration check
+        # buildbot/google/terraform/main.tf
+        create_worker("clangd-ubuntu-clang", max_builds=1),
+
         # Ubuntu 18.04.LTS x86_64, GCE instance
         create_worker("polly-x86_64-gce1", properties={'jobs': 2}, max_builds=1),
         create_worker("polly-x86_64-gce2", properties={'jobs': 2}, max_builds=1),