diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_01.robot
index 80b336d476637aef0e0266001b45f004b4c58519..09b5e1f6afc6cde6b52e27d320274e565592e584 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_01.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_01.robot
@@ -20,7 +20,7 @@ Receive cSourceNotification Periodically And Initially On Subscription
     [Tags]  mandatory
 
     ${subscription_id}=     Generate Random Entity Id    ${subscription_id_prefix}
-    ${subscription_payload}=  Load Test Sample    ${subscription_payload_file_path}    ${subscription_id}
+    ${subscription_payload}=  Load Subscription Sample With Reachable Endpoint    ${subscription_payload_file_path}    ${subscription_id}
     Set Suite Variable  ${subscription_id}
 
     Create Context Source Registration Subscription  ${subscription_payload}
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_02.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_02.robot
index 4846a9f554003ea08acb650943449193cadeae0c..04e6f2ac12bcfe5da1a04eed976217dd3472b1d5 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_02.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_02.robot
@@ -21,7 +21,7 @@ Receive cSourceNotification Initially On Subscription And Whenever There Is A Ch
     [Tags]  mandatory
 
     ${subscription_id}=     Generate Random Entity Id    ${subscription_id_prefix}
-    ${subscription_payload}=  Load Test Sample    ${subscription_payload_file_path}    ${subscription_id}
+    ${subscription_payload}=  Load Subscription Sample With Reachable Endpoint    ${subscription_payload_file_path}    ${subscription_id}
     Set Suite Variable  ${subscription_id}
 
     Create Context Source Registration Subscription  ${subscription_payload}
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_03.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_03.robot
index 7ad2693f419970643a7e5286965919766b732cd4..8531a45f0b4e5b3abd1c545637cd3bed12f0be06 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_03.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_03.robot
@@ -35,7 +35,7 @@ Setup Initial Context Source Registration Subscriptions
     Start Local Server
 
     ${subscription_id}=     Generate Random Entity Id    ${subscription_id_prefix}
-    ${subscription_payload}=  Load Test Sample    ${subscription_payload_file_path}    ${subscription_id}
+    ${subscription_payload}=  Load Subscription Sample With Reachable Endpoint    ${subscription_payload_file_path}    ${subscription_id}
 
     Create Context Source Registration Subscription  ${subscription_payload}
 
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_04.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_04.robot
index aac6a6c386d0a31cb69913016afe84fbbdd4eab4..c61dd05834eedb1bc7f470bb1a7d4a4f6b8f6d61 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_04.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_04.robot
@@ -33,7 +33,7 @@ Setup Initial Context Source Registration Subscriptions
     Start Local Server
 
     ${subscription_id}=     Generate Random Entity Id    ${subscription_id_prefix}
-    ${subscription_payload}=  Load Test Sample    ${subscription_payload_file_path}    ${subscription_id}
+    ${subscription_payload}=  Load Subscription Sample With Reachable Endpoint    ${subscription_payload_file_path}    ${subscription_id}
 
     Create Context Source Registration Subscription  ${subscription_payload}
 
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_05.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_05.robot
index f562b6132a6a253839e9415c6957fde3d22b216c..61af8f1d678d93e3173b0bbbd0bb47001ebb1004 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_05.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_05.robot
@@ -37,7 +37,7 @@ Setup Initial Context Source Registration Subscriptions
     Start Local Server
 
     ${subscription_id}=     Generate Random Entity Id    ${subscription_id_prefix}
-    ${subscription_payload}=  Load Test Sample    ${subscription_payload_file_path}    ${subscription_id}
+    ${subscription_payload}=  Load Subscription Sample With Reachable Endpoint    ${subscription_payload_file_path}    ${subscription_id}
     Create Context Source Registration Subscription  ${subscription_payload}
 
     Set Suite Variable  ${subscription_id}
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_07.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_07.robot
index 09c9173719a3ac82a784e9e4156e49e3a6a9a178..6b244861d0cb89771ab2c506e7dd10c71593fc57 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_07.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_07.robot
@@ -41,7 +41,7 @@ Setup Initial Context Source Registration Subscriptions
     Start Local Server
 
     ${subscription_id}=     Generate Random Entity Id    ${subscription_id_prefix}
