diff --git a/src/test/msgr/test_msgr.cc b/src/test/msgr/test_msgr.cc
index d7f30756733f97..f022130cbdd31e 100644
--- a/src/test/msgr/test_msgr.cc
+++ b/src/test/msgr/test_msgr.cc
@@ -278,6 +278,8 @@ TEST_P(MessengerTest, SimpleTest) {
   ASSERT_TRUE(static_cast<Session*>(conn->get_priv())->get_count() == 1);
   client_msgr->shutdown();
   client_msgr->wait();
+  server_msgr->shutdown();
+  server_msgr->wait();
 }
 
 TEST_P(MessengerTest, NameAddrTest) {