diff --git a/scenarios/invite_locmap_replace/0003_test.yml.tt2 b/scenarios/invite_locmap_replace/0003_test.yml.tt2
index 7f8ba307..b9c80044 100644
--- a/scenarios/invite_locmap_replace/0003_test.yml.tt2
+++ b/scenarios/invite_locmap_replace/0003_test.yml.tt2
@@ -25,7 +25,7 @@ sip_in:
   - 'From: <sip:[% scenarios.0.username %]@invite-locmap-replace.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-locmap-replace.scenarios.test>'
   - 'CSeq: \d+ INVITE'
-  - 'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %]'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'Content-Type: application/sdp'
   - 'Content-Length:\s+\d+'
 sip_out:
diff --git a/scenarios/invite_locmap_replace/0005_test.yml.tt2 b/scenarios/invite_locmap_replace/0005_test.yml.tt2
index 76cde861..c76833eb 100644
--- a/scenarios/invite_locmap_replace/0005_test.yml.tt2
+++ b/scenarios/invite_locmap_replace/0005_test.yml.tt2
@@ -158,8 +158,8 @@ sip_in:
   - 'From: <sip:[% scenarios.0.username %]@invite-locmap-replace.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-locmap-replace.scenarios.test>'
   - 'CSeq: \d+ INVITE'
-  - 'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %]'
-  - 'Proxy-Authorization: Digest username="[% scenarios.0.username %]",realm="invite-locmap-replace.scenarios.test",uri="sip:127.0.0.1:5060",nonce=".+",response=".+",algorithm=MD5'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
+  - 'Proxy-Authorization: Digest username="[% scenarios.0.username %]",realm="invite-locmap-replace.scenarios.test",uri="sip:[% server_ip %]:5060",nonce=".+",response=".+",algorithm=MD5'
   - 'Content-Type: application/sdp'
   - 'Content-Length:\s+\d+'
 sip_out:
@@ -182,7 +182,7 @@ sip_out:
       'From: <sip:[% invite_locmap_replace_scenarios_test.testuser1000.phone_number %]@invite-locmap-replace.scenarios.test>;tag=[\w-]+',
       'To: <sip:[% scenarios.0.responders.0.username %]@invite-locmap-replace.scenarios.test>',
       'CSeq: \d+ INVITE',
-      'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %]',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'Content-Type: application/sdp',
       'Content-Length:\s+\d+',
       'P-Asserted-Identity: <sip:[% invite_locmap_replace_scenarios_test.testuser1000.phone_number %]@invite-locmap-replace.scenarios.test>',
diff --git a/scenarios/invite_locmap_replace/0013_test.yml.tt2 b/scenarios/invite_locmap_replace/0013_test.yml.tt2
index 5890589e..d0f13e86 100644
--- a/scenarios/invite_locmap_replace/0013_test.yml.tt2
+++ b/scenarios/invite_locmap_replace/0013_test.yml.tt2
@@ -28,7 +28,7 @@ sip_in:
   - 'From: <sip:[% scenarios.0.username %]@invite-locmap-replace.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-locmap-replace.scenarios.test>;tag=[\w-]+'
   - 'CSeq: \d+ ACK'
-  - 'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %]'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'Content-Length: 0'
 sip_out:
   - [
@@ -36,6 +36,6 @@ sip_out:
       'From: <sip:[% invite_locmap_replace_scenarios_test.testuser1000.phone_number %]@invite-locmap-replace.scenarios.test>;tag=[\w-]+',
       'To: <sip:[% scenarios.0.responders.0.username %]@invite-locmap-replace.scenarios.test>;tag=[\w-]+',
       'CSeq: \d+ ACK',
-      'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %]',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'Content-Length: 0',
     ]
diff --git a/scenarios/invite_locmap_replace/0015_test.yml.tt2 b/scenarios/invite_locmap_replace/0015_test.yml.tt2
index e8d4b6f8..11783f75 100644
--- a/scenarios/invite_locmap_replace/0015_test.yml.tt2
+++ b/scenarios/invite_locmap_replace/0015_test.yml.tt2
@@ -31,7 +31,7 @@ sip_in:
   - 'From: <sip:[% scenarios.0.username %]@invite-locmap-replace.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-locmap-replace.scenarios.test>;tag=[\w-]+'
   - 'CSeq: \d+ BYE'
-  - 'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %]'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'Content-Length: 0'
 sip_out:
   - [
@@ -46,7 +46,7 @@ sip_out:
       'From: <sip:[% invite_locmap_replace_scenarios_test.testuser1000.phone_number %]@invite-locmap-replace.scenarios.test>;tag=[\w-]+',
       'To: <sip:[% scenarios.0.responders.0.username %]@invite-locmap-replace.scenarios.test>;tag=[\w-]+',
       'CSeq: \d+ BYE',
-      'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %]',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'Content-Length: 0',
       'P-Asserted-Identity: <sip:[% invite_locmap_replace_scenarios_test.testuser1000.phone_number %]@invite-locmap-replace.scenarios.test>',
     ]
diff --git a/scenarios/invite_locmap_replace/sipp_scenario00.xml b/scenarios/invite_locmap_replace/sipp_scenario00.xml
index fd0210a6..c05c8e61 100644
--- a/scenarios/invite_locmap_replace/sipp_scenario00.xml
+++ b/scenarios/invite_locmap_replace/sipp_scenario00.xml
@@ -10,7 +10,7 @@
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 INVITE
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv"]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Type: application/sdp
       Content-Length: [len]
@@ -40,7 +40,7 @@
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 ACK
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv"]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Length: 0
 
@@ -58,7 +58,7 @@
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 2 INVITE
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv"]@[local_ip]:[local_port]>
       Max-Forwards: 70
       [field1 file="caller.csv"]
       Content-Type: application/sdp
@@ -94,7 +94,7 @@
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       [routes]
       CSeq: 2 ACK
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv"]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Length: 0
 
@@ -119,7 +119,7 @@
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 3 BYE
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv"]@[local_ip]:[local_port]>
       [routes]
       Max-Forwards: 70
       Content-Length: 0