-    ${subscription_payload}=  Load Test Sample    ${subscription_payload_file_path}    ${subscription_id}
+    ${subscription_payload}=  Load Subscription Sample With Reachable Endpoint    ${subscription_payload_file_path}    ${subscription_id}
     Create Context Source Registration Subscription  ${subscription_payload}
 
     Set Suite Variable  ${subscription_id}
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_08.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_08.robot
index 800f0a9f6e9cd069b760419043409418de40683f..16b9cb92c8968c1c2db3c0ed52c2207cd561fed1 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_08.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_08.robot
@@ -33,7 +33,7 @@ Setup Initial Context Source Registrations And Subscriptions
     ${context_source_registration_id}=     Generate Random Entity Id    ${context_source_registration_id_prefix}
     ${subscription_id}=     Generate Random Entity Id    ${subscription_id_prefix}
     ${context_source_registration_payload}=  Load Test Sample    ${context_source_registration_payload_file_path}    ${context_source_registration_id}
-    ${subscription_payload}=  Load Test Sample    ${subscription_payload_file_path}    ${subscription_id}
+    ${subscription_payload}=  Load Subscription Sample With Reachable Endpoint    ${subscription_payload_file_path}    ${subscription_id}
 
     Create Context Source Registration  ${context_source_registration_payload}
     Create Context Source Registration Subscription  ${subscription_payload}
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_09.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_09.robot
index bd0794afe2798e5e70da8fd2e45e55ee27a95d8f..834ab1aeb87e585dbfb4fcac896dea82e46988b8 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_09.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_09.robot
@@ -33,7 +33,7 @@ Setup Initial Context Source Registrations And Subscriptions
     ${context_source_registration_id}=     Generate Random Entity Id    ${context_source_registration_id_prefix}
     ${subscription_id}=     Generate Random Entity Id    ${subscription_id_prefix}
     ${context_source_registration_payload}=  Load Test Sample    ${context_source_registration_payload_file_path}    ${context_source_registration_id}
-    ${subscription_payload}=  Load Test Sample    ${subscription_payload_file_path}    ${subscription_id}
+    ${subscription_payload}=  Load Subscription Sample With Reachable Endpoint    ${subscription_payload_file_path}    ${subscription_id}
 
     Create Context Source Registration  ${context_source_registration_payload}
     Create Context Source Registration Subscription  ${subscription_payload}
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_10.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_10.robot
index 37f11385c65fe97b873676e13a5918a7c533a405..6d2d3a1bd8b40b5a8b1e5a40e84bcf54784a0dcf 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_10.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_10.robot
@@ -33,7 +33,7 @@ Setup Initial Context Source Registration Subscriptions
     Start Local Server
 
     ${subscription_id}=     Generate Random Entity Id    ${subscription_id_prefix}
-    ${subscription_payload}=  Load Test Sample    ${subscription_payload_file_path}    ${subscription_id}
+    ${subscription_payload}=  Load Subscription Sample With Reachable Endpoint    ${subscription_payload_file_path}    ${subscription_id}
 
     Create Context Source Registration Subscription  ${subscription_payload}
 
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_11.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_11.robot
index 81487f69600c1e191c09bec02374f691fef316ba..64dca1334d566bde23f043d3f82aab23c7541a4b 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_11.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_11.robot
@@ -25,7 +25,7 @@ Receive cSourceNotification For Matching Context Source Registrations On Managem
     [Tags]  mandatory
 
     ${subscription_id}=     Generate Random Entity Id    ${subscription_id_prefix}
