diff --git a/unittests/CppInterOp/Utils.cpp b/unittests/CppInterOp/Utils.cpp
index d603737da..6f0d46369 100644
--- a/unittests/CppInterOp/Utils.cpp
+++ b/unittests/CppInterOp/Utils.cpp
@@ -35,8 +35,12 @@ struct DispatchInitializer {
   DispatchInitializer(DispatchInitializer&&) noexcept = default;
   DispatchInitializer& operator=(DispatchInitializer&&) noexcept = default;
 };
-// FIXME: Make this threadsafe by moving it as a function static.
-DispatchInitializer g_dispatch_init;
+// Thread-safe initialization using function-local static
+DispatchInitializer& GetDispatchInitializer() {
+  static DispatchInitializer instance;
+  return instance;
+}
+const DispatchInitializer& g_dispatch_init = GetDispatchInitializer();
 } // namespace
 #endif