diff --git a/src/ros2_medkit_gateway/test/test_lifecycle_handlers.cpp b/src/ros2_medkit_gateway/test/test_lifecycle_handlers.cpp
index 9cbea1b35..08e611979 100644
--- a/src/ros2_medkit_gateway/test/test_lifecycle_handlers.cpp
+++ b/src/ros2_medkit_gateway/test/test_lifecycle_handlers.cpp
@@ -329,6 +329,9 @@ class EntityDetailStatusLinkTest : public ::testing::Test {
   }
 
   static void TearDownTestSuite() {
+    if (rclcpp::ok()) {
+      rclcpp::shutdown();
+    }
   }
 
   void SetUp() override {
@@ -471,6 +474,9 @@ class LifecycleHandlersWithProviderTest : public ::testing::Test {
   }
 
   static void TearDownTestSuite() {
+    if (rclcpp::ok()) {
+      rclcpp::shutdown();
+    }
   }
 
   void SetUp() override {