diff --git a/nav2_behavior_tree/test/plugins/action/test_back_up_cancel_node.cpp b/nav2_behavior_tree/test/plugins/action/test_back_up_cancel_node.cpp
index 5bef6868e57..e1a04c82a79 100644
--- a/nav2_behavior_tree/test/plugins/action/test_back_up_cancel_node.cpp
+++ b/nav2_behavior_tree/test/plugins/action/test_back_up_cancel_node.cpp
@@ -83,6 +83,7 @@ class CancelBackUpActionTestFixture : public ::testing::Test
     config_ = nullptr;
     node_.reset();
     action_server_.reset();
+    client_.reset();
     factory_.reset();
   }
 
diff --git a/nav2_behavior_tree/test/plugins/action/test_controller_cancel_node.cpp b/nav2_behavior_tree/test/plugins/action/test_controller_cancel_node.cpp
index 3ca86a832b1..cf754c52291 100644
--- a/nav2_behavior_tree/test/plugins/action/test_controller_cancel_node.cpp
+++ b/nav2_behavior_tree/test/plugins/action/test_controller_cancel_node.cpp
@@ -83,6 +83,7 @@ class CancelControllerActionTestFixture : public ::testing::Test
     config_ = nullptr;
     node_.reset();
     action_server_.reset();
+    client_.reset();
     factory_.reset();
   }
 
diff --git a/nav2_behavior_tree/test/plugins/action/test_drive_on_heading_cancel_node.cpp b/nav2_behavior_tree/test/plugins/action/test_drive_on_heading_cancel_node.cpp
index d0eb2b5bd5f..6c6eb57233f 100644
--- a/nav2_behavior_tree/test/plugins/action/test_drive_on_heading_cancel_node.cpp
+++ b/nav2_behavior_tree/test/plugins/action/test_drive_on_heading_cancel_node.cpp
@@ -86,6 +86,7 @@ class CancelDriveOnHeadingTestFixture : public ::testing::Test
     config_ = nullptr;
     node_.reset();
     action_server_.reset();
+    client_.reset();
     factory_.reset();
   }
 
diff --git a/nav2_behavior_tree/test/plugins/action/test_spin_cancel_node.cpp b/nav2_behavior_tree/test/plugins/action/test_spin_cancel_node.cpp
index 7909067381f..978dc2d78f5 100644
--- a/nav2_behavior_tree/test/plugins/action/test_spin_cancel_node.cpp
+++ b/nav2_behavior_tree/test/plugins/action/test_spin_cancel_node.cpp
@@ -83,6 +83,7 @@ class CancelSpinActionTestFixture : public ::testing::Test
     config_ = nullptr;
     node_.reset();
     action_server_.reset();
+    client_.reset();
     factory_.reset();
   }
 
diff --git a/nav2_behavior_tree/test/plugins/action/test_wait_cancel_node.cpp b/nav2_behavior_tree/test/plugins/action/test_wait_cancel_node.cpp
index 9e72f1413c8..f1ed0750d86 100644
--- a/nav2_behavior_tree/test/plugins/action/test_wait_cancel_node.cpp
+++ b/nav2_behavior_tree/test/plugins/action/test_wait_cancel_node.cpp
@@ -83,6 +83,7 @@ class CancelWaitActionTestFixture : public ::testing::Test
     config_ = nullptr;
     node_.reset();
     action_server_.reset();
+    client_.reset();
     factory_.reset();
   }
 
diff --git a/nav2_behavior_tree/test/plugins/condition/test_is_path_valid.cpp b/nav2_behavior_tree/test/plugins/condition/test_is_path_valid.cpp
index 8984aac8c14..21728b4fcc9 100644
--- a/nav2_behavior_tree/test/plugins/condition/test_is_path_valid.cpp
+++ b/nav2_behavior_tree/test/plugins/condition/test_is_path_valid.cpp
@@ -67,9 +67,10 @@ class IsPathValidTestFixture : public ::testing::Test
   {
     delete config_;
     config_ = nullptr;
+    server_.reset();
     node_.reset();
     factory_.reset();
-    server_.reset();
+    tree_.reset();
   }
 
   static std::shared_ptr<IsPathValidService> server_;
diff --git a/nav2_behavior_tree/test/plugins/condition/test_path_expiring_timer.cpp b/nav2_behavior_tree/test/plugins/condition/test_path_expiring_timer.cpp
index b88fc4d6348..385b1cfed8e 100644
--- a/nav2_behavior_tree/test/plugins/condition/test_path_expiring_timer.cpp
+++ b/nav2_behavior_tree/test/plugins/condition/test_path_expiring_timer.cpp
@@ -43,6 +43,7 @@ class PathExpiringTimerConditionTestFixture : public nav2_behavior_tree::Behavio
   {
     delete config_;
     config_ = nullptr;
+    node_.reset();
     bt_node_.reset();
   }