diff --git a/README.md b/README.md
index 14439ebc5cb7445b7b937c7088548f41b873f541..ad385d9e8a658e7e0de6d7d9261509d9223c55f6 100644
--- a/README.md
+++ b/README.md
@@ -78,6 +78,8 @@ Default value: `0.0.0.0` and `8086`.
 - `context_server_host` and `context_server_port` : The address and port used for the context server provider. 
 Default value: `0.0.0.0` and `8087`.
 - `core_context`: The default cached core context used by the Brokers.
+- `delete_temporal_on_core_delete`: Whether the Temporal Representation of an Entity should be deleted when an Entity is deleted.
+Default value: True
 
 When you execute locally the tests, you can leave the default values as they are. NGSI-LD Test Suite provides
 a mockup services to provide the notification functionality and therefore the notification_server_host can be
diff --git a/resources/ApiUtils/ContextInformationProvision.resource b/resources/ApiUtils/ContextInformationProvision.resource
index cfc16434a16b45057c636022cc0af4c4f8b28030..defb0c4f15b1bfab87ccfcb8265236e74cfd6afe 100755
--- a/resources/ApiUtils/ContextInformationProvision.resource
+++ b/resources/ApiUtils/ContextInformationProvision.resource
@@ -5,6 +5,7 @@ Library         RequestsLibrary
 Library         OperatingSystem
 Library         Collections
 Library         JSONLibrary
+Resource        ${EXECDIR}/resources/ApiUtils/TemporalContextInformationProvision.resource
 Resource        ${EXECDIR}/resources/JsonUtils.resource
 
 
@@ -241,6 +242,9 @@ Delete Entity by Id
     ${response}=    DELETE
     ...    url=${base_url}/${ENTITIES_ENDPOINT_PATH}${id}
     ...    expected_status=any
+    IF    ${delete_temporal_on_core_delete}
+        Delete Temporal Representation Of Entity    ${id}
+    END
     Output    ${response}    Delete Entity by Id
     RETURN    ${response}
 
diff --git a/resources/variables.py b/resources/variables.py
index 8e4a64ba7af8696b321a38399458ef9791afcd97..f570a71ec7cee3249c9202fb8562f9bbb79e29f4 100644
--- a/resources/variables.py
+++ b/resources/variables.py
@@ -11,6 +11,9 @@ context_server_host = '0.0.0.0'
 context_server_port = 8087
 core_context = 'https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld'
 
+# whether the Temporal Representation of an Entity should be deleted when an Entity is deleted
+delete_temporal_on_core_delete = True
+
 #DistOps variables
 remote_url = 'http://0.0.0.0:8081/ngsi-ld/v1'
 context_source_endpoint  = 'http://0.0.0.0:8081'