diff --git a/common/autoware_component_interface_tools/package.xml b/common/autoware_component_interface_tools/package.xml
index 8355cb27283f0..39174cf95714d 100644
--- a/common/autoware_component_interface_tools/package.xml
+++ b/common/autoware_component_interface_tools/package.xml
@@ -8,31 +8,29 @@
   <license>Apache License 2.0</license>
 
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
-  <buildtool_depend>autoware_cmake</buildtool_depend>
   <buildtool_depend>ament_cmake_test</buildtool_depend>
-  
+  <buildtool_depend>autoware_cmake</buildtool_depend>
+
   <depend>diagnostic_updater</depend>
   <depend>fmt</depend>
   <depend>rclcpp</depend>
   <depend>rclcpp_components</depend>
   <depend>tier4_system_msgs</depend>
   <depend>yaml_cpp_vendor</depend>
-  
+
+  <test_depend>ament_cmake_gtest</test_depend>
   <test_depend>ament_cmake_ros</test_depend>
-  <test_depend>rclcpp_components</test_depend>
-  <test_depend>rclcpp</test_depend>
+  <test_depend>ament_index_python</test_depend>
   <test_depend>ament_lint_auto</test_depend>
-  <test_depend>autoware_test_utils</test_depend>
   <test_depend>autoware_lint_common</test_depend>
-  <test_depend>tier4_system_msgs</test_depend>
-  <test_depend>yaml_cpp_vendor</test_depend>
-  <test_depend>diagnostic_updater</test_depend>
+  <test_depend>autoware_test_utils</test_depend>
   <test_depend>autoware_testing</test_depend>
-  <test_depend>ament_index_python</test_depend>
+  <test_depend>diagnostic_updater</test_depend>
   <test_depend>fake_test_node</test_depend>
-  <test_depend>ament_cmake_gtest</test_depend>
- 
-
+  <test_depend>rclcpp</test_depend>
+  <test_depend>rclcpp_components</test_depend>
+  <test_depend>tier4_system_msgs</test_depend>
+  <test_depend>yaml_cpp_vendor</test_depend>
 
   <export>
     <build_type>ament_cmake</build_type>
diff --git a/common/autoware_component_interface_tools/test/test_autoware_component_interface_tools.cpp b/common/autoware_component_interface_tools/test/test_autoware_component_interface_tools.cpp
index 6906a57754065..357220d66c1d7 100644
--- a/common/autoware_component_interface_tools/test/test_autoware_component_interface_tools.cpp
+++ b/common/autoware_component_interface_tools/test/test_autoware_component_interface_tools.cpp
@@ -11,13 +11,15 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include <gtest/gtest.h>
- 
 #include "service_log_checker.hpp"
-#include <rclcpp/node_options.hpp>
-#include <yaml-cpp/yaml.h>
+
 #include <ament_index_cpp/get_package_share_directory.hpp>
+#include <rclcpp/node_options.hpp>
 #include <rclcpp_components/register_node_macro.hpp>
+
+#include <gtest/gtest.h>
+#include <yaml-cpp/yaml.h>
+
 #include <memory>
 #include <string>
 using ServiceLog = tier4_system_msgs::msg::ServiceLog;
@@ -27,40 +29,38 @@ using namespace rclcpp;
 
 TEST(ServiceCheckerTest, ServiceChecker)
 {
-  
-    class PubManager : public rclcpp::Node
+  class PubManager : public rclcpp::Node
+  {
+  public:
+    PubManager() : Node("test_pub_node")
     {
-    public:
-      PubManager() : Node("test_pub_node")
-      {
-        pub_odom_ = create_publisher<ServiceLog>("service_log", 1);
-        sub_odom_ = create_subscription<DiagnosticArray>(
-          "/diagnostics", 1, std::bind(&PubManager::on_service_log, this, std::placeholders::_1));
-      }
-      rclcpp::Publisher<ServiceLog>::SharedPtr pub_odom_;
-      rclcpp::Subscription<DiagnosticArray>::SharedPtr sub_odom_;
-      bool flag = false;
-      void on_service_log(const DiagnosticArray::ConstSharedPtr msg)
-      {
-        if (msg->status.size() > 0) {
-          auto diag_array = msg->status[0].message.c_str();
-          EXPECT_EQ(diag_array, "ERROR");
-          flag = true;
-        }
+      pub_odom_ = create_publisher<ServiceLog>("service_log", 1);
+      sub_odom_ = create_subscription<DiagnosticArray>(
+        "/diagnostics", 1, std::bind(&PubManager::on_service_log, this, std::placeholders::_1));
+    }
+    rclcpp::Publisher<ServiceLog>::SharedPtr pub_odom_;
+    rclcpp::Subscription<DiagnosticArray>::SharedPtr sub_odom_;
+    bool flag = false;
+    void on_service_log(const DiagnosticArray::ConstSharedPtr msg)
+    {
+      if (msg->status.size() > 0) {
+        auto diag_array = msg->status[0].message.c_str();
+        EXPECT_EQ(diag_array, "ERROR");
+        flag = true;
       }
-    };
-    
-    rclcpp::init(0, nullptr);
-    auto node_options = rclcpp::NodeOptions{};
-    auto test_target_node = std::make_shared<ServiceLogChecker>(node_options);
-    auto  test_log = std::make_shared<PubManager>();
-    ServiceLog log;
-    log.type = 6;
-    log.name = "test";
-    log.node = "test_node";
-    test_log->pub_odom_->publish(log);
-
-    while (!test_log->flag) {
     }
+  };
+
+  rclcpp::init(0, nullptr);
+  auto node_options = rclcpp::NodeOptions{};
+  auto test_target_node = std::make_shared<ServiceLogChecker>(node_options);
+  auto test_log = std::make_shared<PubManager>();
+  ServiceLog log;
+  log.type = 6;
+  log.name = "test";
+  log.node = "test_node";
+  test_log->pub_odom_->publish(log);
 
+  while (!test_log->flag) {
+  }
 }