diff --git a/integrationtests/demo_tests/demo_tests.launch b/integrationtests/demo_tests/demo_tests.launch
deleted file mode 100644
index 34281b781a..0000000000
--- a/integrationtests/demo_tests/demo_tests.launch
+++ /dev/null
@@ -1,19 +0,0 @@
-<launch>
-	<arg name="headless" default="false"/>
-  	<arg name="gui" default="true"/>
-  	<arg name="enable_logging" default="false"/>
-    <arg name="enable_ground_truth" default="false"/>
-    <arg name="log_file" default="iris"/>
-
-	<include file="$(find px4)/launch/gazebo_iris_empty_world.launch">
-		<arg name="headless" value="$(arg headless)"/>
-    	<arg name="gui" value="$(arg gui)"/>
-    	<arg name="enable_logging" value="$(arg enable_logging)" />
-        <arg name="enable_ground_truth" value="$(arg enable_ground_truth)" />
-        <arg name="log_file" value="$(arg log_file)"/>
-	</include>
-	<include file="$(find px4)/launch/mavros_sitl.launch" />
-
-	<test test-name="arm" pkg="px4" type="arm_test.py" />
-	<test test-name="offboard_posctl" pkg="px4" type="offboard_posctl_test.py" />
-</launch>
diff --git a/integrationtests/demo_tests/arm_test.py b/integrationtests/demo_tests/direct_arm_test.py
similarity index 100%
rename from integrationtests/demo_tests/arm_test.py
rename to integrationtests/demo_tests/direct_arm_test.py
diff --git a/integrationtests/demo_tests/offboard_posctl_test.py b/integrationtests/demo_tests/direct_offboard_posctl_test.py
similarity index 100%
rename from integrationtests/demo_tests/offboard_posctl_test.py
rename to integrationtests/demo_tests/direct_offboard_posctl_test.py
diff --git a/integrationtests/demo_tests/direct_tests.launch b/integrationtests/demo_tests/direct_tests.launch
new file mode 100644
index 0000000000..d871c085cf
--- /dev/null
+++ b/integrationtests/demo_tests/direct_tests.launch
@@ -0,0 +1,18 @@
+<launch>
+    <arg name="headless" default="true"/>
+    <arg name="gui" default="false"/>
+    <arg name="enable_logging" default="false"/>
+    <arg name="enable_ground_truth" default="false"/>
+    <arg name="log_file" default="iris"/>
+
+    <include file="$(find px4)/launch/gazebo_iris_empty_world.launch">
+        <arg name="headless" value="$(arg headless)"/>
+        <arg name="gui" value="$(arg gui)"/>
+        <arg name="enable_logging" value="$(arg enable_logging)" />
+        <arg name="enable_ground_truth" value="$(arg enable_ground_truth)" />
+        <arg name="log_file" value="$(arg log_file)"/>
+    </include>
+
+    <test test-name="direct_arm" pkg="px4" type="direct_arm_test.py" />
+    <test test-name="direct_offboard_posctl" pkg="px4" type="direct_offboard_posctl_test.py" />
+</launch>
diff --git a/integrationtests/demo_tests/mavros_tests.launch b/integrationtests/demo_tests/mavros_tests.launch
new file mode 100644
index 0000000000..f5ad3412d0
--- /dev/null
+++ b/integrationtests/demo_tests/mavros_tests.launch
@@ -0,0 +1,18 @@
+<launch>
+      <arg name="headless" default="true"/>
+    <arg name="gui" default="false"/>
+    <arg name="enable_logging" default="false"/>
+    <arg name="enable_ground_truth" default="false"/>
+    <arg name="log_file" default="iris"/>
+
+    <include file="$(find px4)/launch/gazebo_iris_empty_world.launch">
+        <arg name="headless" value="$(arg headless)"/>
+        <arg name="gui" value="$(arg gui)"/>
+        <arg name="enable_logging" value="$(arg enable_logging)" />
+        <arg name="enable_ground_truth" value="$(arg enable_ground_truth)" />
+        <arg name="log_file" value="$(arg log_file)"/>
+    </include>
+    <include file="$(find px4)/launch/mavros_sitl.launch" />
+
+    <test test-name="direct_arm" pkg="px4" type="mavros_offboard_posctl_test.py" />
+</launch>
diff --git a/integrationtests/integrationtests.launch b/integrationtests/integrationtests.launch
index 2e59b56155..7f6368d12b 100644
--- a/integrationtests/integrationtests.launch
+++ b/integrationtests/integrationtests.launch
@@ -1,15 +1,4 @@
 <launch>
-	<arg name="headless" default="true"/>
-    <arg name="gui" default="false"/>
-    <arg name="enable_logging" default="false"/>
-    <arg name="enable_ground_truth" default="false"/>
-    <arg name="log_file" default="iris"/>
-
-	<include file="$(find px4)/integrationtests/demo_tests/demo_tests.launch">
-		<arg name="headless" value="$(arg headless)"/>
-        <arg name="gui" value="$(arg gui)"/>
-        <arg name="enable_logging" value="$(arg enable_logging)" />
-        <arg name="enable_ground_truth" value="$(arg enable_ground_truth)" />
-        <arg name="log_file" value="$(arg log_file)"/>
-	</include>
+	<include file="$(find px4)/integrationtests/demo_tests/direct_tests.launch" />
+	<include file="$(find px4)/integrationtests/demo_tests/mavros_tests.launch" />
 </launch>