diff --git a/integrationtests/demo_tests/direct_offboard_posctl_test.py b/integrationtests/demo_tests/direct_offboard_posctl_test.py
index 0db4fd1312e1..e09550bbc256 100755
--- a/integrationtests/demo_tests/direct_offboard_posctl_test.py
+++ b/integrationtests/demo_tests/direct_offboard_posctl_test.py
@@ -62,7 +62,7 @@
 # For the test to be successful it needs to stay on the predefined path
 # and reach all setpoints in a certain time.
 #
-class OffboardPosctlTest(unittest.TestCase):
+class DirectOffboardPosctlTest(unittest.TestCase):
 
     def setUp(self):
         rospy.init_node('test_node', anonymous=True)
@@ -163,5 +163,5 @@ def test_posctl(self):
 
 if __name__ == '__main__':
     import rostest
-    rostest.rosrun(PKG, 'direct_offboard_posctl_test', OffboardPosctlTest)
+    rostest.rosrun(PKG, 'direct_offboard_posctl_test', DirectOffboardPosctlTest)
     #unittest.main()
diff --git a/integrationtests/demo_tests/mavros_offboard_attctl_test.py b/integrationtests/demo_tests/mavros_offboard_attctl_test.py
index 2f568adc9452..27885635a1cf 100755
--- a/integrationtests/demo_tests/mavros_offboard_attctl_test.py
+++ b/integrationtests/demo_tests/mavros_offboard_attctl_test.py
@@ -61,7 +61,7 @@
 # For the test to be successful it needs to reach all setpoints in a certain time.
 # FIXME: add flight path assertion (needs transformation from ROS frame to NED)
 #
-class OffboardAttctlTest(unittest.TestCase):
+class MavrosOffboardAttctlTest(unittest.TestCase):
 
     def setUp(self):
         rospy.init_node('test_node', anonymous=True)
@@ -138,5 +138,5 @@ def test_attctl(self):
 
 if __name__ == '__main__':
     import rostest
-    rostest.rosrun(PKG, 'mavros_offboard_attctl_test', OffboardAttctlTest)
+    rostest.rosrun(PKG, 'mavros_offboard_attctl_test', MavrosOffboardAttctlTest)
     #unittest.main()
diff --git a/integrationtests/demo_tests/mavros_offboard_posctl_test.py b/integrationtests/demo_tests/mavros_offboard_posctl_test.py
index 09ca5d9fd5f1..a1f1cf3c5526 100755
--- a/integrationtests/demo_tests/mavros_offboard_posctl_test.py
+++ b/integrationtests/demo_tests/mavros_offboard_posctl_test.py
@@ -60,7 +60,7 @@
 # For the test to be successful it needs to reach all setpoints in a certain time.
 # FIXME: add flight path assertion (needs transformation from ROS frame to NED)
 #
-class OffboardPosctlTest(unittest.TestCase):
+class MavrosOffboardPosctlTest(unittest.TestCase):
 
     def setUp(self):
         rospy.init_node('test_node', anonymous=True)
@@ -170,5 +170,5 @@ def test_posctl(self):
 
 if __name__ == '__main__':
     import rostest
-    rostest.rosrun(PKG, 'mavros_offboard_posctl_test', OffboardPosctlTest)
+    rostest.rosrun(PKG, 'mavros_offboard_posctl_test', MavrosOffboardPosctlTest)
     #unittest.main()