diff --git a/companion/src/firmwares/eeprominterface.cpp b/companion/src/firmwares/eeprominterface.cpp
index 862d7967eed..410dcec0eef 100644
--- a/companion/src/firmwares/eeprominterface.cpp
+++ b/companion/src/firmwares/eeprominterface.cpp
@@ -58,7 +58,7 @@ Firmware::Firmware(Firmware * base, const QString & id, const QString & name, Bo
   simulatorId(simulatorId),
   hwdefnId(hwdefnId)
 {
-  gBoardFactories->registerBoard(board, hwdefnId);
+  gBoardFactories->registerBoard(board, this->hwdefnId.isEmpty() ? getFlavour() : this->hwdefnId);
 }
 
 // static
diff --git a/companion/src/tests/gtests.cpp b/companion/src/tests/gtests.cpp
index f0b83b5140d..8883c6f4707 100644
--- a/companion/src/tests/gtests.cpp
+++ b/companion/src/tests/gtests.cpp
@@ -130,6 +130,8 @@ int main(int argc, char **argv)
 {
   QCoreApplication app(argc, argv);
 
+  Q_INIT_RESOURCE(hwdefs);
+
   CustomDebug::setFilterRules();
   gBoardFactories = new BoardFactories();
   registerStorageFactories();