diff --git a/MDQ.robot b/MDQ.robot
index db7010d..4115fc5 100644
--- a/MDQ.robot
+++ b/MDQ.robot
@@ -10,7 +10,7 @@ Get All Entities
 
 Get Entity
   [Arguments]    ${baseUrl}  ${identifier}
-  Create Session    alias=md  url=${baseUrl}  debug=1
+  Create Session    alias=md  url=${baseUrl}
   ${resp}=    Get Request    alias=md  uri=/entities/${identifier}
   [Return]    ${resp}
 
@@ -18,5 +18,12 @@ Get Entity With Gzip
   [Arguments]    ${baseUrl}  ${identifier}
   Create Session    alias=md  url=${baseUrl}
   &{headers}=    Create Dictionary    Accept-Encoding=gzip
-  ${resp}=    Get Request    alias=md  uri=entities/${identifier}  headers=&{headers}
+  ${resp}=    Get Request    alias=md  uri=entities/${identifier}  headers=${headers}
+  [Return]    ${resp}
+
+Conditional Get Entity
+  [Arguments]    ${baseUrl}  ${identifier}  ${etag}
+  &{headers}=    Create Dictionary    If-None-Match=${etag}
+  Create Session    alias=md  url=${baseUrl}
+  ${resp}=    Get Request    alias=md  uri=/entities/${identifier}  headers=${headers}
   [Return]    ${resp}
diff --git a/md-query.robot b/md-query.robot
index 879d398..8a2b21e 100644
--- a/md-query.robot
+++ b/md-query.robot
@@ -46,8 +46,9 @@ Variables  variables.py
 
 4.1 Conditional Retrieval
   [Tags]  optional
-  Get Entity    baseUrl=${BASE_URL}  identifier=${ENTITY_ID_ENCODED}
   ${resp}=    Get Entity    baseUrl=${BASE_URL}  identifier=${ENTITY_ID_ENCODED}
+  ${etag}=    Get From Dictionary    ${resp.headers}  ETag
+  ${resp}=    Conditional Get Entity    baseUrl=${BASE_URL}  identifier=${ENTITY_ID_ENCODED}  etag=${etag}
   Should Be Equal As Strings    ${resp.status_code}  304  msg=SHOULD return HTTP status code 304
 
 # 4.2 Content Caching