diff --git a/ackermann_steering_controller/package.xml b/ackermann_steering_controller/package.xml
index 101f47db85..e7d254a761 100644
--- a/ackermann_steering_controller/package.xml
+++ b/ackermann_steering_controller/package.xml
@@ -27,6 +27,7 @@
ament_cmake_gmock
controller_manager
+ hardware_interface_testing
hardware_interface
ros2_control_test_assets
diff --git a/admittance_controller/package.xml b/admittance_controller/package.xml
index e649771f06..6693687a3f 100644
--- a/admittance_controller/package.xml
+++ b/admittance_controller/package.xml
@@ -34,6 +34,7 @@
ament_cmake_gmock
controller_manager
+ hardware_interface_testing
kinematics_interface_kdl
ros2_control_test_assets
diff --git a/bicycle_steering_controller/package.xml b/bicycle_steering_controller/package.xml
index 1954dc052d..82e2660e76 100644
--- a/bicycle_steering_controller/package.xml
+++ b/bicycle_steering_controller/package.xml
@@ -28,6 +28,7 @@
ament_cmake_gmock
controller_manager
hardware_interface
+ hardware_interface_testing
ros2_control_test_assets
diff --git a/diff_drive_controller/package.xml b/diff_drive_controller/package.xml
index 497d6da8c7..d7d95abeb8 100644
--- a/diff_drive_controller/package.xml
+++ b/diff_drive_controller/package.xml
@@ -26,6 +26,7 @@
ament_cmake_gmock
controller_manager
+ hardware_interface_testing
ros2_control_test_assets
diff --git a/diff_drive_controller/test/test_load_diff_drive_controller.cpp b/diff_drive_controller/test/test_load_diff_drive_controller.cpp
index 1eb8939031..660208c560 100644
--- a/diff_drive_controller/test/test_load_diff_drive_controller.cpp
+++ b/diff_drive_controller/test/test_load_diff_drive_controller.cpp
@@ -16,6 +16,9 @@
#include
#include "controller_manager/controller_manager.hpp"
+#include "hardware_interface/resource_manager.hpp"
+#include "rclcpp/executor.hpp"
+#include "rclcpp/executors/single_threaded_executor.hpp"
#include "rclcpp/utilities.hpp"
#include "ros2_control_test_assets/descriptions.hpp"
diff --git a/effort_controllers/package.xml b/effort_controllers/package.xml
index 42225d6a8b..d0d6581688 100644
--- a/effort_controllers/package.xml
+++ b/effort_controllers/package.xml
@@ -17,6 +17,8 @@
ament_cmake_gmock
controller_manager
+ hardware_interface_testing
+ hardware_interface
ros2_control_test_assets
diff --git a/effort_controllers/test/test_load_joint_group_effort_controller.cpp b/effort_controllers/test/test_load_joint_group_effort_controller.cpp
index 61bb1ddf9a..52f1f9934a 100644
--- a/effort_controllers/test/test_load_joint_group_effort_controller.cpp
+++ b/effort_controllers/test/test_load_joint_group_effort_controller.cpp
@@ -17,7 +17,9 @@
#include "controller_manager/controller_manager.hpp"
#include "hardware_interface/resource_manager.hpp"
+#include "rclcpp/executor.hpp"
#include "rclcpp/executors/single_threaded_executor.hpp"
+#include "rclcpp/utilities.hpp"
#include "ros2_control_test_assets/descriptions.hpp"
TEST(TestLoadJointGroupVelocityController, load_controller)
diff --git a/force_torque_sensor_broadcaster/package.xml b/force_torque_sensor_broadcaster/package.xml
index dfca1c2198..ffe94923dd 100644
--- a/force_torque_sensor_broadcaster/package.xml
+++ b/force_torque_sensor_broadcaster/package.xml
@@ -23,6 +23,7 @@
ament_cmake_gmock
controller_manager
+ hardware_interface_testing
ros2_control_test_assets
diff --git a/forward_command_controller/package.xml b/forward_command_controller/package.xml
index 684531acac..905f409726 100644
--- a/forward_command_controller/package.xml
+++ b/forward_command_controller/package.xml
@@ -22,6 +22,7 @@
ament_cmake_gmock
controller_manager
+ hardware_interface_testing
ros2_control_test_assets
diff --git a/gripper_controllers/package.xml b/gripper_controllers/package.xml
index 5e3fcad8bc..adb67940db 100644
--- a/gripper_controllers/package.xml
+++ b/gripper_controllers/package.xml
@@ -27,6 +27,7 @@
ament_cmake_gmock
controller_manager
+ hardware_interface_testing
ros2_control_test_assets
diff --git a/gripper_controllers/test/test_load_gripper_action_controllers.cpp b/gripper_controllers/test/test_load_gripper_action_controllers.cpp
index 130b12e0bb..0ef5f0bcb2 100644
--- a/gripper_controllers/test/test_load_gripper_action_controllers.cpp
+++ b/gripper_controllers/test/test_load_gripper_action_controllers.cpp
@@ -17,7 +17,9 @@
#include "controller_manager/controller_manager.hpp"
#include "hardware_interface/resource_manager.hpp"
+#include "rclcpp/executor.hpp"
#include "rclcpp/executors/single_threaded_executor.hpp"
+#include "rclcpp/utilities.hpp"
#include "ros2_control_test_assets/descriptions.hpp"
TEST(TestLoadGripperActionControllers, load_controller)
diff --git a/imu_sensor_broadcaster/package.xml b/imu_sensor_broadcaster/package.xml
index 8d70409efb..5cd80f867b 100644
--- a/imu_sensor_broadcaster/package.xml
+++ b/imu_sensor_broadcaster/package.xml
@@ -25,6 +25,7 @@
ament_lint_auto
ament_lint_common
controller_manager
+ hardware_interface_testing
ros2_control_test_assets
diff --git a/joint_state_broadcaster/package.xml b/joint_state_broadcaster/package.xml
index 393cf75fd3..3b91ccb471 100644
--- a/joint_state_broadcaster/package.xml
+++ b/joint_state_broadcaster/package.xml
@@ -25,6 +25,7 @@
ament_cmake_gmock
controller_manager
+ hardware_interface_testing
hardware_interface
rclcpp
ros2_control_test_assets
diff --git a/joint_trajectory_controller/package.xml b/joint_trajectory_controller/package.xml
index 2dc9f5fb13..a5262a17d0 100644
--- a/joint_trajectory_controller/package.xml
+++ b/joint_trajectory_controller/package.xml
@@ -28,6 +28,7 @@
ament_cmake_gmock
controller_manager
+ hardware_interface_testing
ros2_control_test_assets
diff --git a/position_controllers/package.xml b/position_controllers/package.xml
index 303e7cde5c..47c27bd151 100644
--- a/position_controllers/package.xml
+++ b/position_controllers/package.xml
@@ -17,6 +17,8 @@
ament_cmake_gmock
controller_manager
+ hardware_interface_testing
+ hardware_interface
ros2_control_test_assets
diff --git a/position_controllers/test/test_load_joint_group_position_controller.cpp b/position_controllers/test/test_load_joint_group_position_controller.cpp
index fe61039fdb..bc27b5e629 100644
--- a/position_controllers/test/test_load_joint_group_position_controller.cpp
+++ b/position_controllers/test/test_load_joint_group_position_controller.cpp
@@ -17,7 +17,9 @@
#include "controller_manager/controller_manager.hpp"
#include "hardware_interface/resource_manager.hpp"
+#include "rclcpp/executor.hpp"
#include "rclcpp/executors/single_threaded_executor.hpp"
+#include "rclcpp/utilities.hpp"
#include "ros2_control_test_assets/descriptions.hpp"
TEST(TestLoadJointGroupPositionController, load_controller)
diff --git a/range_sensor_broadcaster/package.xml b/range_sensor_broadcaster/package.xml
index f48b2587e2..ea79a4b734 100644
--- a/range_sensor_broadcaster/package.xml
+++ b/range_sensor_broadcaster/package.xml
@@ -22,7 +22,7 @@
ament_cmake_gmock
controller_manager
- hardware_interface
+ hardware_interface_testing
ros2_control_test_assets
diff --git a/tricycle_controller/package.xml b/tricycle_controller/package.xml
index 563ca3920b..65d9e26c94 100644
--- a/tricycle_controller/package.xml
+++ b/tricycle_controller/package.xml
@@ -29,6 +29,7 @@
ament_cmake_gmock
controller_manager
+ hardware_interface_testing
ros2_control_test_assets
diff --git a/tricycle_controller/test/test_load_tricycle_controller.cpp b/tricycle_controller/test/test_load_tricycle_controller.cpp
index 9298fae574..229d014fe9 100644
--- a/tricycle_controller/test/test_load_tricycle_controller.cpp
+++ b/tricycle_controller/test/test_load_tricycle_controller.cpp
@@ -21,7 +21,9 @@
#include "controller_manager/controller_manager.hpp"
#include "hardware_interface/resource_manager.hpp"
+#include "rclcpp/executor.hpp"
#include "rclcpp/executors/single_threaded_executor.hpp"
+#include "rclcpp/utilities.hpp"
#include "ros2_control_test_assets/descriptions.hpp"
TEST(TestLoadTricycleController, load_controller)
diff --git a/tricycle_steering_controller/package.xml b/tricycle_steering_controller/package.xml
index 7c8fd25241..fc1b789741 100644
--- a/tricycle_steering_controller/package.xml
+++ b/tricycle_steering_controller/package.xml
@@ -29,7 +29,7 @@
ament_cmake_gmock
controller_manager
- hardware_interface
+ hardware_interface_testing
ros2_control_test_assets
diff --git a/velocity_controllers/package.xml b/velocity_controllers/package.xml
index abda9b3a1b..5d1aef9fdd 100644
--- a/velocity_controllers/package.xml
+++ b/velocity_controllers/package.xml
@@ -17,6 +17,7 @@
ament_cmake_gmock
controller_manager
+ hardware_interface_testing
hardware_interface
ros2_control_test_assets
diff --git a/velocity_controllers/test/test_load_joint_group_velocity_controller.cpp b/velocity_controllers/test/test_load_joint_group_velocity_controller.cpp
index 1872b5f746..e426349f96 100644
--- a/velocity_controllers/test/test_load_joint_group_velocity_controller.cpp
+++ b/velocity_controllers/test/test_load_joint_group_velocity_controller.cpp
@@ -17,7 +17,9 @@
#include "controller_manager/controller_manager.hpp"
#include "hardware_interface/resource_manager.hpp"
+#include "rclcpp/executor.hpp"
#include "rclcpp/executors/single_threaded_executor.hpp"
+#include "rclcpp/utilities.hpp"
#include "ros2_control_test_assets/descriptions.hpp"
TEST(TestLoadJointGroupVelocityController, load_controller)