diff --git a/Tests/GRPCNIOTransportHTTP2Tests/ControlService.swift b/Tests/GRPCNIOTransportHTTP2Tests/ControlService.swift
index 305ddd7..a18ae8f 100644
--- a/Tests/GRPCNIOTransportHTTP2Tests/ControlService.swift
+++ b/Tests/GRPCNIOTransportHTTP2Tests/ControlService.swift
@@ -121,11 +121,11 @@ extension ControlService {
   }
 
   private func clientRemotePeerInfo<T>(request: StreamingServerRequest<T>) -> String {
-    request.metadata[stringValues: "remotePeer"].first(where: { _ in true })!
+    request.metadata[stringValues: "remotePeer"].first(where: { _ in true }) ?? "<missing>"
   }
 
   private func clientLocalPeerInfo<T>(request: StreamingServerRequest<T>) -> String {
-    request.metadata[stringValues: "localPeer"].first(where: { _ in true })!
+    request.metadata[stringValues: "localPeer"].first(where: { _ in true }) ?? "<missing>"
   }
 
   private func handle(
diff --git a/Tests/GRPCNIOTransportHTTP2Tests/HTTP2TransportTests.swift b/Tests/GRPCNIOTransportHTTP2Tests/HTTP2TransportTests.swift
index abf8206..98c1cd3 100644
--- a/Tests/GRPCNIOTransportHTTP2Tests/HTTP2TransportTests.swift
+++ b/Tests/GRPCNIOTransportHTTP2Tests/HTTP2TransportTests.swift
@@ -202,11 +202,13 @@ final class HTTP2TransportTests: XCTestCase {
     compression: CompressionAlgorithm,
     enabledCompression: CompressionAlgorithmSet
   ) throws -> GRPCClient<NIOClientTransport> {
+    let transport: NIOClientTransport
+
     switch kind {
     case .posix:
       var serviceConfig = ServiceConfig()
       serviceConfig.loadBalancingConfig = [.roundRobin]
-      let transport = try HTTP2ClientTransport.Posix(
+      let posix = try HTTP2ClientTransport.Posix(
         target: target,
         transportSecurity: .plaintext,
         config: .defaults {
@@ -215,13 +217,13 @@ final class HTTP2TransportTests: XCTestCase {
         },
         serviceConfig: serviceConfig
       )
-      return GRPCClient(transport: NIOClientTransport(transport))
+      transport = NIOClientTransport(posix)
 
     case .niots:
       #if canImport(Network)
       var serviceConfig = ServiceConfig()
       serviceConfig.loadBalancingConfig = [.roundRobin]
-      let transport = try HTTP2ClientTransport.TransportServices(
+      let transportServices = try HTTP2ClientTransport.TransportServices(
         target: target,
         transportSecurity: .plaintext,
         config: .defaults {
@@ -230,11 +232,13 @@ final class HTTP2TransportTests: XCTestCase {
         },
         serviceConfig: serviceConfig
       )
-      return GRPCClient(transport: NIOClientTransport(transport))
+      transport = NIOClientTransport(transportServices)
       #else
       throw XCTSkip("Transport not supported on this platform")
       #endif
     }
+
+    return GRPCClient(transport: transport, interceptors: [PeerInfoClientInterceptor()])
   }
 
   func testUnaryOK() async throws {