diff --git a/quiche/quic/tools/quic_server_test.cc b/quiche/quic/tools/quic_server_test.cc
index 2707cb1..169d613 100644
--- a/quiche/quic/tools/quic_server_test.cc
+++ b/quiche/quic/tools/quic_server_test.cc
@@ -4,6 +4,7 @@
 
 #include "quiche/quic/tools/quic_server.h"
 
+#include <iterator>
 #include <memory>
 #include <string>
 #include <utility>
@@ -156,7 +157,7 @@
   ASSERT_NE(fd, kQuicInvalidSocketFd);
 
   char buf[1024];
-  memset(buf, 0, ABSL_ARRAYSIZE(buf));
+  memset(buf, 0, std::size(buf));
   QuicUdpPacketInfo packet_info;
   packet_info.SetPeerAddress(server_address_);
   WriteResult result =
@@ -218,7 +219,7 @@
   };
   // clang-format on
   QuicReceivedPacket encrypted_valid_packet(
-      reinterpret_cast<char*>(valid_packet), ABSL_ARRAYSIZE(valid_packet),
+      reinterpret_cast<char*>(valid_packet), std::size(valid_packet),
       QuicTime::Zero(), false);
 
   EXPECT_CALL(dispatcher_, ProcessPacket(_, _, _)).Times(1);
diff --git a/quiche/quic/tools/quic_simple_server_stream_test.cc b/quiche/quic/tools/quic_simple_server_stream_test.cc
index e895565..531126d 100644
--- a/quiche/quic/tools/quic_simple_server_stream_test.cc
+++ b/quiche/quic/tools/quic_simple_server_stream_test.cc
@@ -4,6 +4,7 @@
 
 #include "quiche/quic/tools/quic_simple_server_stream.h"
 
+#include <iterator>
 #include <list>
 #include <memory>
 #include <optional>
@@ -738,7 +739,7 @@
       0x54,   0x54, 0x50, 0x2f,  // TTP/
       0x31,   0x2e, 0x31,        // 1.1
   };
-  absl::string_view data(arr, ABSL_ARRAYSIZE(arr));
+  absl::string_view data(arr, std::size(arr));
   QuicStreamFrame frame(stream_->id(), true, 0, data);
   // Verify that we don't crash when we get a invalid headers in stream frame.
   if (GetQuicReloadableFlag(quic_fin_before_completed_http_headers) &&