diff --git a/src/Server_TEST.cc b/src/Server_TEST.cc
index 5f7697eeab..75ec96180b 100644
--- a/src/Server_TEST.cc
+++ b/src/Server_TEST.cc
@@ -338,9 +338,13 @@ TEST_P(ServerFixture,
   ASSERT_TRUE(test::waitForService(node, service));
   gzdbg << "Requesting " << service << std::endl;
   executed = node.Request(service, 1000, rep, result);
+  gzdbg << "Response: {executed: " << executed << ", result: " << result << '}'
+        << std::endl;
   EXPECT_TRUE(executed);
   EXPECT_TRUE(result);
   EXPECT_EQ("TestSensorSystem", rep.data());
+  server.Stop();
+  gzdbg << "Stopping server and shutting down" << std::endl;
 }
 
 /////////////////////////////////////////////////