diff --git a/test/mavsdk_tests/autopilot_tester.cpp b/test/mavsdk_tests/autopilot_tester.cpp
index 0e42a4a837..61916b1f2b 100644
--- a/test/mavsdk_tests/autopilot_tester.cpp
+++ b/test/mavsdk_tests/autopilot_tester.cpp
@@ -352,8 +352,8 @@ void AutopilotTester::fly_forward_in_posctl()
 
 	CHECK(_manual_control->start_position_control() == ManualControl::Result::Success);
 
-	// Climb up for 10 seconds
-	for (unsigned i = 0; i < 10 * manual_control_rate_hz; ++i) {
+	// Climb up for 20 seconds
+	for (unsigned i = 0; i < 20 * manual_control_rate_hz; ++i) {
 		CHECK(_manual_control->set_manual_control_input(0.f, 0.f, 1.f, 0.f) == ManualControl::Result::Success);
 		std::this_thread::sleep_for(adjust_to_lockstep_speed(std::chrono::milliseconds(1000 / manual_control_rate_hz)));
 	}
@@ -387,8 +387,8 @@ void AutopilotTester::fly_forward_in_altctl()
 
 	CHECK(_manual_control->start_altitude_control() == ManualControl::Result::Success);
 
-	// Climb up for 10 seconds
-	for (unsigned i = 0; i < 10 * manual_control_rate_hz; ++i) {
+	// Climb up for 20 seconds
+	for (unsigned i = 0; i < 20 * manual_control_rate_hz; ++i) {
 		CHECK(_manual_control->set_manual_control_input(0.f, 0.f, 1.f, 0.f) == ManualControl::Result::Success);
 		std::this_thread::sleep_for(adjust_to_lockstep_speed(std::chrono::milliseconds(1000 / manual_control_rate_hz)));
 	}