diff --git a/.bazelrc b/.bazelrc
index a552f0d0d..33c7725f5 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -80,6 +80,7 @@ build:manylinux2010 --linkopt="-lrt"
 build:tsan --strip=never
 build:tsan --copt -fsanitize=thread
 build:tsan --copt -DTHREAD_SANITIZER
+build:tsan --copt -O2
 build:tsan --copt -g
 build:tsan --copt -fno-omit-frame-pointer
 build:tsan --linkopt -fsanitize=thread
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index f0a65fb3a..f8b99e7db 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -159,6 +159,18 @@
       --test_tag_filters=-flaky
       -- //:all -//:core_worker_test -//:logging_test
 
+- label: ":cpp: Tests (TSAN)"
+  commands:
+    - cleanup() { if [ "${BUILDKITE_PULL_REQUEST}" = "false" ]; then ./ci/travis/upload_build_info.sh; fi }; trap cleanup EXIT
+    - bazel test --config=ci --config=tsan $(./scripts/bazel_export_options)
+      --build_tests_only
+      --jobs=2
+      --test_tag_filters=-flaky
+      -- //:all -//:core_worker_test -//:event_test -//:gcs_actor_manager_test
+      -//:gcs_placement_group_manager_test -//:gcs_placement_group_scheduler_test
+      -//:gcs_server_rpc_test -//:gcs_server_test -//:global_state_accessor_test
+      -//:metric_exporter_client_test -//:stats_test -//:worker_pool_test
+
 - label: ":serverless: Dashboard + Serve Tests"
   conditions:
     [