diff --git a/data/temporalEntities/entity-operations-after-query.jsonld b/data/temporalEntities/entity-operations-after-query.jsonld
index 590f4701e3684f91eb15be8feacf3d642df7fce1..4eeabb72141bc6c0be3ba5f5a7679350d0773f74 100644
--- a/data/temporalEntities/entity-operations-after-query.jsonld
+++ b/data/temporalEntities/entity-operations-after-query.jsonld
@@ -1,8 +1,5 @@
 {
    "type":"Vehicle",
    "timerel":"after",
-   "timeAt":"2020-08-02T12:05:00Z",
-   "@context":[
-      "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld"
-   ]
+   "timeAt":"2020-08-02T12:05:00Z"
 }
\ No newline at end of file
diff --git a/data/temporalEntities/entity-operations-before-query.jsonld b/data/temporalEntities/entity-operations-before-query.jsonld
index a5033a0503342b0c71d4b88af96b54c92ab9cb9e..03791c34ca4e849f0c83a53e48f74bc5cff153e0 100644
--- a/data/temporalEntities/entity-operations-before-query.jsonld
+++ b/data/temporalEntities/entity-operations-before-query.jsonld
@@ -1,8 +1,5 @@
 {
    "type":"Vehicle",
    "timerel":"before",
-   "timeAt":"2020-08-02T12:05:00Z",
-   "@context":[
-      "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld"
-   ]
+   "timeAt":"2020-08-02T12:05:00Z"
 }
\ No newline at end of file
diff --git a/resources/ApiUtils/TemporalContextInformationConsumption.resource b/resources/ApiUtils/TemporalContextInformationConsumption.resource
index 29118338edd3339c09c35d6c988dfaabc3924d51..e806f08574472dd610333554dfb12b3434c3a4e9 100755
--- a/resources/ApiUtils/TemporalContextInformationConsumption.resource
+++ b/resources/ApiUtils/TemporalContextInformationConsumption.resource
@@ -91,9 +91,11 @@ Query Temporal Representation Of Entities Via Post
     [Arguments]    ${query_file_name}    ${content_type}=${CONTENT_TYPE_JSON}    ${context}=${EMPTY}
     ${headers}=    Create Dictionary
     Set To Dictionary    ${headers}    Content-Type    ${content_type}
-    Set To Dictionary
-    ...    ${headers}
-    ...    Link=<${context}>; rel="http://www.w3.org/ns/json-ld#context";type="application/ld+json"
+    IF    '${context}'!=''
+        Set To Dictionary
+        ...    ${headers}
+        ...    Link=<${context}>; rel="http://www.w3.org/ns/json-ld#context";type="application/ld+json"
+    END
     ${query_payload}=    Load JSON From File    ${EXECDIR}/data/temporalEntities/${query_file_name}
     ${response}=    POST
     ...    url=${temporal_api_url}/${TEMPORAL_ENTITY_OPERATIONS_ENDPOINT_PATH}/query