diff --git a/connections/implementation/p2p_cluster_pcp_handler_test.cc b/connections/implementation/p2p_cluster_pcp_handler_test.cc
index 689536ce..5ca45ecf 100644
--- a/connections/implementation/p2p_cluster_pcp_handler_test.cc
+++ b/connections/implementation/p2p_cluster_pcp_handler_test.cc
@@ -16,6 +16,7 @@
 
 #include <memory>
 #include <string>
+#include <tuple>
 
 #include "gmock/gmock.h"
 #include "protobuf-matchers/protocol-buffer-matchers.h"
@@ -690,6 +691,7 @@ TEST_P(P2pClusterPcpHandlerTest, CanConnect) {
   EXPECT_EQ(client_a_.GetIPAddress(client_b_local_endpoint),
             mediums_b.GetWifi().GetInformation().ip_address_4_bytes);
 
+  handler_b.StopDiscovery(&client_b_);
   bwu_a.Shutdown();
   bwu_b.Shutdown();
   env_.Stop();