diff --git a/libnymea-core/nymeacore.cpp b/libnymea-core/nymeacore.cpp
index 0dc9cc6b..6666266a 100644
--- a/libnymea-core/nymeacore.cpp
+++ b/libnymea-core/nymeacore.cpp
@@ -221,12 +221,13 @@ void NymeaCore::init() {
 /*! Destructor of the \l{NymeaCore}. */
 NymeaCore::~NymeaCore()
 {
+    qCDebug(dcApplication()) << "Shutting down NymeaCore";
     m_logger->logSystemEvent(m_timeManager->currentDateTime(), false);
 
-    // Disconnect everything that could still spawn events
-    disconnect(m_deviceManager);
-    disconnect(m_ruleEngine);
-    disconnect(m_timeManager);
+    // Disconnect all signals/slots, we're going down now
+    m_timeManager->disconnect(this);
+    m_deviceManager->disconnect(this);
+    m_ruleEngine->disconnect(this);
 
     // At very first, cut off the outside world
     qCDebug(dcApplication) << "Shutting down \"Server Manager\"";
diff --git a/tests/testlib/nymeatestbase.cpp b/tests/testlib/nymeatestbase.cpp
index d03cd616..35852bc7 100644
--- a/tests/testlib/nymeatestbase.cpp
+++ b/tests/testlib/nymeatestbase.cpp
@@ -62,7 +62,7 @@ void NymeaTestBase::initTestCase()
     NymeaSettings nymeadSettings(NymeaSettings::SettingsRoleGlobal);
     nymeadSettings.clear();
 
-    QLoggingCategory::setFilterRules("*.debug=false\nTests.debug=true\nMockDevice.debug=true");
+    QLoggingCategory::setFilterRules("*.debug=false\nApplication.debug=true\nTests.debug=true\nMockDevice.debug=true");
 
     // Start the server
     qCDebug(dcTests()) << "Setting up nymea core instance";