diff --git a/scenarios/invite_allowedcli_match/scenario.yml b/scenarios/invite_allowedcli_match/scenario.yml
new file mode 100644
index 00000000..8824a2b9
--- /dev/null
+++ b/scenarios/invite_allowedcli_match/scenario.yml
@@ -0,0 +1,14 @@
+scenarios:
+  - ip: 127.126.0.1
+    user: testuser1002
+    domain: spce.test
+    username: testuser1002
+    password: testuser
+    responders:
+      - ip: 127.1.0.1
+        number: 4311003
+        user: testuser1003
+        domain: spce.test
+        register: yes
+        username: testuser1003
+        password: testuser
diff --git a/scenarios/invite_allowedcli_match/sipp_scenario_responder01.xml b/scenarios/invite_allowedcli_match/sipp_scenario_responder00.xml
similarity index 100%
rename from scenarios/invite_allowedcli_match/sipp_scenario_responder01.xml
rename to scenarios/invite_allowedcli_match/sipp_scenario_responder00.xml
diff --git a/scenarios/invite_allowedcli_match/sipp_scenario_responder01_reg.xml b/scenarios/invite_allowedcli_match/sipp_scenario_responder01_reg.xml
deleted file mode 100644
index d9cc4973..00000000
--- a/scenarios/invite_allowedcli_match/sipp_scenario_responder01_reg.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Sipwise NGCP Benchmark UAS Registration">
-  <send>
-    <![CDATA[
-
-      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
-      CSeq: 1 REGISTER
-      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
-      Expires: 600
-      Max-Forwards: 70
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <recv response="100"
-        optional="true">
-  </recv>
-  
-  <recv response="401" auth="true"/>
-  
-  <send>
-    <![CDATA[
-
-      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
-      CSeq: 2 REGISTER
-      [field2 file="callee.csv" line=0]
-      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
-      Expires: 600
-      Max-Forwards: 70
-      Content-Length: 0
-
-    ]]>
-  </send>
-  
-  <recv response="100" optional="true">
-  </recv>
-
-  <recv response="200">
-  </recv>
-
-  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
-</scenario>
-
diff --git a/scenarios/invite_allowedcli_match/sipp_scenario_responder01_unreg.xml b/scenarios/invite_allowedcli_match/sipp_scenario_responder01_unreg.xml
deleted file mode 100644
index ec70b8d6..00000000
--- a/scenarios/invite_allowedcli_match/sipp_scenario_responder01_unreg.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Sipwise NGCP Benchmark UAS Registration">
-  <send>
-    <![CDATA[
-
-      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
-      CSeq: 1 REGISTER
-      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
-      Expires: 600
-      Max-Forwards: 70
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <recv response="100"
-        optional="true">
-  </recv>
-  
-  <recv response="401" auth="true"/>
-  
-  <send>
-    <![CDATA[
-
-      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
-      CSeq: 2 REGISTER
-      [field2 file="callee.csv" line=0]
-      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
-      Expires: 0
-      Max-Forwards: 70
-      Content-Length: 0
-
-    ]]>
-  </send>
-  
-  <recv response="100" optional="true">
-  </recv>
-
-  <recv response="200">
-  </recv>
-
-  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
-</scenario>
-