diff --git a/test/unittest/Database/DatabaseStatusTests.cpp b/test/unittest/Database/DatabaseStatusTests.cpp
index f1e1fc2f2..87319ab77 100644
--- a/test/unittest/Database/DatabaseStatusTests.cpp
+++ b/test/unittest/Database/DatabaseStatusTests.cpp
@@ -43,6 +43,7 @@ class database_status_tests : public ::testing::Test
         // Simulate that the backend is monitorizing the domain
         // NOTE: This is so F*** dangerous, please do not do it again (1)
         std::shared_ptr<details::Monitor> monitor = std::make_shared<details::Monitor>();
+        monitor->id = domain->id;
         details::StatisticsBackendData::get_instance()->monitors_by_entity_[domain->id] = monitor;
 
         // Simulate the discover of the entitiy
@@ -81,11 +82,11 @@ class database_status_tests : public ::testing::Test
     }
 
 
-    void TearDown()
-    {
-        // NOTE: This is thanks to (1) brilliant idea
-        details::StatisticsBackendData::get_instance()->monitors_by_entity_.erase(domain->id);
-    }
+    // void TearDown()
+    // {
+    //     // NOTE: This is thanks to (1) brilliant idea
+    //     details::StatisticsBackendData::get_instance()->monitors_by_entity_.erase(domain->id);
+    // }
 
     std::shared_ptr<Host> host;
     std::shared_ptr<User> user;
diff --git a/test/unittest/StatisticsBackend/IsActiveTests.cpp b/test/unittest/StatisticsBackend/IsActiveTests.cpp
index 355fada92..7ba99e1e3 100644
--- a/test/unittest/StatisticsBackend/IsActiveTests.cpp
+++ b/test/unittest/StatisticsBackend/IsActiveTests.cpp
@@ -60,6 +60,7 @@ class is_active_tests : public ::testing::Test
 
         // Simulate that the backend is monitorizing the domain
         std::shared_ptr<details::Monitor> monitor = std::make_shared<details::Monitor>();
+        monitor->id = domain->id;
         details::StatisticsBackendData::get_instance()->monitors_by_entity_[domain->id] = monitor;
 
         // Simulate the discover of the entitiy