diff --git a/src/lib/orionld/legacyDriver/legacyGetEntities.cpp b/src/lib/orionld/legacyDriver/legacyGetEntities.cpp
index a2e1232d66..9059e85212 100644
--- a/src/lib/orionld/legacyDriver/legacyGetEntities.cpp
+++ b/src/lib/orionld/legacyDriver/legacyGetEntities.cpp
@@ -154,6 +154,8 @@ bool legacyGetEntities(void)
   QueryContextRequest   mongoRequest;
   QueryContextResponse  mongoResponse;
 
+  LM_T(39, ("Getting entities on tenant '%s'", orionldState.tenantP->tenant));
+
   if ((id == NULL) && (idPattern == NULL) && (type == NULL) && ((geometry == NULL) || (*geometry == 0)) && (attrs == NULL) && (q == NULL) && (local == false))
   {
     orionldError(OrionldBadRequestData,
diff --git a/src/lib/orionld/legacyDriver/legacyGetEntity.cpp b/src/lib/orionld/legacyDriver/legacyGetEntity.cpp
index 840e3e324b..135552fce3 100644
--- a/src/lib/orionld/legacyDriver/legacyGetEntity.cpp
+++ b/src/lib/orionld/legacyDriver/legacyGetEntity.cpp
@@ -381,6 +381,8 @@ bool legacyGetEntity(void)
   KjNode*  regArray = NULL;
   char*    eId      = orionldState.wildcard[0];
 
+  LM_T(39, ("Retreiving entity '%s' from tenant '%s'", eId, orionldState.tenantP->tenant));
+
   //
   // Make sure the ID (eId) is a valid URI
   //
diff --git a/src/lib/orionld/legacyDriver/legacyPostEntities.cpp b/src/lib/orionld/legacyDriver/legacyPostEntities.cpp
index f996dce218..40042405a0 100644
--- a/src/lib/orionld/legacyDriver/legacyPostEntities.cpp
+++ b/src/lib/orionld/legacyDriver/legacyPostEntities.cpp
@@ -169,6 +169,8 @@ bool legacyPostEntities(void)
     return false;
   }
 
+  LM_T(39, ("Creating an entity '%s' of type '%s' on tenant '%s'", entityId, entityType, orionldState.tenantP->tenant));
+
   //
   // NOTE
   //   payloadParseAndExtractSpecialFields() from orionldMhdConnectionTreat() decouples the entity id and type
diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_GET_with_keyValues.test b/test/functionalTest/cases/0000_ngsild/ngsild_GET_with_keyValues.test
index a63196512e..92e67e1555 100644
--- a/test/functionalTest/cases/0000_ngsild/ngsild_GET_with_keyValues.test
+++ b/test/functionalTest/cases/0000_ngsild/ngsild_GET_with_keyValues.test
@@ -25,7 +25,7 @@ GET entity with keyValues
 
 --SHELL-INIT--
 dbInit CB
-orionldStart CB -t 0-255
+orionldStart CB
 
 --SHELL--