diff --git a/src/modules/mavlink/mavlink b/src/modules/mavlink/mavlink
index 342530b83c..b401fe0238 160000
--- a/src/modules/mavlink/mavlink
+++ b/src/modules/mavlink/mavlink
@@ -1 +1 @@
-Subproject commit 342530b83c215654f12988ab682111281d2e71f0
+Subproject commit b401fe0238b9647f8ea18d58d9e968b79b347916
diff --git a/test/mavsdk_tests/autopilot_tester_figure_eight.cpp b/test/mavsdk_tests/autopilot_tester_figure_eight.cpp
index 2d6e8f0b85..45142f579d 100644
--- a/test/mavsdk_tests/autopilot_tester_figure_eight.cpp
+++ b/test/mavsdk_tests/autopilot_tester_figure_eight.cpp
@@ -39,7 +39,11 @@
 #include <future>
 #include <vector>
 
+
 #include <mavsdk/plugins/mavlink_passthrough/mavlink_passthrough.h>
+
+// Fix build until this is moved to common.xml
+#define MAVLINK_WIP
 #include <mavlink/development/mavlink_msg_figure_eight_execution_status.h>
 
 using namespace mavsdk::geometry;