diff --git a/libraries/utils.robot b/libraries/utils.robot
index 2aba5d1..dbd8b7b 100755
--- a/libraries/utils.robot
+++ b/libraries/utils.robot
@@ -408,8 +408,7 @@
     ...    ${src['ip']}    ${src['user']}    ${src['pass']}    ${src['container_type']}    ${src['container_name']}
     ...    ${dst['dp_iface_name']}    ${dst['ip']}    ${dst['user']}    ${dst['pass']}    ${dst['container_type']}
     ...    ${dst['container_name']}
-    Run Keyword IF    ${has_dataplane}
-    ...    Run Keyword IF    '${src['service_type']}'!='hsia'
+    Run Keyword IF    '${src['service_type']}'!='hsia'
     ...    Run Keyword And Continue On Failure    Wait Until Keyword Succeeds    ${timeout}    2s
     ...    Validate Subscriber DHCP Allocation    ${ONOS_SSH_IP}    ${ONOS_SSH_PORT}    ${onu_port}
     ...    ${src['c_tag']}
diff --git a/tests/data/bbsim-kind-tt.yaml b/tests/data/bbsim-kind-tt.yaml
index 1066768..56706cf 100644
--- a/tests/data/bbsim-kind-tt.yaml
+++ b/tests/data/bbsim-kind-tt.yaml
@@ -35,11 +35,29 @@
 
 hosts:
   src:
-    -
-      onu: 'BBSM000a0001'
+    - onu: 'BBSM000a0001'
       olt: 'BBSIM_OLT_10'
       c_tag: '900'
       s_tag: '900'
+      service_type: 'hsia'
+    - onu: 'BBSM000a0001'
+      olt: 'BBSIM_OLT_10'
+      c_tag: '444'
+      s_tag: '333'
+      service_type: 'voip'
+    - onu: 'BBSM000a0001'
+      olt: 'BBSIM_OLT_10'
+      c_tag: '55'
+      s_tag: '555'
+      service_type: 'vod'
+    - onu: 'BBSM000a0001'
+      olt: 'BBSIM_OLT_10'
+      c_tag: '55'
+      s_tag: '550'
+      service_type: 'MC'
 
   dst:
     - ip: null
+    - ip: null
+    - ip: null
+    - ip: null