diff --git a/test/mavsdk_tests/autopilot_tester.cpp b/test/mavsdk_tests/autopilot_tester.cpp
index ffba005424..e1bbe9efde 100644
--- a/test/mavsdk_tests/autopilot_tester.cpp
+++ b/test/mavsdk_tests/autopilot_tester.cpp
@@ -442,14 +442,14 @@ void AutopilotTester::fly_forward_in_posctl()
 	wait_until_ready();
 	arm();
 
-	// Climb up for 20 seconds
-	for (unsigned i = 0; i < 20 * manual_control_rate_hz; ++i) {
+	// Climb up for 5 seconds
+	for (unsigned i = 0; i < 5 * manual_control_rate_hz; ++i) {
 		CHECK(_manual_control->set_manual_control_input(0.f, 0.f, 1.f, 0.f) == ManualControl::Result::Success);
 		sleep_for(std::chrono::milliseconds(1000 / manual_control_rate_hz));
 	}
 
-	// Fly forward for 60 seconds
-	for (unsigned i = 0; i < 60 * manual_control_rate_hz; ++i) {
+	// Fly forward for 10 seconds
+	for (unsigned i = 0; i < 10 * manual_control_rate_hz; ++i) {
 		CHECK(_manual_control->set_manual_control_input(0.5f, 0.f, 0.5f, 0.f) == ManualControl::Result::Success);
 		sleep_for(std::chrono::milliseconds(1000 / manual_control_rate_hz));
 	}
@@ -480,14 +480,14 @@ void AutopilotTester::fly_forward_in_altctl()
 	wait_until_ready();
 	arm();
 
-	// Climb up for 20 seconds
-	for (unsigned i = 0; i < 20 * manual_control_rate_hz; ++i) {
+	// Climb up for 5 seconds
+	for (unsigned i = 0; i < 5 * manual_control_rate_hz; ++i) {
 		CHECK(_manual_control->set_manual_control_input(0.f, 0.f, 1.f, 0.f) == ManualControl::Result::Success);
 		sleep_for(std::chrono::milliseconds(1000 / manual_control_rate_hz));
 	}
 
-	// Fly forward for 60 seconds
-	for (unsigned i = 0; i < 60 * manual_control_rate_hz; ++i) {
+	// Fly forward for 10 seconds
+	for (unsigned i = 0; i < 10 * manual_control_rate_hz; ++i) {
 		CHECK(_manual_control->set_manual_control_input(0.5f, 0.f, 0.5f, 0.f) == ManualControl::Result::Success);
 		sleep_for(std::chrono::milliseconds(1000 / manual_control_rate_hz));
 	}