diff --git a/tests/client_server/test_client_helper.h b/tests/client_server/test_client_helper.h
index 2c261738..02ab8814 100644
--- a/tests/client_server/test_client_helper.h
+++ b/tests/client_server/test_client_helper.h
@@ -16,7 +16,7 @@ public:
 	int pingCnt() const { return ping_cnt; }
 
 	void ping() {
-        const auto data = PIByteArray(WriteSize);
+		const auto data = PIByteArray(WriteSize);
 		writeInternal(data);
 		ping_cnt++;
 	}
@@ -43,6 +43,9 @@ class TestServerClient
 	, public TestClientBase<WriteSize, WithPong> {
 	using Base = TestClientBase<WriteSize, WithPong>;
 
+public:
+	~TestServerClient() { close(); }
+
 private:
 	void readed(PIByteArray data) override { Base::readInternal(data); }
 
@@ -62,6 +65,9 @@ class TestClient
 	, public TestClientBase<WriteSize, WithPong> {
 	using Base = TestClientBase<WriteSize, WithPong>;
 
+public:
+	~TestClient() { close(); }
+
 private:
 	void readed(PIByteArray data) override { Base::readInternal(data); }