diff --git a/hpb/internal/BUILD b/hpb/internal/BUILD
index 1f5a571031..ebfd3746e0 100644
--- a/hpb/internal/BUILD
+++ b/hpb/internal/BUILD
@@ -84,6 +84,7 @@ cc_test(
         "//hpb",
         "//hpb:arena",
         "//hpb:extension",
+        "//hpb:options",
         "//hpb_generator/tests:test_model_hpb_proto",
         "//upb/mem",
         "//upb/mini_table",
diff --git a/hpb/internal/message_lock_test.cc b/hpb/internal/message_lock_test.cc
index db952425a9..e662fbd021 100644
--- a/hpb/internal/message_lock_test.cc
+++ b/hpb/internal/message_lock_test.cc
@@ -8,7 +8,6 @@
 #include "hpb/internal/message_lock.h"
 
 #include <atomic>
-#include <mutex>
 #include <string>
 #include <thread>
 
@@ -23,7 +22,7 @@
 #include "hpb/arena.h"
 #include "hpb/extension.h"
 #include "hpb/hpb.h"
-#include "upb/mem/arena.hpp"
+#include "hpb/options.h"
 
 #ifndef ASSERT_OK
 #define ASSERT_OK(x) ASSERT_TRUE(x.ok())
@@ -68,11 +67,13 @@ void unlock_func(const void* msg)
   return &unlock_func;
 }
 
-void TestConcurrentExtensionAccess(::hpb::ExtensionRegistry registry) {
+void TestConcurrentExtensionAccess(const ::hpb::ExtensionRegistry& registry) {
   ::hpb::internal::upb_extension_locker_global.store(&lock_func,
                                                      std::memory_order_release);
   const std::string payload = GenerateTestData();
-  TestModel parsed_model = ::hpb::Parse<TestModel>(payload, registry).value();
+  TestModel parsed_model =
+      ::hpb::Parse<TestModel>(payload, {.extension_registry = registry})
+          .value();
   const auto test_main = [&] { EXPECT_EQ("str", parsed_model.str1()); };
   const auto test_theme = [&] {
     ASSERT_TRUE(::hpb::HasExtension(&parsed_model, theme));
diff --git a/hpb_generator/tests/test_generated.cc b/hpb_generator/tests/test_generated.cc
index 89ec0c12e6..4d7563da3e 100644
--- a/hpb_generator/tests/test_generated.cc
+++ b/hpb_generator/tests/test_generated.cc
@@ -437,7 +437,9 @@ TEST(CppGeneratedCode, SerializeUsingArena) {
   hpb::Arena arena;
   absl::StatusOr<absl::string_view> bytes = ::hpb::Serialize(&model, arena);
   EXPECT_EQ(true, bytes.ok());
-  TestModel parsed_model = ::hpb::Parse<TestModel>(bytes.value()).value();
+  TestModel parsed_model =
+      ::hpb::Parse<TestModel>(bytes.value(), hpb::ParseOptionsDefault())
+          .value();
   EXPECT_EQ("Hello World", parsed_model.str1());
 }
 
@@ -449,7 +451,9 @@ TEST(CppGeneratedCode, SerializeProxyUsingArena) {
   absl::StatusOr<absl::string_view> bytes =
       ::hpb::Serialize(&model_proxy, arena);
   EXPECT_EQ(true, bytes.ok());
-  TestModel parsed_model = ::hpb::Parse<TestModel>(bytes.value()).value();
+  TestModel parsed_model =
+      ::hpb::Parse<TestModel>(bytes.value(), hpb::ParseOptionsDefault())
+          .value();
   EXPECT_EQ("Hello World", parsed_model.str1());
 }
 
@@ -460,7 +464,9 @@ TEST(CppGeneratedCode, SerializeNestedMessageUsingArena) {
   hpb::Ptr<const TestModel> child = model.recursive_child();
   absl::StatusOr<absl::string_view> bytes = ::hpb::Serialize(child, arena);
   EXPECT_EQ(true, bytes.ok());
-  TestModel parsed_model = ::hpb::Parse<TestModel>(bytes.value()).value();
+  TestModel parsed_model =
+      ::hpb::Parse<TestModel>(bytes.value(), hpb::ParseOptionsDefault())
+          .value();
   EXPECT_EQ("Hello World", parsed_model.str1());
 }