diff --git a/TP/NGSI-LD/DistributedOperations/Consumption/Entity/QueryEntities/D011_02_exc.robot b/TP/NGSI-LD/DistributedOperations/Consumption/Entity/QueryEntities/D011_02_exc.robot
index 798d5b71e363b6febc552dd39293600de193c8f8..2f6167e2ccecedf9c580657503c6cbecdb671744 100644
--- a/TP/NGSI-LD/DistributedOperations/Consumption/Entity/QueryEntities/D011_02_exc.robot
+++ b/TP/NGSI-LD/DistributedOperations/Consumption/Entity/QueryEntities/D011_02_exc.robot
@@ -60,7 +60,12 @@ Setup Registration And Context Source Mock Server And Query The Context Broker W
     @{entities_id}=    Create List    ${entity_id}
 
     IF    '${method}' == 'GET'
-        Set Stub Reply    ${method}    ${url}?type=Vehicle&id=${entity_id}&attrs=speed    200    ${serialized_entity}
+        # Broker forwards with `pick=…` (spec § 5: `attrs` is deprecated and
+        # is a synonym for `pick` + `q`). HttpCtrl's stub matcher substring-
+        # checks each stub-param name+value against the criteria query
+        # string, so the stub must use the canonical `pick=`. See
+        # testsuite-doubts.md #22.
+        Set Stub Reply    ${method}    ${url}?type=Vehicle&pick=speed    200    ${serialized_entity}
         ${response2}=    Query Entities    entity_types=Vehicle    context=${ngsild_test_suite_context}
     ELSE IF    '${method}' == 'POST'
         Set Stub Reply    ${method}    ${url}    200    ${serialized_entity}
diff --git a/requirements.txt b/requirements.txt
index 6e633ac23650248be6f4d864b14eeffc293a51e0..7e7717929b4e640f1b04753fe775b4982ebc3218 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,6 +5,9 @@ robotframework-requests==0.9.7
 deepdiff==8.6.1
 prettydiff==0.1.0
 paho-mqtt==1.6.1
-robotframework-httpctrl==0.3.3
+# Vendored fork at libraries/robotframework-httpctrl/: 0.3.1 base with the
+# distop-aware substring stub-URL matcher upstream 0.3.3 ships without
+# (see testsuite-doubts.md #22).
+-e ./libraries/robotframework-httpctrl/
 robotframework-robocop==7.2.0
 robotframework-mqttlibrary==0.7.1.post3