diff --git a/test_rmw_implementation/test/test_client.cpp b/test_rmw_implementation/test/test_client.cpp
index ffa6f426..093bb3c1 100644
--- a/test_rmw_implementation/test/test_client.cpp
+++ b/test_rmw_implementation/test/test_client.cpp
@@ -413,6 +413,7 @@ TEST_F(TestClient, check_qos) {
 
   rmw_client_t * client =
     rmw_create_client(node, ts, service_name, &qos_profile);
+  ASSERT_NE(nullptr, client) << rmw_get_error_string().str;
 
   rmw_qos_profile_t actual_rp_qos;
   rmw_ret_t ret = rmw_client_request_publisher_get_actual_qos(
@@ -448,4 +449,7 @@ TEST_F(TestClient, check_qos) {
   EXPECT_EQ(actual_rs_qos.liveliness_lease_duration.sec, qos_profile.liveliness_lease_duration.sec);
   EXPECT_EQ(
     actual_rs_qos.liveliness_lease_duration.nsec, qos_profile.liveliness_lease_duration.nsec);
+
+  ret = rmw_destroy_client(node, client);
+  EXPECT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
 }
diff --git a/test_rmw_implementation/test/test_service.cpp b/test_rmw_implementation/test/test_service.cpp
index f0e21bfe..1962434b 100644
--- a/test_rmw_implementation/test/test_service.cpp
+++ b/test_rmw_implementation/test/test_service.cpp
@@ -520,6 +520,7 @@ TEST_F(TestService, check_qos) {
 
   rmw_service_t * srv =
     rmw_create_service(node, ts, service_name, &qos_profile);
+  ASSERT_NE(nullptr, srv) << rmw_get_error_string().str;
 
   rmw_qos_profile_t actual_rp_qos;
   rmw_ret_t ret = rmw_service_response_publisher_get_actual_qos(
@@ -556,4 +557,7 @@ TEST_F(TestService, check_qos) {
   EXPECT_EQ(actual_rs_qos.liveliness_lease_duration.sec, qos_profile.liveliness_lease_duration.sec);
   EXPECT_EQ(
     actual_rs_qos.liveliness_lease_duration.nsec, qos_profile.liveliness_lease_duration.nsec);
+
+  ret = rmw_destroy_service(node, srv);
+  EXPECT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
 }