-    ${subscription_payload}=  Load Test Sample    ${filepath}    ${subscription_id}
+    ${subscription_payload}=  Load Subscription Sample With Reachable Endpoint    ${filepath}    ${subscription_id}
     Create Context Source Registration Subscription  ${subscription_payload}
     Set Suite Variable  ${subscription_id}
 
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_12.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_12.robot
index 5c63941f7dbb117cb711a43dc9f57b8f31e1d28e..995a53c9004b8e750034549ee7d6d15c78bee7c8 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_12.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_12.robot
@@ -33,7 +33,7 @@ Setup Initial Context Source Registration Subscriptions
     Start Local Server
 
     ${subscription_id}=     Generate Random Entity Id    ${subscription_id_prefix}
-    ${subscription_payload}=  Load Test Sample    ${subscription_payload_file_path}    ${subscription_id}
+    ${subscription_payload}=  Load Subscription Sample With Reachable Endpoint    ${subscription_payload_file_path}    ${subscription_id}
 
     Create Context Source Registration Subscription  ${subscription_payload}
 
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_13.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_13.robot
index 3da7df0c47f0f8e76bd01bfe28ae0547dc9b6d6e..3317b4f6bf8da1c32467d039ffae05a494783964 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_13.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_13.robot
@@ -33,7 +33,7 @@ Setup Initial Context Source Registration Subscriptions
     Start Local Server
 
     ${subscription_id}=     Generate Random Entity Id    ${subscription_id_prefix}
-    ${subscription_payload}=  Load Test Sample    ${subscription_payload_file_path}    ${subscription_id}
+    ${subscription_payload}=  Load Subscription Sample With Reachable Endpoint    ${subscription_payload_file_path}    ${subscription_id}
 
     Create Context Source Registration Subscription  ${subscription_payload}
 
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_14.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_14.robot
index e269b57dbb77217010486148a6c314acda8f390f..bb97800535ae2401b5ca663330027e1c2007f223 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_14.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_14.robot
@@ -33,7 +33,7 @@ Setup Initial Context Source Registration Subscriptions
     Start Local Server
 
     ${subscription_id}=     Generate Random Entity Id    ${subscription_id_prefix}
-    ${subscription_payload}=  Load Test Sample    ${subscription_payload_file_path}    ${subscription_id}
+    ${subscription_payload}=  Load Subscription Sample With Reachable Endpoint    ${subscription_payload_file_path}    ${subscription_id}
 
     Create Context Source Registration Subscription  ${subscription_payload}
 
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_15.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_15.robot
index 9527579f32d3caea8c7b5a9d14fc9a5d386543a3..ae8bc477902f522e22bd51510da25285623d74bd 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_15.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_15.robot
@@ -33,7 +33,7 @@ Setup Initial Context Source Registration Subscriptions
     Start Local Server
 
     ${subscription_id}=     Generate Random Entity Id    ${subscription_id_prefix}
-    ${subscription_payload}=  Load Test Sample    ${subscription_payload_file_path}    ${subscription_id}
+    ${subscription_payload}=  Load Subscription Sample With Reachable Endpoint    ${subscription_payload_file_path}    ${subscription_id}
 
     Create Context Source Registration Subscription  ${subscription_payload}
 
diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_16.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_16.robot
index 8c5b3f151e6745e152aafa46154f7af8aa9f6f9c..cc3970452848f3dd50312556b2d5c3d0e4540cb2 100644
--- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_16.robot
+++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/037_16.robot
@@ -39,7 +39,7 @@ Setup Initial Context Source Registrations And Subscriptions
     ${first_context_source_registration_id}=     Generate Random Entity Id    ${context_source_registration_id_prefix}
     ${second_context_source_registration_id}=     Generate Random Entity Id    ${context_source_registration_id_prefix}
 
-    ${subscription_payload}=  Load Test Sample    ${subscription_payload_file_path}    ${subscription_id}
+    ${subscription_payload}=  Load Subscription Sample With Reachable Endpoint    ${subscription_payload_file_path}    ${subscription_id}
     ${first_context_source_registration_payload}=  Load Test Sample    ${first_context_source_registration_payload_file_path}    ${first_context_source_registration_id}
     ${second_context_source_registration_payload}=  Load Test Sample    ${second_context_source_registration_payload_file_path}    ${second_context_source_registration_id}
 
