diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22c47b3..73ed759 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,8 +27,8 @@ set(THIS_PACKAGE_INCLUDE_DEPENDS
   rclcpp_lifecycle
   rclcpp
   tf2_msgs
-  tf2
   tf2_ros
+  tf2
 )
 
 find_package(ament_cmake REQUIRED)
diff --git a/package.xml b/package.xml
index b5838ff..10e7d17 100644
--- a/package.xml
+++ b/package.xml
@@ -17,8 +17,10 @@
   <depend>rclcpp_lifecycle</depend>
   <depend>rclcpp</depend>
   <depend>tf2_msgs</depend>
+  <depend>tf2_ros</depend>
+  <depend>tf2</depend>
 
-  <test_depend>ament_add_gmock</test_depend>
+  <test_depend>ament_cmake_gmock</test_depend>
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>
   <test_depend>controller_manager</test_depend>