diff --git a/scenarios/auth_fail/0001_test.yml.tt2 b/scenarios/auth_fail/0001_test.yml.tt2
index ba47f601..e4eb26a7 100644
--- a/scenarios/auth_fail/0001_test.yml.tt2
+++ b/scenarios/auth_fail/0001_test.yml.tt2
@@ -3,7 +3,7 @@ flow:
   - start|ROUTE_ENTRY:
   - return|ROUTE_ENTRY:
   - start|ROUTE_NET_INFO:
-      $x_hdr(From): sip:testuser1003@
+      $x_hdr(From): sip:[% scenarios.0.username %]@
   - return|ROUTE_NET_INFO:
   - start|ROUTE_CHECK_TEL_URI:
   - return|ROUTE_CHECK_TEL_URI:
@@ -16,7 +16,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^REGISTER'
-  - 'Contact: sip:testuser1003@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'Content-Length: 0'
   - 'Expires: 600'
 sip_out:
diff --git a/scenarios/auth_fail/0002_test.yml.tt2 b/scenarios/auth_fail/0002_test.yml.tt2
index 86ad36af..e5c16120 100644
--- a/scenarios/auth_fail/0002_test.yml.tt2
+++ b/scenarios/auth_fail/0002_test.yml.tt2
@@ -11,10 +11,10 @@ flow:
   - start|ROUTE_AUTH:
   - start|ROUTE_AUTH_HELPER:
       $x_hdr(From): auth-fail.scenarios.test
-      $var(realm_user): testuser1003
+      $var(realm_user): [% scenarios.0.username %]
       $var(realm_domain): auth-fail.scenarios.test
   - return|ROUTE_AUTH_HELPER:
-      $avp(orig_acc_caller_user): ['testuser1003']
+      $avp(orig_acc_caller_user): ['[% scenarios.0.username %]']
       $avp(orig_acc_caller_domain): ['auth-fail.scenarios.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
@@ -24,7 +24,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^REGISTER'
-  - 'Contact: sip:testuser1003@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'Content-Length: 0'
   - 'Expires: 600'
 sip_out:
diff --git a/scenarios/auth_fail/0003_test.yml.tt2 b/scenarios/auth_fail/0003_test.yml.tt2
index 86ad36af..e5c16120 100644
--- a/scenarios/auth_fail/0003_test.yml.tt2
+++ b/scenarios/auth_fail/0003_test.yml.tt2
@@ -11,10 +11,10 @@ flow:
   - start|ROUTE_AUTH:
   - start|ROUTE_AUTH_HELPER:
       $x_hdr(From): auth-fail.scenarios.test
-      $var(realm_user): testuser1003
+      $var(realm_user): [% scenarios.0.username %]
       $var(realm_domain): auth-fail.scenarios.test
   - return|ROUTE_AUTH_HELPER:
-      $avp(orig_acc_caller_user): ['testuser1003']
+      $avp(orig_acc_caller_user): ['[% scenarios.0.username %]']
       $avp(orig_acc_caller_domain): ['auth-fail.scenarios.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
@@ -24,7 +24,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^REGISTER'
-  - 'Contact: sip:testuser1003@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'Content-Length: 0'
   - 'Expires: 600'
 sip_out:
diff --git a/scenarios/auth_fail/0004_test.yml.tt2 b/scenarios/auth_fail/0004_test.yml.tt2
index 86ad36af..e5c16120 100644
--- a/scenarios/auth_fail/0004_test.yml.tt2
+++ b/scenarios/auth_fail/0004_test.yml.tt2
@@ -11,10 +11,10 @@ flow:
   - start|ROUTE_AUTH:
   - start|ROUTE_AUTH_HELPER:
       $x_hdr(From): auth-fail.scenarios.test
-      $var(realm_user): testuser1003
+      $var(realm_user): [% scenarios.0.username %]
       $var(realm_domain): auth-fail.scenarios.test
   - return|ROUTE_AUTH_HELPER:
-      $avp(orig_acc_caller_user): ['testuser1003']
+      $avp(orig_acc_caller_user): ['[% scenarios.0.username %]']
       $avp(orig_acc_caller_domain): ['auth-fail.scenarios.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
@@ -24,7 +24,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^REGISTER'
-  - 'Contact: sip:testuser1003@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'Content-Length: 0'
   - 'Expires: 600'
 sip_out:
diff --git a/scenarios/auth_fail/sipp_scenario00.xml b/scenarios/auth_fail/sipp_scenario00.xml
index 35fba14d..e8e7d3a2 100644
--- a/scenarios/auth_fail/sipp_scenario00.xml
+++ b/scenarios/auth_fail/sipp_scenario00.xml
@@ -12,7 +12,7 @@
       To: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: [cseq] REGISTER
-      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]>
       Expires: 600
       Max-Forwards: 70
       Content-Length: 0
@@ -33,7 +33,7 @@
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: [cseq] REGISTER
       [field1 file="caller.csv"]
-      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]>
       Expires: 600
       Max-Forwards: 70
       Content-Length: 0
@@ -54,7 +54,7 @@
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: [cseq] REGISTER
       [field1 file="caller.csv"]
-      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]>
       Expires: 600
       Max-Forwards: 70
       Content-Length: 0
@@ -75,7 +75,7 @@
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: [cseq] REGISTER
       [field1 file="caller.csv"]
-      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]>
       Expires: 600
       Max-Forwards: 70
       Content-Length: 0
@@ -96,7 +96,7 @@
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: [cseq] REGISTER
       [field1 file="caller.csv"]
-      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]>
       Expires: 600
       Max-Forwards: 70
       Content-Length: 0