diff --git a/tests/robot/AQL_TESTS/FROM/EHR_STATUS/from_multiple_ehrs.robot b/tests/robot/AQL_TESTS/FROM/EHR_STATUS/from_multiple_ehrs.robot
index b7f0bed9..13ef2589 100644
--- a/tests/robot/AQL_TESTS/FROM/EHR_STATUS/from_multiple_ehrs.robot
+++ b/tests/robot/AQL_TESTS/FROM/EHR_STATUS/from_multiple_ehrs.robot
@@ -16,7 +16,7 @@ Suite Teardown  Run Keywords
 
 
 *** Test Cases ***
-SELECT s/subject/external_ref/id/value, s/other_details/items[at0001]/value/id FROM EHR e CONTAINS EHR_STATUS s
+1. SELECT s/subject/external_ref/id/value, s/other_details/items[at0001]/value/id FROM EHR e CONTAINS EHR_STATUS s
     ${query}    Set Variable    SELECT s/subject/external_ref/id/value, s/other_details/items[at0001]/value/id FROM EHR e CONTAINS EHR_STATUS s
     Set AQL And Execute Ad Hoc Query        ${query}
     ${expected_result_file}         Set Variable    ${EXPECTED_JSON_DATA_SETS}/from/expected_ehr_status_from_multiple_ehrs.json
@@ -35,6 +35,12 @@ SELECT s/subject/external_ref/id/value, s/other_details/items[at0001]/value/id F
     Should Be Empty    ${diff}    msg=DIFF DETECTED!
     [Teardown]      Run Keyword And Return Status   Remove File     ${expected_result_file_tmp}
 
+2. SELECT eq/subject/external_ref/id/value FROM EHR_STATUS eq CONTAINS EHR_STATUS eq
+    [Documentation]     - Covers https://vitagroup-ag.atlassian.net/browse/CDR-2248
+    ${query}    Set Variable    SELECT eq/subject/external_ref/id/value FROM EHR_STATUS eq CONTAINS EHR_STATUS eq
+    Set AQL And Execute Ad Hoc Query        ${query}
+    Should Be Empty     ${resp_body['rows']}
+
 
 *** Keywords ***
 Precondition
diff --git a/tests/robot/AQL_TESTS/FROM/PREDICATE_A_D/without_predicate.robot b/tests/robot/AQL_TESTS/FROM/PREDICATE_A_D/without_predicate.robot
index 4308ec8e..940854e8 100644
--- a/tests/robot/AQL_TESTS/FROM/PREDICATE_A_D/without_predicate.robot
+++ b/tests/robot/AQL_TESTS/FROM/PREDICATE_A_D/without_predicate.robot
@@ -4,9 +4,12 @@ Documentation   CHECK FROM WITHOUT PREDICATE
 Resource        ../../../_resources/keywords/aql_keywords.robot
 Suite Setup     Set Library Search Order For Tests
 
+Test Setup      Precondition
+Test Teardown   Admin Delete EHR For AQL
+
 
 *** Test Cases ***
-Test From Without Predicate
+1. Test From Without Predicate
     [Documentation]     - *Precondition:* 1. Create OPT; 2. Create EHR; 3. Create Composition
     ...         - Send AQL 'SELECT o FROM OBSERVATION o'
     ...         - Check query from response == query from script
@@ -14,7 +17,6 @@ Test From Without Predicate
     ...         - Check that all items from rows are of _type=OBSERVATION
     ...         - *Postcondition:* Delete EHR using ADMIN endpoint. This is deleting compositions linked to EHR.
     #[Tags]      not-ready
-    [Setup]     Precondition
     ${query}    Set Variable    SELECT o FROM OBSERVATION o
     Set AQL And Execute Ad Hoc Query        ${query}
     Should Be Equal As Strings      ${resp_body_query}      ${query}
@@ -28,11 +30,17 @@ Test From Without Predicate
             Should Be Equal As Strings     ${resp_body['rows'][${INDEX}][0]["_type"]}       OBSERVATION
         END
     END
-    [Teardown]      Admin Delete EHR For AQL
+
+2. SELECT c0/uid/value FROM COMPOSITION c0[uid/value='${c_uid}'] CONTAINS COMPOSITION c1
+    [Documentation]     - Covers https://vitagroup-ag.atlassian.net/browse/CDR-2248
+    ${query}    Set Variable    SELECT c0/uid/value FROM COMPOSITION c0[uid/value='${c_uid}'] CONTAINS COMPOSITION c1
+    Set AQL And Execute Ad Hoc Query        ${query}
+    Should Be Empty     ${resp_body['rows']}
 
 
 *** Keywords ***
 Precondition
     Upload OPT For AQL      aql-conformance-ehrbase.org.v0.opt
     Create EHR For AQL
-    Commit Composition For AQL      aql-conformance-ehrbase.org.v0_contains.json
\ No newline at end of file
+    Commit Composition For AQL      aql-conformance-ehrbase.org.v0_contains.json
+    Set Suite Variable       ${c_uid}       ${composition_short_uid}
\ No newline at end of file