diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 324b1a7a77d6410e12c554e645f790e773e67879..e8f5e04bdd1f5f753d80cb91b7ac1d19f664db3e 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -413,7 +413,6 @@ DebugBuild { PX4FirmwarePlugin { PX4FirmwarePluginFactory  { APMFirmwarePlugin {
 
     HEADERS += \
         src/AnalyzeView/LogDownloadTest.h \
-        src/audio/QGCAudioWorkerTest.h \
         src/FactSystem/FactSystemTestBase.h \
         src/FactSystem/FactSystemTestGeneric.h \
         src/FactSystem/FactSystemTestPX4.h \
@@ -449,7 +448,6 @@ DebugBuild { PX4FirmwarePlugin { PX4FirmwarePluginFactory  { APMFirmwarePlugin {
 
     SOURCES += \
         src/AnalyzeView/LogDownloadTest.cc \
-        src/audio/QGCAudioWorkerTest.cc \
         src/FactSystem/FactSystemTestBase.cc \
         src/FactSystem/FactSystemTestGeneric.cc \
         src/FactSystem/FactSystemTestPX4.cc \
diff --git a/src/qgcunittest/UnitTestList.cc b/src/qgcunittest/UnitTestList.cc
index becadb020ec5ddce11584deb3f5d0388028bfa63..2a4bee03d0a538541823df4f13e190404495dec4 100644
--- a/src/qgcunittest/UnitTestList.cc
+++ b/src/qgcunittest/UnitTestList.cc
@@ -38,7 +38,11 @@
 #include "PlanMasterControllerTest.h"
 #include "MissionSettingsTest.h"
 #include "QGCMapPolygonTest.h"
+
+#if 0
+// Temporarily disabled until I move some stuff from Stable to master
 #include "QGCAudioWorkerTest.h"
+#endif
 
 UT_REGISTER_TEST(FactSystemTestGeneric)
 UT_REGISTER_TEST(FactSystemTestPX4)
@@ -64,7 +68,10 @@ UT_REGISTER_TEST(SpeedSectionTest)
 UT_REGISTER_TEST(PlanMasterControllerTest)
 UT_REGISTER_TEST(MissionSettingsTest)
 UT_REGISTER_TEST(QGCMapPolygonTest)
+#if 0
+// Temporarily disabled until I move some stuff from Stable to master
 UT_REGISTER_TEST(QGCAudioWorkerTest)
+#endif
 
 // List of unit test which are currently disabled.
 // If disabling a new test, include reason in comment.