diff --git a/scenarios/incoming_hih/0003_test.yml.tt2 b/scenarios/incoming_hih/0003_test.yml.tt2
index 629b84ad..b763df83 100644
--- a/scenarios/incoming_hih/0003_test.yml.tt2
+++ b/scenarios/incoming_hih/0003_test.yml.tt2
@@ -112,7 +112,6 @@ sip_out:
       'P-Acc-State: cfu',
       'P-From-Peer: 1',
       'P-CF-Depth: 1',
-      'P-Callee-Account-ID: \d+',
       'P-App-Param: ;profile=ngcp_cf',
       'P-App-Name: sbc',
       'P-NGCP-Forward-Info: <sip:4311003@',
diff --git a/scenarios/incoming_hih/0005_test.yml.tt2 b/scenarios/incoming_hih/0005_test.yml.tt2
index 3f6c642d..02d63e93 100644
--- a/scenarios/incoming_hih/0005_test.yml.tt2
+++ b/scenarios/incoming_hih/0005_test.yml.tt2
@@ -118,7 +118,6 @@ sip_in:
   - 'P-Acc-State: cfu'
   - 'P-From-Peer: 1'
   - 'P-CF-Depth: 1'
-  - 'P-Callee-Account-ID: \d+'
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
diff --git a/scenarios/invite_callforward/0009_test.yml.tt2 b/scenarios/invite_callforward/0009_test.yml.tt2
index 7007d7ed..953c5ea4 100644
--- a/scenarios/invite_callforward/0009_test.yml.tt2
+++ b/scenarios/invite_callforward/0009_test.yml.tt2
@@ -126,7 +126,6 @@ sip_out:
       'P-Acc-State: cfu',
       'P-From-Peer: 0',
       'P-CF-Depth: 1',
-      'P-Callee-Account-ID: \d+',
       'P-App-Param: ;profile=ngcp_cf',
       'P-App-Name: sbc',
       'P-NGCP-Forward-Info: <sip:testuser1001@',
diff --git a/scenarios/invite_callforward/0011_test.yml.tt2 b/scenarios/invite_callforward/0011_test.yml.tt2
index 56f2d8b2..343df37c 100644
--- a/scenarios/invite_callforward/0011_test.yml.tt2
+++ b/scenarios/invite_callforward/0011_test.yml.tt2
@@ -116,7 +116,6 @@ sip_in:
   - 'P-Acc-State: cfu'
   - 'P-From-Peer: 0'
   - 'P-CF-Depth: 1'
-  - 'P-Callee-Account-ID: \d+'
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
diff --git a/scenarios/lock_ported/0005_test.yml.tt2 b/scenarios/lock_ported/0005_test.yml.tt2
index 7007d7ed..953c5ea4 100644
--- a/scenarios/lock_ported/0005_test.yml.tt2
+++ b/scenarios/lock_ported/0005_test.yml.tt2
@@ -126,7 +126,6 @@ sip_out:
       'P-Acc-State: cfu',
       'P-From-Peer: 0',
       'P-CF-Depth: 1',
-      'P-Callee-Account-ID: \d+',
       'P-App-Param: ;profile=ngcp_cf',
       'P-App-Name: sbc',
       'P-NGCP-Forward-Info: <sip:testuser1001@',
diff --git a/scenarios/lock_ported/0007_test.yml.tt2 b/scenarios/lock_ported/0007_test.yml.tt2
index 726fcb57..4d7ae911 100644
--- a/scenarios/lock_ported/0007_test.yml.tt2
+++ b/scenarios/lock_ported/0007_test.yml.tt2
@@ -119,7 +119,6 @@ sip_in:
   - 'P-Acc-State: cfu'
   - 'P-From-Peer: 0'
   - 'P-CF-Depth: 1'
-  - 'P-Callee-Account-ID: \d+'
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
diff --git a/scenarios_lnp/incoming_peer/0003_test.yml.tt2 b/scenarios_lnp/incoming_peer/0003_test.yml.tt2
index 174884da..7a7883a7 100644
--- a/scenarios_lnp/incoming_peer/0003_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0003_test.yml.tt2
@@ -135,7 +135,6 @@ sip_out:
       'To: <sip:4311001@',
       'Content-Type: application/sdp',
       'P-CF-Depth: 1',
-      'P-Callee-Account-ID: \d+',
       'P-Callee-UUID: 0',
       'P-Asserted-Identity: <sip:004321001@',
       'P-Called-Party-ID: <sip:4318881003@',