diff --git a/resources/AssertionUtils.resource b/resources/AssertionUtils.resource
index c4a8c7a9f2f65c4194a5e24aef587161402f46bf..8665b91aba61028bc0160a1bf8abc9d756d2397c 100755
--- a/resources/AssertionUtils.resource
+++ b/resources/AssertionUtils.resource
@@ -4,6 +4,7 @@ Library     ${EXECDIR}/libraries/assertionUtils.py
 *** Variable ***
 ${instance_id_regex_expr}=  root\\[.*\\]\\['instanceId'\\]
 ${notification_timestamps_regex_expr}=  root\\['last.*'\\]
+${notification_endpoint_uri_regex_expr}=  root\\['endpoint'\\]\\['uri'\\]
 ${context_regex_expr}=  root\\['@context'\\]
 ${status_regex_expr}=  root\\['status'\\]
 
@@ -210,7 +211,8 @@ Check NotificationParams
     [Arguments]     ${filename}     ${expected_additional_members}
 
     ${expected_notification}=    Load Json From File    ${EXECDIR}/data/${filename}
-    ${comparaison_result}=    Compare Dictionaries Ignoring Keys    ${response['body']['notification']}    ${expected_notification}      ${notification_timestamps_regex_expr}
+    ${ignored_keys}=    Create List     ${notification_timestamps_regex_expr}    ${notification_endpoint_uri_regex_expr}
+    ${comparaison_result}=    Compare Dictionaries Ignoring Keys    ${response['body']['notification']}    ${expected_notification}      ${ignored_keys}
     Should Be True      ${comparaison_result}   msg=NotificationParams Comparaison Failed
 
     FOR    ${expected_additional_member}    IN    @{expected_additional_members}
diff --git a/resources/JsonUtils.resource b/resources/JsonUtils.resource
index 78c7d74d56e97b7e68f18cc87d03e855fcfede40..c0827f792bb3c3671a05cfc94ca5e8672c856a88 100644
--- a/resources/JsonUtils.resource
+++ b/resources/JsonUtils.resource
@@ -5,6 +5,8 @@ Library     JSONLibrary
 
 *** Variable ***
 ${date_format}=  %Y-%m-%dT%H:%M:%SZ
+${notification_server_url}=     http://${notification_server_host}:${notification_server_port}/notify
+
 *** Keywords ***
 Load Entity
     [Arguments]    ${entity_file_name}     ${entity_id}
@@ -24,6 +26,14 @@ Load Test Sample
 
     [return]    ${test_sample}
 
+Load Subscription Sample With Reachable Endpoint
+    [Arguments]    ${subscription_file_path}     ${subscription_id}=${EMPTY}      ${notification_endpoint_uri}=${notification_server_url}
+
+    ${subscription_payload}=  Load Test Sample    ${subscription_file_path}    ${subscription_id}
+    ${subscription}=    Update Value To Json    ${subscription_payload}     $..notification['endpoint']['uri']   ${notification_endpoint_uri}
+
+    [return]    ${subscription}
+
 Remove Entity Type
     [Arguments]    ${entity}
 
diff --git a/resources/NotificationUtils.resource b/resources/NotificationUtils.resource
index e9749abb87d6fc628d87752e3c5f11d128eadf07..fffcde3560a0e0d4e4938d59041e35315f43c34e 100644
--- a/resources/NotificationUtils.resource
+++ b/resources/NotificationUtils.resource
@@ -13,7 +13,7 @@ ${date_format}=  %Y-%m-%dT%H:%M:%SZ
 *** Keywords ***
 Start Local Server
     #Initialize HTTP Client And Server
-    Start Server        ${notification_server_host}   ${notification_server_port}
+    Start Server        0.0.0.0   8085
 
 Wait for notification
     [Arguments]  ${timeout}=${5}