diff --git a/test/mavsdk_tests/test_multicopter_offboard.cpp b/test/mavsdk_tests/test_multicopter_offboard.cpp
index f7694ce4cd..60221ec9b2 100644
--- a/test/mavsdk_tests/test_multicopter_offboard.cpp
+++ b/test/mavsdk_tests/test_multicopter_offboard.cpp
@@ -46,7 +46,7 @@ TEST_CASE("Offboard takeoff and land", "[multicopter][offboard][nogps]")
 	std::chrono::seconds goto_timeout = std::chrono::seconds(90);
 	tester.offboard_goto(takeoff_position, 0.1f, goto_timeout);
 	tester.offboard_land();
-	tester.wait_until_disarmed(goto_timeout);
+	tester.wait_until_disarmed(std::chrono::seconds(120));
 	tester.check_home_within(1.0f);
 }
 
@@ -68,6 +68,6 @@ TEST_CASE("Offboard position control", "[multicopter][offboard][nogps]")
 	tester.offboard_goto(setpoint_3, 0.1f, goto_timeout);
 	tester.offboard_goto(takeoff_position, 0.1f, goto_timeout);
 	tester.offboard_land();
-	tester.wait_until_disarmed(goto_timeout);
+	tester.wait_until_disarmed(std::chrono::seconds(120));
 	tester.check_home_within(1.0f);
 }