diff --git a/scenarios/invite_trusted_peerout_stir/0001_test.yml.tt2 b/scenarios/invite_trusted_peerout_stir/0001_test.yml.tt2
index 61aef01a..dbccf80e 100644
--- a/scenarios/invite_trusted_peerout_stir/0001_test.yml.tt2
+++ b/scenarios/invite_trusted_peerout_stir/0001_test.yml.tt2
@@ -180,7 +180,7 @@ flow:
       ]
 sip_in:
   - '^INVITE sip:[% scenarios.0.responders.0.username %]@'
-  - 'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %]'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'CSeq: 2 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
@@ -194,7 +194,7 @@ sip_out:
     ]
   - [
       '^INVITE sip:[% scenarios.0.responders.0.username %]@',
-      'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %]',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'CSeq: 2 INVITE',
       'From: <sip:[% invite_trusted_peerout_stir_scenarios_test.testuser1002.phone_number %]@',
       'To: <sip:[% scenarios.0.responders.0.username %]@',
diff --git a/scenarios/invite_trusted_peerout_stir/0009_test.yml.tt2 b/scenarios/invite_trusted_peerout_stir/0009_test.yml.tt2
index d206bca9..b3caa038 100644
--- a/scenarios/invite_trusted_peerout_stir/0009_test.yml.tt2
+++ b/scenarios/invite_trusted_peerout_stir/0009_test.yml.tt2
@@ -26,7 +26,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
-  - 'Contact: sip:[% scenarios.0.username %]@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'CSeq: 2 ACK'
   - 'Max-Forwards: 69'
   - 'Content-Length: 0'
@@ -36,7 +36,7 @@ sip_in:
 sip_out:
   - [
       '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'Contact: sip:[% scenarios.0.username %]@',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
       'Content-Length: 0',
diff --git a/scenarios/invite_trusted_peerout_stir/0011_test.yml.tt2 b/scenarios/invite_trusted_peerout_stir/0011_test.yml.tt2
index a97ed29f..5e1b1756 100644
--- a/scenarios/invite_trusted_peerout_stir/0011_test.yml.tt2
+++ b/scenarios/invite_trusted_peerout_stir/0011_test.yml.tt2
@@ -30,7 +30,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
-  - 'Contact: sip:[% scenarios.0.username %]@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
   - 'Content-Length: 0'
@@ -47,7 +47,7 @@ sip_out:
     ]
   - [
       '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'Contact: sip:[% scenarios.0.username %]@',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
       'Content-Length: 0',
diff --git a/scenarios/invite_trusted_peerout_stir/sipp_scenario00.xml b/scenarios/invite_trusted_peerout_stir/sipp_scenario00.xml
index 62dbb10c..308787bf 100644
--- a/scenarios/invite_trusted_peerout_stir/sipp_scenario00.xml
+++ b/scenarios/invite_trusted_peerout_stir/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: 2 INVITE
-      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Type: application/sdp
       Content-Length: [len]
@@ -42,7 +42,7 @@
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       [routes]
       CSeq: 2 ACK
-      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Length: 0
 
@@ -67,7 +67,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" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]>
       [routes]
       Max-Forwards: 70
       Content-Length: 0
diff --git a/scenarios/invite_trusted_peerout_stir/trusted.yml.tt2 b/scenarios/invite_trusted_peerout_stir/trusted.yml.tt2
index d095f30f..487dd16e 100644
--- a/scenarios/invite_trusted_peerout_stir/trusted.yml.tt2
+++ b/scenarios/invite_trusted_peerout_stir/trusted.yml.tt2
@@ -1,5 +1,5 @@
 ---
 [% scenarios.0.username %]@invite-trusted-peerout-stir.scenarios.test:
-  from_pattern: 1002
+  from_pattern: 1002@invite-trusted-peerout-stir.scenarios.test
   protocol: UDP
   src_ip: [% scenarios.0.ip %]