diff --git a/test/mavros_posix_test_mission.test b/test/mavros_posix_test_mission.test
index 8e9900bd4a..4d946f1b43 100644
--- a/test/mavros_posix_test_mission.test
+++ b/test/mavros_posix_test_mission.test
@@ -5,16 +5,16 @@
     <arg name="est" default="ekf2"/>
     <arg name="gui" default="false"/>
     <arg name="interactive" default="false"/>
+    <arg name="mission"/>  <!-- no default, required input -->
     <arg name="vehicle" default="iris"/>
-    <arg name="mission"/>
     <!-- MAVROS, PX4 SITL, Gazebo -->
     <include file="$(find px4)/launch/mavros_posix_sitl.launch">
         <arg name="est" value="$(arg est)"/>
         <arg name="gui" value="$(arg gui)"/>
         <arg name="interactive" value="$(arg interactive)"/>
-        <arg name="vehicle" value="$(arg vehicle)"/>
         <arg name="respawn_gazebo" value="true"/>
         <arg name="respawn_mavros" value="true"/>
+        <arg name="vehicle" value="$(arg vehicle)"/>
         <arg name="verbose" value="true"/>
     </include>
     <!-- ROStest -->
diff --git a/test/mavros_posix_tests_iris_opt_flow.test b/test/mavros_posix_tests_iris_opt_flow.test
index 6417a3fc2d..c7d3f71b14 100644
--- a/test/mavros_posix_tests_iris_opt_flow.test
+++ b/test/mavros_posix_tests_iris_opt_flow.test
@@ -10,9 +10,9 @@
         <arg name="est" value="$(arg est)"/>
         <arg name="gui" value="$(arg gui)"/>
         <arg name="interactive" value="$(arg interactive)"/>
-        <arg name="vehicle" value="iris_opt_flow"/>
         <arg name="respawn_gazebo" value="true"/>
         <arg name="respawn_mavros" value="true"/>
+        <arg name="vehicle" value="iris_opt_flow"/>
         <arg name="verbose" value="true"/>
     </include>
     <!-- ROStest -->
diff --git a/test/mavros_posix_tests_missions.test b/test/mavros_posix_tests_missions.test
index bfda4d2e0f..5f18d19882 100644
--- a/test/mavros_posix_tests_missions.test
+++ b/test/mavros_posix_tests_missions.test
@@ -4,16 +4,16 @@
     <!-- Test all missions -->
     <arg name="est" default="ekf2"/>
     <arg name="gui" default="false"/>
-    <arg name="vehicle" default="standard_vtol"/>
     <arg name="interactive" default="false"/>
+    <arg name="vehicle" default="standard_vtol"/>
     <!-- MAVROS, PX4 SITL, Gazebo -->
     <include file="$(find px4)/launch/mavros_posix_sitl.launch">
         <arg name="est" value="$(arg est)"/>
         <arg name="gui" value="$(arg gui)"/>
         <arg name="interactive" value="$(arg interactive)"/>
-        <arg name="vehicle" value="$(arg vehicle)"/>
         <arg name="respawn_gazebo" value="true"/>
         <arg name="respawn_mavros" value="true"/>
+        <arg name="vehicle" value="$(arg vehicle)"/>
         <arg name="verbose" value="true"/>
     </include>
     <!-- ROStest -->
diff --git a/test/mavros_posix_tests_offboard_attctl.test b/test/mavros_posix_tests_offboard_attctl.test
index 6852d52384..58fc2df6f0 100644
--- a/test/mavros_posix_tests_offboard_attctl.test
+++ b/test/mavros_posix_tests_offboard_attctl.test
@@ -4,16 +4,16 @@
     <!-- Test offboard attitude control -->
     <arg name="est" default="ekf2"/>
     <arg name="gui" default="false"/>
-    <arg name="vehicle" default="iris"/>
     <arg name="interactive" default="false"/>
+    <arg name="vehicle" default="iris"/>
     <!-- MAVROS, PX4 SITL, Gazebo -->
     <include file="$(find px4)/launch/mavros_posix_sitl.launch">
         <arg name="est" value="$(arg est)"/>
         <arg name="gui" value="$(arg gui)"/>
         <arg name="interactive" value="$(arg interactive)"/>
-        <arg name="vehicle" value="$(arg vehicle)"/>
         <arg name="respawn_gazebo" value="true"/>
         <arg name="respawn_mavros" value="true"/>
+        <arg name="vehicle" value="$(arg vehicle)"/>
         <arg name="verbose" value="true"/>
     </include>
     <!-- ROStest -->
diff --git a/test/mavros_posix_tests_offboard_posctl.test b/test/mavros_posix_tests_offboard_posctl.test
index 1e3576d240..7fbb35737e 100644
--- a/test/mavros_posix_tests_offboard_posctl.test
+++ b/test/mavros_posix_tests_offboard_posctl.test
@@ -4,16 +4,16 @@
     <!-- Test offboard local posistion control -->
     <arg name="est" default="ekf2"/>
     <arg name="gui" default="false"/>
-    <arg name="vehicle" default="iris"/>
     <arg name="interactive" default="false"/>
+    <arg name="vehicle" default="iris"/>
     <!-- MAVROS, PX4 SITL, Gazebo -->
     <include file="$(find px4)/launch/mavros_posix_sitl.launch">
         <arg name="est" value="$(arg est)"/>
         <arg name="gui" value="$(arg gui)"/>
         <arg name="interactive" value="$(arg interactive)"/>
-        <arg name="vehicle" value="$(arg vehicle)"/>
         <arg name="respawn_gazebo" value="true"/>
         <arg name="respawn_mavros" value="true"/>
+        <arg name="vehicle" value="$(arg vehicle)"/>
         <arg name="verbose" value="true"/>
     </include>
     <!-- ROStest -->