diff --git a/src/core/CustomData.cpp b/src/core/CustomData.cpp
index 97cbf9800..a9c5bcd3b 100644
--- a/src/core/CustomData.cpp
+++ b/src/core/CustomData.cpp
@@ -27,7 +27,7 @@ const QString CustomData::BrowserLegacyKeyPrefix = QStringLiteral("Public Key: "
 const QString CustomData::ExcludeFromReportsLegacy = QStringLiteral("KnownBad");
 
 // Fallback item for return by reference
-static const CustomData::CustomDataItem NULL_ITEM;
+static const CustomData::CustomDataItem NULL_ITEM{};
 
 CustomData::CustomData(QObject* parent)
     : ModifiableObject(parent)
diff --git a/src/core/Metadata.cpp b/src/core/Metadata.cpp
index a055bef6f..d88998057 100644
--- a/src/core/Metadata.cpp
+++ b/src/core/Metadata.cpp
@@ -29,7 +29,7 @@ const int Metadata::DefaultHistoryMaxItems = 10;
 const int Metadata::DefaultHistoryMaxSize = 6 * 1024 * 1024;
 
 // Fallback icon for return by reference
-static const Metadata::CustomIconData NULL_ICON;
+static const Metadata::CustomIconData NULL_ICON{};
 
 Metadata::Metadata(QObject* parent)
     : ModifiableObject(parent)
diff --git a/tests/TestTools.cpp b/tests/TestTools.cpp
index edfeb5034..9e3dadc45 100644
--- a/tests/TestTools.cpp
+++ b/tests/TestTools.cpp
@@ -20,6 +20,7 @@
 #include "core/Clock.h"
 
 #include <QTest>
+#include <QUuid>
 
 QTEST_GUILESS_MAIN(TestTools)