diff --git a/quiche/quic/core/http/quic_header_list_test.cc b/quiche/quic/core/http/quic_header_list_test.cc
index 6007bcc..573aae5 100644
--- a/quiche/quic/core/http/quic_header_list_test.cc
+++ b/quiche/quic/core/http/quic_header_list_test.cc
@@ -12,7 +12,7 @@
 using ::testing::ElementsAre;
 using ::testing::Pair;
 
-namespace quic {
+namespace quic::test {
 
 class QuicHeaderListTest : public QuicTest {};
 
@@ -83,4 +83,4 @@
                                     Pair("beep", "")));
 }
 
-}  // namespace quic
+}  // namespace quic::test
diff --git a/quiche/quic/core/packet_number_indexed_queue_test.cc b/quiche/quic/core/packet_number_indexed_queue_test.cc
index b8a5b2a..f05309b 100644
--- a/quiche/quic/core/packet_number_indexed_queue_test.cc
+++ b/quiche/quic/core/packet_number_indexed_queue_test.cc
@@ -11,7 +11,7 @@
 #include "quiche/quic/core/quic_packet_number.h"
 #include "quiche/quic/platform/api/quic_test.h"
 
-namespace quic {
+namespace quic::test {
 namespace {
 
 class PacketNumberIndexedQueueTest : public QuicTest {
@@ -202,4 +202,4 @@
 }
 
 }  // namespace
-}  // namespace quic
+}  // namespace quic::test
diff --git a/quiche/quic/core/quic_arena_scoped_ptr_test.cc b/quiche/quic/core/quic_arena_scoped_ptr_test.cc
index 18d4fdf..fd6dd64 100644
--- a/quiche/quic/core/quic_arena_scoped_ptr_test.cc
+++ b/quiche/quic/core/quic_arena_scoped_ptr_test.cc
@@ -7,7 +7,7 @@
 #include "quiche/quic/core/quic_one_block_arena.h"
 #include "quiche/quic/platform/api/quic_test.h"
 
-namespace quic {
+namespace quic::test {
 namespace {
 
 enum class TestParam { kFromHeap, kFromArena };
@@ -112,4 +112,4 @@
 }
 
 }  // namespace
-}  // namespace quic
+}  // namespace quic::test
diff --git a/quiche/quic/core/quic_connection_context_test.cc b/quiche/quic/core/quic_connection_context_test.cc
index 0b87d01..1f68ae9 100644
--- a/quiche/quic/core/quic_connection_context_test.cc
+++ b/quiche/quic/core/quic_connection_context_test.cc
@@ -9,7 +9,7 @@
 
 using testing::ElementsAre;
 
-namespace quic {
+namespace quic::test {
 namespace {
 
 class TraceCollector : public QuicConnectionTracer {
@@ -170,4 +170,4 @@
 }
 
 }  // namespace
-}  // namespace quic
+}  // namespace quic::test
diff --git a/quiche/quic/core/quic_connection_id_manager_test.cc b/quiche/quic/core/quic_connection_id_manager_test.cc
index 543f054..1c2657d 100644
--- a/quiche/quic/core/quic_connection_id_manager_test.cc
+++ b/quiche/quic/core/quic_connection_id_manager_test.cc
@@ -13,7 +13,7 @@
 #include "quiche/quic/test_tools/quic_connection_id_manager_peer.h"
 #include "quiche/quic/test_tools/quic_test_utils.h"
 
-namespace quic {
+namespace quic::test {
 namespace {
 
 using ::quic::test::IsError;
@@ -953,4 +953,4 @@
 }
 
 }  // namespace
-}  // namespace quic
+}  // namespace quic::test
diff --git a/quiche/quic/core/quic_connection_id_test.cc b/quiche/quic/core/quic_connection_id_test.cc
index f421e95..fdd4c6f 100644
--- a/quiche/quic/core/quic_connection_id_test.cc
+++ b/quiche/quic/core/quic_connection_id_test.cc
@@ -13,7 +13,7 @@
 #include "quiche/quic/platform/api/quic_test.h"
 #include "quiche/quic/test_tools/quic_test_utils.h"
 
