diff --git a/integrationtests/python_src/px4_it/mavros/mission_test.py b/integrationtests/python_src/px4_it/mavros/mission_test.py
new file mode 100755
index 0000000000..17124a65ca
--- /dev/null
+++ b/integrationtests/python_src/px4_it/mavros/mission_test.py
@@ -0,0 +1,195 @@
+#!/usr/bin/env python
+#***************************************************************************
+#
+#   Copyright (c) 2015 PX4 Development Team. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name PX4 nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+#***************************************************************************/
+
+#
+# @author Andreas Antener <andreas@uaventure.com>
+#
+PKG = 'px4'
+
+import unittest
+import rospy
+import math
+import rosbag
+import sys
+
+import mavros
+from pymavlink import mavutil
+from mavros import mavlink
+
+from geometry_msgs.msg import PoseStamped
+from mavros_msgs.srv import CommandLong, WaypointPush
+from mavros_msgs.msg import Mavlink, Waypoint
+from sensor_msgs.msg import NavSatFix
+from mavros.mission import QGroundControlWP
+#from px4_test_helper import PX4TestHelper
+
+class MavrosMissionTest(unittest.TestCase):
+    """
+    Run a mission
+    """
+
+    def setUp(self):
+        rospy.init_node('test_node', anonymous=True)
+        #self.helper = PX4TestHelper("mavros_offboard_posctl_test")
+        #self.helper.setUp()
+
+        rospy.Subscriber("mavros/local_position/pose", PoseStamped, self.position_callback)
+        rospy.Subscriber("mavros/global_position/global", NavSatFix, self.global_position_callback)
+        self.pub_mavlink = rospy.Publisher('mavlink/to', Mavlink, queue_size=1)
+        rospy.wait_for_service('mavros/cmd/command', 30)
+        self._srv_cmd_long = rospy.ServiceProxy('mavros/cmd/command', CommandLong, persistent=True)
+        self._srv_wp_push = rospy.ServiceProxy('mavros/mission/push', WaypointPush, persistent=True)
+        self.rate = rospy.Rate(10) # 10hz
+        self.has_global_pos = False
+        self.local_position = PoseStamped()
+        self.global_position = NavSatFix()
+        self.home_alt = 0
+
+        # need to simulate heartbeat for datalink loss detection
+        rospy.Timer(rospy.Duration(0.5), self.send_heartbeat)
+
+    def tearDown(self):
+        #self.helper.tearDown()
+        pass
+
+    #
+    # General callback functions used in tests
+    #
+    def position_callback(self, data):
+        self.local_position = data
+
+    def global_position_callback(self, data):
+        self.global_position = data
+
+        if not self.has_global_pos:
+            self.home_alt = data.altitude
+            self.has_global_pos = True
+
+    #
+    # Helper methods
+    #
+    def is_at_position(self, lat, lon, alt, offset):
+        R = 6371000 # metres
+        rlat1 = math.radians(lat)
+        rlat2 = math.radians(self.global_position.latitude)
+
+        rlat_d = math.radians(self.global_position.latitude - lat)
+        rlon_d = math.radians(self.global_position.longitude - lon)
+
+        a = (math.sin(rlat_d / 2) * math.sin(rlat_d / 2) +
+             math.cos(rlat1) * math.cos(rlat2) *
+             math.sin(rlon_d / 2) * math.sin(rlon_d / 2))
+        c = 2 * math.atan2(math.sqrt(a), math.sqrt(1-a))
+
+        d = R * c
+        alt_d = abs(alt - self.global_position.altitude)
+
+        rospy.loginfo("d: %f, alt_d: %f", d, alt_d)
+        return d < offset and alt_d < offset
+
+    def reach_position(self, lat, lon, alt, radius, timeout):
+        # does it reach the position in X seconds?
+        count = 0
+        while count < timeout:
+            if self.is_at_position(lat, lon, alt, radius):
+                break
+            count = count + 1
+            self.rate.sleep()
+
+        self.assertTrue(count < timeout, ("took too long to get to position %f, %f, %f, %f, %d" %
+            (lat, lon, alt, radius, timeout)))
+
+    def run_mission(self):
+        """switch mode: armed | auto"""
+        self._srv_cmd_long(False, 176, False,
+                           # arm | custom, auto, mission
+                           128 | 1, 4, 4, 0, 0, 0, 0)
+
+    def wait_until_ready(self):
+        """FIXME: hack to wait for simulation to be ready"""
+        while not self.has_global_pos:
+            self.rate.sleep()
+
+    def send_heartbeat(self, event=None):
+        # mav type gcs
+        mavmsg = mavutil.mavlink.MAVLink_heartbeat_message(6, 0, 0, 0, 0, 0)
+        # XXX: hack: using header object to set mav properties
+        mavmsg.pack(mavutil.mavlink.MAVLink_header(0, 0, 0, 2, 1))
+        rosmsg = mavlink.convert_to_rosmsg(mavmsg)
+        self.pub_mavlink.publish(rosmsg)
+
+    def test_mission(self):
+        """Test mission"""
+
+        if len(sys.argv) < 2:
+            self.fail("no mission argument")
+            return
+
+        rospy.loginfo("reading mission")
+        mission = QGroundControlWP()
+        wps = []
+        for wp in mission.read(open(sys.argv[1], 'r')):
+            wps.append(wp)
+            rospy.logdebug(wp)
+
+        rospy.loginfo("wait until ready")
+        self.wait_until_ready()
+
+        rospy.loginfo("send mission")
+        res = self._srv_wp_push(wps)
+        rospy.loginfo(res)
+        self.assertTrue(res.success, "mission could not be transfered")
+
+        rospy.loginfo("run mission")
+        self.run_mission()
+
+        positions = (
+            (0, 0, 0),
+            (2, 2, 2),
+            (2, -2, 2),
+            (-2, -2, 2),
+            (2, 2, 2))
+
+        for wp in wps:
+            # only check position waypoints
+            if wp.frame == Waypoint.FRAME_GLOBAL_REL_ALT or wp.frame == Waypoint.FRAME_GLOBAL:
+                alt = wp.z_alt
+                if wp.frame == Waypoint.FRAME_GLOBAL_REL_ALT:
+                    alt += self.home_alt
+                self.reach_position(wp.x_lat, wp.y_long, alt, 10, 300)
+
+
+if __name__ == '__main__':
+    import rostest
+    rostest.rosrun(PKG, 'mavros_mission_test', MavrosMissionTest)