diff --git a/envoy b/envoy
index f49d4f23aa..665b4d5ee8 160000
--- a/envoy
+++ b/envoy
@@ -1 +1 @@
-Subproject commit f49d4f23aa043a7ed66b3438ec4b97b55b0067c0
+Subproject commit 665b4d5ee81c6fe984b34f2f8f51cbf1d331d5f2
diff --git a/test/common/integration/autonomous_upstream.h b/test/common/integration/autonomous_upstream.h
index 8c3e2e730d..0dace33b59 100644
--- a/test/common/integration/autonomous_upstream.h
+++ b/test/common/integration/autonomous_upstream.h
@@ -39,13 +39,14 @@ using AutonomousHttpConnectionPtr = std::unique_ptr<AutonomousHttpConnection>;
 // An upstream which creates AutonomousHttpConnection for new incoming connections.
 class AutonomousUpstream : public FakeUpstream {
 public:
-  AutonomousUpstream(Network::TransportSocketFactoryPtr&& transport_socket_factory,
+  AutonomousUpstream(Network::DownstreamTransportSocketFactoryPtr&& transport_socket_factory,
                      const Network::Address::InstanceConstSharedPtr& address,
                      const FakeUpstreamConfig& config)
       : FakeUpstream(std::move(transport_socket_factory), address, config) {}
 
-  AutonomousUpstream(Network::TransportSocketFactoryPtr&& transport_socket_factory, uint32_t port,
-                     Network::Address::IpVersion version, const FakeUpstreamConfig& config)
+  AutonomousUpstream(Network::DownstreamTransportSocketFactoryPtr&& transport_socket_factory,
+                     uint32_t port, Network::Address::IpVersion version,
+                     const FakeUpstreamConfig& config)
       : FakeUpstream(std::move(transport_socket_factory), port, version, config) {}
 
   ~AutonomousUpstream() override;
diff --git a/test/common/integration/quic_test_server.cc b/test/common/integration/quic_test_server.cc
index ef40df1426..d42cc4ec41 100644
--- a/test/common/integration/quic_test_server.cc
+++ b/test/common/integration/quic_test_server.cc
@@ -4,7 +4,7 @@
 
 namespace Envoy {
 
-Network::TransportSocketFactoryPtr QuicTestServer::createUpstreamTlsContext(
+Network::DownstreamTransportSocketFactoryPtr QuicTestServer::createUpstreamTlsContext(
     testing::NiceMock<Server::Configuration::MockTransportSocketFactoryContext>& factory_context) {
   envoy::extensions::transport_sockets::tls::v3::DownstreamTlsContext tls_context;
   Extensions::TransportSockets::Tls::ContextManagerImpl context_manager{time_system_};
@@ -47,7 +47,7 @@ void QuicTestServer::startQuicTestServer() {
 
   upstream_config_.upstream_protocol_ = Http::CodecType::HTTP3;
 
-  Network::TransportSocketFactoryPtr factory = createUpstreamTlsContext(factory_context_);
+  Network::DownstreamTransportSocketFactoryPtr factory = createUpstreamTlsContext(factory_context_);
 
   upstream_ =
       std::make_unique<AutonomousUpstream>(std::move(factory), port_, version_, upstream_config_);
diff --git a/test/common/integration/quic_test_server.h b/test/common/integration/quic_test_server.h
index ea1252eef8..31e118fe89 100644
--- a/test/common/integration/quic_test_server.h
+++ b/test/common/integration/quic_test_server.h
@@ -25,7 +25,7 @@ class QuicTestServer {
   ProcessWide process_wide;
   Thread::MutexBasicLockable lock;
 
-  Network::TransportSocketFactoryPtr createUpstreamTlsContext(
+  Network::DownstreamTransportSocketFactoryPtr createUpstreamTlsContext(
       testing::NiceMock<Server::Configuration::MockTransportSocketFactoryContext>&);
 
 public: