diff --git a/tests/test_common.hpp b/tests/test_common.hpp
index 008a18357aaba90ef83a304a29f0c621a5cee123..0b13166082c92373d77e61427ccc3f9b6bfd2b1b 100644
--- a/tests/test_common.hpp
+++ b/tests/test_common.hpp
@@ -46,7 +46,7 @@ void start_dg_ros_service()
     ASSERT_TRUE(response.valid());
     // wait_for_response(response);
     ASSERT_TRUE(rclcpp::spin_until_future_complete(ros_node, response) ==
-                rclcpp::executor::FutureReturnCode::SUCCESS);
+                rclcpp::FutureReturnCode::SUCCESS);
 }
 
 void stop_dg_ros_service()
@@ -68,7 +68,7 @@ void stop_dg_ros_service()
     ASSERT_TRUE(response.valid());
     // wait_for_response(response);
     ASSERT_TRUE(rclcpp::spin_until_future_complete(ros_node, response) ==
-                rclcpp::executor::FutureReturnCode::SUCCESS);
+                rclcpp::FutureReturnCode::SUCCESS);
 }
 
 void start_run_python_command_ros_service(const std::string& cmd,
@@ -96,7 +96,7 @@ void start_run_python_command_ros_service(const std::string& cmd,
     ASSERT_TRUE(response.valid());
     // wait_for_response(response);
     ASSERT_TRUE(rclcpp::spin_until_future_complete(ros_node, response) ==
-                rclcpp::executor::FutureReturnCode::SUCCESS);
+                rclcpp::FutureReturnCode::SUCCESS);
     // Get the results.
     result = response.get()->result;
     standarderror = response.get()->standarderror;
@@ -126,7 +126,7 @@ void start_run_python_script_ros_service(const std::string& file_name,
     ASSERT_TRUE(response.valid());
     // wait_for_response(response);
     ASSERT_TRUE(rclcpp::spin_until_future_complete(ros_node, response) ==
-                rclcpp::executor::FutureReturnCode::SUCCESS);
+                rclcpp::FutureReturnCode::SUCCESS);
     // Get the results.
     result = response.get()->result;
 }
@@ -164,4 +164,4 @@ void display_services()
             std::cerr << const_it->second[i] << std::endl;
         }
     }
-}
\ No newline at end of file
+}