-namespace quic {
+namespace quic::test {
 
 namespace {
 
@@ -178,4 +178,4 @@
 
 }  // namespace
 
-}  // namespace quic
+}  // namespace quic::test
diff --git a/quiche/quic/core/quic_crypto_client_handshaker_test.cc b/quiche/quic/core/quic_crypto_client_handshaker_test.cc
index cf53185..b31ec18 100644
--- a/quiche/quic/core/quic_crypto_client_handshaker_test.cc
+++ b/quiche/quic/core/quic_crypto_client_handshaker_test.cc
@@ -11,7 +11,7 @@
 #include "quiche/quic/platform/api/quic_test.h"
 #include "quiche/quic/test_tools/quic_test_utils.h"
 
-namespace quic {
+namespace quic::test {
 namespace {
 
 class TestProofHandler : public QuicCryptoClientStream::ProofHandler {
@@ -214,4 +214,4 @@
 }
 
 }  // namespace
-}  // namespace quic
+}  // namespace quic::test
diff --git a/quiche/quic/core/quic_one_block_arena_test.cc b/quiche/quic/core/quic_one_block_arena_test.cc
index ccf1ac1..5c1079b 100644
--- a/quiche/quic/core/quic_one_block_arena_test.cc
+++ b/quiche/quic/core/quic_one_block_arena_test.cc
@@ -10,7 +10,7 @@
 #include "quiche/quic/platform/api/quic_test.h"
 #include "quiche/quic/test_tools/quic_test_utils.h"
 
-namespace quic {
+namespace quic::test {
 namespace {
 
 static const uint32_t kMaxAlign = 8;
@@ -56,4 +56,4 @@
 }
 
 }  // namespace
-}  // namespace quic
+}  // namespace quic::test
diff --git a/quiche/quic/core/quic_server_id_test.cc b/quiche/quic/core/quic_server_id_test.cc
index c4e5368..226a517 100644
--- a/quiche/quic/core/quic_server_id_test.cc
+++ b/quiche/quic/core/quic_server_id_test.cc
@@ -8,7 +8,7 @@
 
 #include "quiche/quic/platform/api/quic_test.h"
 
-namespace quic {
+namespace quic::test {
 
 namespace {
 
@@ -121,4 +121,4 @@
 
 }  // namespace
 
-}  // namespace quic
+}  // namespace quic::test
diff --git a/quiche/quic/core/quic_trace_visitor_test.cc b/quiche/quic/core/quic_trace_visitor_test.cc
index 9e255b9..5584ebe 100644
--- a/quiche/quic/core/quic_trace_visitor_test.cc
+++ b/quiche/quic/core/quic_trace_visitor_test.cc
@@ -11,7 +11,7 @@
 #include "quiche/quic/test_tools/simulator/simulator.h"
 #include "quiche/quic/test_tools/simulator/switch.h"
 
-namespace quic {
+namespace quic::test {
 namespace {
 
 const QuicByteCount kTransferSize = 1000 * kMaxOutgoingPacketSize;
@@ -181,4 +181,4 @@
 }
 
 }  // namespace
-}  // namespace quic
+}  // namespace quic::test
diff --git a/quiche/quic/qbone/bonnet/icmp_reachable_test.cc b/quiche/quic/qbone/bonnet/icmp_reachable_test.cc
index 9f55eed..7a0ebe6 100644
--- a/quiche/quic/qbone/bonnet/icmp_reachable_test.cc
+++ b/quiche/quic/qbone/bonnet/icmp_reachable_test.cc
@@ -12,7 +12,7 @@
 #include "quiche/quic/platform/api/quic_test.h"
 #include "quiche/quic/qbone/platform/mock_kernel.h"
 
