diff --git a/nano/core_test/socket.cpp b/nano/core_test/socket.cpp
index 11a0862b..711d2041 100644
--- a/nano/core_test/socket.cpp
+++ b/nano/core_test/socket.cpp
@@ -29,6 +29,7 @@ TEST (socket, max_connections)
 
 	// start a server socket that allows max 2 live connections
 	auto listener = std::make_shared<nano::transport::tcp_listener> (server_port, *node, 2);
+	nano::test::stop_guard stop_guard{ *listener };
 	listener->start ([&server_sockets] (std::shared_ptr<nano::transport::socket> const & new_connection, boost::system::error_code const & ec_a) {
 		server_sockets.push_back (new_connection);
 		return true;
@@ -123,6 +124,7 @@ TEST (socket, max_connections_per_ip)
 	std::vector<std::shared_ptr<nano::transport::socket>> server_sockets;
 
 	auto listener = std::make_shared<nano::transport::tcp_listener> (server_port, *node, max_global_connections);
+	nano::test::stop_guard stop_guard{ *listener };
 	listener->start ([&server_sockets] (std::shared_ptr<nano::transport::socket> const & new_connection, boost::system::error_code const & ec_a) {
 		server_sockets.push_back (new_connection);
 		return true;
@@ -243,6 +245,7 @@ TEST (socket, max_connections_per_subnetwork)
 	std::vector<std::shared_ptr<nano::transport::socket>> server_sockets;
 
 	auto listener = std::make_shared<nano::transport::tcp_listener> (server_port, *node, max_global_connections);
+	nano::test::stop_guard stop_guard{ *listener };
 	listener->start ([&server_sockets] (std::shared_ptr<nano::transport::socket> const & new_connection, boost::system::error_code const & ec_a) {
 		server_sockets.push_back (new_connection);
 		return true;
@@ -303,6 +306,7 @@ TEST (socket, disabled_max_peers_per_ip)
 	std::vector<std::shared_ptr<nano::transport::socket>> server_sockets;
 
 	auto server_socket = std::make_shared<nano::transport::tcp_listener> (server_port, *node, max_global_connections);
+	nano::test::stop_guard stop_guard{ *server_socket };
 	server_socket->start ([&server_sockets] (std::shared_ptr<nano::transport::socket> const & new_connection, boost::system::error_code const & ec_a) {
 		server_sockets.push_back (new_connection);
 		return true;
@@ -363,6 +367,7 @@ TEST (socket, disconnection_of_silent_connections)
 
 	// start a server listening socket
 	auto listener = std::make_shared<nano::transport::tcp_listener> (server_port, *node, 1);
+	nano::test::stop_guard stop_guard{ *listener };
 	listener->start ([&server_data_socket] (std::shared_ptr<nano::transport::socket> const & new_connection, boost::system::error_code const & ec_a) {
 		server_data_socket = new_connection;
 		return true;
@@ -414,6 +419,7 @@ TEST (socket, drop_policy)
 		auto server_port (system.get_available_port ());
 
 		auto listener = std::make_shared<nano::transport::tcp_listener> (server_port, *node, 1);
+		nano::test::stop_guard stop_guard{ *listener };
 		listener->start ([&connections] (std::shared_ptr<nano::transport::socket> const & new_connection, boost::system::error_code const & ec_a) {
 			connections.push_back (new_connection);
 			return true;
@@ -502,6 +508,7 @@ TEST (socket, concurrent_writes)
 	std::vector<std::shared_ptr<nano::transport::socket>> connections;
 
 	auto listener = std::make_shared<nano::transport::tcp_listener> (server_port, *node, max_connections);
+	nano::test::stop_guard stop_guard{ *listener };
 	listener->start ([&connections, &reader] (std::shared_ptr<nano::transport::socket> const & new_connection, boost::system::error_code const & ec_a) {
 		if (ec_a)
 		{