diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc
index adf28b1b2d072641e6264a42e85a49ded8cbb073..cefc505929f53db642e04ddfef7baea24cdb40ab 100644
--- a/src/QGCApplication.cc
+++ b/src/QGCApplication.cc
@@ -219,17 +219,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
                 filterRules += ".debug=true\n";
             }
         }
-        
-        if (_runningUnitTests) {
-            // We need to turn off these warnings until the firmware meta data is cleaned up
-            filterRules += "PX4ParameterLoaderLog.warning=false\n";
-        }
     } else {
-        if (_runningUnitTests) {
-            // We need to turn off these warnings until the firmware meta data is cleaned up
-            QLoggingCategory::setFilterRules(QStringLiteral("PX4ParameterLoaderLog.warning=false"));
-        }
-        
         // First thing we want to do is set up the qtlogging.ini file. If it doesn't already exist we copy
         // it to the correct location. This way default debug builds will have logging turned off.
 
diff --git a/src/comm/MockLink.cc b/src/comm/MockLink.cc
index 2aa4959e5837cd4f93cc9f7c5662ed254350987b..53d2518828e9649e9122186ef75896f122128796 100644
--- a/src/comm/MockLink.cc
+++ b/src/comm/MockLink.cc
@@ -31,7 +31,7 @@
 #include <string.h>
 
 QGC_LOGGING_CATEGORY(MockLinkLog, "MockLinkLog")
-QGC_LOGGING_CATEGORY(MockLinkLogVerbose, "MockLinkLogVerbose")
+QGC_LOGGING_CATEGORY(MockLinkVerboseLog, "MockLinkVerboseLog")
 
 /// @file
 ///     @brief Mock implementation of a Link.
@@ -216,7 +216,7 @@ void MockLink::_loadParams(void)
                 break;
         }
 
-        qCDebug(MockLinkLogVerbose) << "Loading param" << paramName << paramValue;
+        qCDebug(MockLinkVerboseLog) << "Loading param" << paramName << paramValue;
 
         _mapParamName2Value[componentId][paramName] = paramValue;
         _mapParamName2MavParamType[paramName] = static_cast<MAV_PARAM_TYPE>(paramType);
diff --git a/src/comm/MockLink.h b/src/comm/MockLink.h
index 3e1f703df0e98919ffa1acf2885ecf12f21711e8..ceb4269dbc13013200f25169267029f6c72bce20 100644
--- a/src/comm/MockLink.h
+++ b/src/comm/MockLink.h
@@ -33,7 +33,7 @@
 #include "QGCMAVLink.h"
 
 Q_DECLARE_LOGGING_CATEGORY(MockLinkLog)
-Q_DECLARE_LOGGING_CATEGORY(MockLinkLogVerbose)
+Q_DECLARE_LOGGING_CATEGORY(MockLinkVerboseLog)
 
 /// @file
 ///     @brief Mock implementation of a Link.
diff --git a/src/qgcunittest/MavlinkLogTest.cc b/src/qgcunittest/MavlinkLogTest.cc
index 68fb543a2b2544cf2e99f1d80cb897e92c2c92fc..44b1c39bcc6d31a6da77d8692c9b9ab7b53db6b2 100644
--- a/src/qgcunittest/MavlinkLogTest.cc
+++ b/src/qgcunittest/MavlinkLogTest.cc
@@ -180,7 +180,7 @@ void MavlinkLogTest::_connectLogNoArm_test(void)
 
 void MavlinkLogTest::_connectLogArm_test(void)
 {
-    //_connectLogWorker(true);
+    _connectLogWorker(true);
 }
 
 void MavlinkLogTest::_deleteTempLogFiles_test(void)