-namespace quic {
+namespace quic::test {
 namespace {
 
 using ::testing::_;
@@ -263,4 +263,4 @@
 }
 
 }  // namespace
-}  // namespace quic
+}  // namespace quic::test
diff --git a/quiche/quic/qbone/bonnet/tun_device_controller_test.cc b/quiche/quic/qbone/bonnet/tun_device_controller_test.cc
index 65daa15..62cb863 100644
--- a/quiche/quic/qbone/bonnet/tun_device_controller_test.cc
+++ b/quiche/quic/qbone/bonnet/tun_device_controller_test.cc
@@ -14,7 +14,7 @@
 
 ABSL_DECLARE_FLAG(bool, qbone_tun_device_replace_default_routing_rules);
 
-namespace quic {
+namespace quic::test {
 namespace {
 using ::testing::Eq;
 
@@ -255,4 +255,4 @@
 }
 
 }  // namespace
-}  // namespace quic
+}  // namespace quic::test
diff --git a/quiche/quic/qbone/bonnet/tun_device_packet_exchanger_test.cc b/quiche/quic/qbone/bonnet/tun_device_packet_exchanger_test.cc
index f7bf062..a6d3a39 100644
--- a/quiche/quic/qbone/bonnet/tun_device_packet_exchanger_test.cc
+++ b/quiche/quic/qbone/bonnet/tun_device_packet_exchanger_test.cc
@@ -9,7 +9,7 @@
 #include "quiche/quic/qbone/mock_qbone_client.h"
 #include "quiche/quic/qbone/platform/mock_kernel.h"
 
-namespace quic {
+namespace quic::test {
 namespace {
 
 const size_t kMtu = 1000;
@@ -116,4 +116,4 @@
 }
 
 }  // namespace
-}  // namespace quic
+}  // namespace quic::test
diff --git a/quiche/quic/qbone/bonnet/tun_device_test.cc b/quiche/quic/qbone/bonnet/tun_device_test.cc
index 4af7b20..cc82a2f 100644
--- a/quiche/quic/qbone/bonnet/tun_device_test.cc
+++ b/quiche/quic/qbone/bonnet/tun_device_test.cc
@@ -11,7 +11,7 @@
 #include "quiche/quic/platform/api/quic_test.h"
 #include "quiche/quic/qbone/platform/mock_kernel.h"
 
-namespace quic {
+namespace quic::test {
 namespace {
 
 using ::testing::_;
@@ -208,4 +208,4 @@
 }
 
 }  // namespace
-}  // namespace quic
+}  // namespace quic::test
diff --git a/quiche/quic/qbone/platform/netlink_test.cc b/quiche/quic/qbone/platform/netlink_test.cc
index 23c1315..9bd91b0 100644
--- a/quiche/quic/qbone/platform/netlink_test.cc
+++ b/quiche/quic/qbone/platform/netlink_test.cc
@@ -12,7 +12,7 @@
 #include "quiche/quic/qbone/platform/mock_kernel.h"
 #include "quiche/quic/qbone/qbone_constants.h"
 
-namespace quic {
+namespace quic::test {
 namespace {
 
 using ::testing::_;
@@ -761,4 +761,4 @@
 }
 
 }  // namespace
-}  // namespace quic
+}  // namespace quic::test
diff --git a/quiche/quic/qbone/qbone_packet_processor_test.cc b/quiche/quic/qbone/qbone_packet_processor_test.cc
index ed3b45c..e11fd5c 100644
--- a/quiche/quic/qbone/qbone_packet_processor_test.cc
+++ b/quiche/quic/qbone/qbone_packet_processor_test.cc
@@ -10,7 +10,7 @@
 #include "quiche/quic/platform/api/quic_test.h"
 #include "quiche/quic/qbone/qbone_packet_processor_test_tools.h"
 
-namespace quic {
+namespace quic::test {
 namespace {
 
 using Direction = QbonePacketProcessor::Direction;
@@ -277,4 +277,4 @@
 }
 
 }  // namespace
-}  // namespace quic
+}  // namespace quic::test