diff --git a/test/mavsdk_tests/test_multicopter_offboard.cpp b/test/mavsdk_tests/test_multicopter_offboard.cpp
index 60221ec9b2..16e4ffbbff 100644
--- a/test/mavsdk_tests/test_multicopter_offboard.cpp
+++ b/test/mavsdk_tests/test_multicopter_offboard.cpp
@@ -35,12 +35,12 @@
 #include <chrono>
 
 
-TEST_CASE("Offboard takeoff and land", "[multicopter][offboard][nogps]")
+TEST_CASE("Offboard takeoff and land", "[multicopter][offboard]")
 {
 	AutopilotTester tester;
 	Offboard::PositionNedYaw takeoff_position {0.0f, 0.0f, -2.0f, 0.0f};
 	tester.connect(connection_url);
-	tester.wait_until_ready_local_position_only();
+	tester.wait_until_ready();
 	tester.store_home();
 	tester.arm();
 	std::chrono::seconds goto_timeout = std::chrono::seconds(90);
@@ -50,7 +50,7 @@ TEST_CASE("Offboard takeoff and land", "[multicopter][offboard][nogps]")
 	tester.check_home_within(1.0f);
 }
 
-TEST_CASE("Offboard position control", "[multicopter][offboard][nogps]")
+TEST_CASE("Offboard position control", "[multicopter][offboard]")
 {
 	AutopilotTester tester;
 	Offboard::PositionNedYaw takeoff_position {0.0f, 0.0f, -2.0f, 0.0f};
@@ -58,7 +58,7 @@ TEST_CASE("Offboard position control", "[multicopter][offboard][nogps]")
 	Offboard::PositionNedYaw setpoint_2 {5.0f, 5.0f, -4.0f, 180.0f};
 	Offboard::PositionNedYaw setpoint_3 {5.0f, 0.0f, -4.0f, 90.0f};
 	tester.connect(connection_url);
-	tester.wait_until_ready_local_position_only();
+	tester.wait_until_ready();
 	tester.store_home();
 	tester.arm();
 	std::chrono::seconds goto_timeout = std::chrono::seconds(90);