diff --git a/ackermann_steering_controller/package.xml b/ackermann_steering_controller/package.xml
index 366c5c31cf..fe22ca10b8 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 d379438824..e690330aa0 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 cddfcf3975..8bb6ac79fa 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/test/test_load_diff_drive_controller.cpp b/diff_drive_controller/test/test_load_diff_drive_controller.cpp
index 983ec6d98f..4c9d2f984f 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 ce2700ef01..279d5fbf43 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 1ebd0c4a79..0791eb5d16 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 cae9f877b7..8950a9a3e9 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 348cf6dd93..a35fce7894 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 b6fc59d85c..5694e1cee7 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 43dafb66b0..6dd8b4b61e 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 030d91d3e9..8cd2e5becc 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/pid_controller/package.xml b/pid_controller/package.xml
index 4aa553f31a..70c7bfa987 100644
--- a/pid_controller/package.xml
+++ b/pid_controller/package.xml
@@ -27,6 +27,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 e6a98ef7d2..e67d3d8a46 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 c74acce857..2d865c1d7f 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 d53e8473a1..4a8725810b 100644
--- a/tricycle_controller/package.xml
+++ b/tricycle_controller/package.xml
@@ -30,6 +30,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 245523c844..bd54459780 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 0263f8f9fe..16bfd522f7 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 94d61b8ae1..3e28f7736e 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)