From fcc77752111a4fbe8caa341cf5249efbad305a2a Mon Sep 17 00:00:00 2001
From: Peter Mikus <pmikus@cisco.com>
Date: Fri, 18 Oct 2019 14:15:32 +0000
Subject: [PATCH] Tests: Introduce driver layer

+ Small bugfixes in various suites

Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: I051af0a6da7340fe3f617400370c3846ca5241ab
---
 resources/libraries/python/PapiExecutor.py         |  2 +-
 resources/libraries/robot/shared/interfaces.robot  | 42 ++++++++++++++++------
 ...h2p-ethicmpv4-ip4base-eth-2memif-1dcr-dev.robot |  4 ++-
 ...icmpv4-l2bdbasemaclrn-eth-2memif-1dcr-dev.robot |  4 ++-
 ...2p-ethicmpv4-l2xcbase-eth-2memif-1dcr-dev.robot |  4 ++-
 ...h2p-ethicmpv6-ip6base-eth-2memif-1dcr-dev.robot |  4 ++-
 ...p4base-policy-aes-128-cbc-sha-512-256-dev.robot |  4 ++-
 ...p4base-policy-aes-128-cbc-sha-512-256-dev.robot |  4 ++-
 ...p6base-policy-aes-128-cbc-sha-512-256-dev.robot |  4 ++-
 ...p6base-policy-aes-128-cbc-sha-512-256-dev.robot |  4 ++-
 .../eth2p-ethicmpv4-ip4base-eth-1tap-dev.robot     |  4 ++-
 ...-ethicmpv4-ip4base-eth-1tap-namespace-dev.robot |  4 ++-
 ...h2p-ethicmpv4-l2bdbasemaclrn-eth-2tap-dev.robot |  4 ++-
 .../device/ip4/eth2p-ethicmpv4-ip4base-dev.robot   |  4 ++-
 .../eth2p-ethip4-ip4base-copblklistbase-dev.robot  |  4 ++-
 .../eth2p-ethip4-ip4base-copwhtlistbase-dev.robot  |  4 ++-
 .../ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot |  9 ++---
 .../eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot |  9 ++---
 .../eth2p-ethip4vxlan-l2bdbasemaclrn-dev.robot     |  4 ++-
 .../eth2p-ethip4vxlan-l2xcbase-dev.robot           |  4 ++-
 .../lisp/eth2p-ethip4lisp-ip4base-dev.robot        |  4 ++-
 .../lisp/eth2p-ethip4lispgpe-ip4base-dev.robot     |  4 ++-
 .../lisp/eth2p-ethip4lispgpe-ip6base-dev.robot     |  4 ++-
 .../device/ip6/eth2p-ethicmpv6-ip6base-dev.robot   |  4 ++-
 .../eth2p-ethip6-ip6base-copblklistbase-dev.robot  |  4 ++-
 .../eth2p-ethip6-ip6base-copwhtlistbase-dev.robot  |  4 ++-
 .../ip6/eth2p-ethip6-ip6base-iacldstbase-dev.robot |  9 ++---
 .../eth2p-ethip6-ip6base-ipolicemarkbase-dev.robot |  9 ++---
 .../lisp/eth2p-ethip6lispgpe-ip4base-dev.robot     |  4 ++-
 .../lisp/eth2p-ethip6lispgpe-ip6base-dev.robot     |  4 ++-
 .../eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot   |  3 +-
 .../eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot    |  3 +-
 .../l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-dev.robot  |  4 ++-
 .../device/l2xc/eth2p-ethicmpv4-l2xcbase-dev.robot |  4 ++-
 ...th2p-ethicmpv4-ip4base-eth-2vhost-1vm-dev.robot |  4 ++-
 ...th2p-ethicmpv6-ip6base-eth-2vhost-1vm-dev.robot |  4 ++-
 ...hicmpv4-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot |  4 ++-
 ...h2p-ethicmpv4-l2xcbase-eth-2vhost-1vm-dev.robot |  4 ++-
 ...t1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot |  4 ++-
 ...eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot |  4 ++-
 ...1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot |  4 ++-
 ...1x710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot |  4 ++-
 ...710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot |  4 ++-
 ...t1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot |  4 ++-
 ...eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot |  4 ++-
 ...1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot |  4 ++-
 ...710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot |  4 ++-
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot |  4 ++-
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot |  4 ++-
 ...ec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot |  4 ++-
 ...ec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot |  4 ++-
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot |  4 ++-
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot |  4 ++-
 ...sec1000tnlhw-ip4base-int-aes128gcm-ndrpdr.robot |  4 ++-
 ...sec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot |  4 ++-
 ...p4base-policy-aes128cbc-hmac256sha-ndrpdr.robot |  4 ++-
 ...p4base-policy-aes128cbc-hmac512sha-ndrpdr.robot |  4 ++-
 ...1000tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot |  4 ++-
 ...1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot |  4 ++-
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot |  4 ++-
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot |  4 ++-
 ...sec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot |  4 ++-
 ...sec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot |  4 ++-
 ...p4base-policy-aes128cbc-hmac256sha-ndrpdr.robot |  4 ++-
 ...p4base-policy-aes128cbc-hmac512sha-ndrpdr.robot |  4 ++-
 ...1000tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot |  4 ++-
 ...1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot |  4 ++-
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot |  4 ++-
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot |  4 ++-
 ...4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr.robot |  4 ++-
 ...4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot |  4 ++-
 ...p4base-policy-aes128cbc-hmac256sha-ndrpdr.robot |  4 ++-
 ...p4base-policy-aes128cbc-hmac512sha-ndrpdr.robot |  4 ++-
 ...sec1tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot |  4 ++-
 ...sec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot |  4 ++-
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot |  4 ++-
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot |  4 ++-
 ...4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot |  4 ++-
 ...4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot |  4 ++-
 ...p4base-policy-aes128cbc-hmac256sha-ndrpdr.robot |  4 ++-
 ...p4base-policy-aes128cbc-hmac512sha-ndrpdr.robot |  4 ++-
 ...sec1tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot |  4 ++-
 ...sec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot |  4 ++-
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot |  2 ++
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot |  2 ++
 ...ec20000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot |  2 ++
 ...ec20000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot |  2 ++
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot |  2 ++
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot |  2 ++
 ...ec40000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot |  2 ++
 ...ec40000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot |  2 ++
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot |  4 ++-
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot |  4 ++-
 ...psec400tnlsw-ip4base-int-aes128gcm-ndrpdr.robot |  4 ++-
 ...psec400tnlsw-ip4base-int-aes256gcm-ndrpdr.robot |  4 ++-
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot |  4 ++-
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot |  4 ++-
 ...ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot |  4 ++-
 ...ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot |  4 ++-
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot |  4 ++-
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot |  4 ++-
 ...4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot |  4 ++-
 ...4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot |  4 ++-
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot |  4 ++-
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot |  4 ++-
 ...sec5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot |  4 ++-
 ...sec5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot |  4 ++-
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot |  2 ++
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot |  2 ++
 ...ec60000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot |  2 ++
 ...ec60000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot |  2 ++
 ...spgpe-ip4base-aes128cbc-hmac256sha-ndrpdr.robot |  7 ++--
 .../ip4/10ge2p1x710-avf-dot1q-ip4base-ndrpdr.robot |  3 +-
 .../ip4/10ge2p1x710-avf-eth-ip4base-ndrpdr.robot   |  3 +-
 ...0ge2p1x710-avf-ethip4-ip4scale200k-ndrpdr.robot |  3 +-
 ...10ge2p1x710-avf-ethip4-ip4scale20k-ndrpdr.robot |  3 +-
 .../10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr.robot |  3 +-
 .../ip4/10ge2p1x710-dot1q-ip4base-ndrpdr.robot     |  4 ++-
 ...x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot |  4 ++-
 ...2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot |  4 ++-
 ...710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot |  4 ++-
 .../ip4/10ge2p1x710-ethip4-ip4base-ndrpdr.robot    |  4 ++-
 .../10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot   |  4 ++-
 .../10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot    |  4 ++-
 .../ip4/10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot |  4 ++-
 ...thip4udp-ip4base-iacl10sf-100flows-ndrpdr.robot |  4 ++-
 ...hip4udp-ip4base-iacl10sf-100kflows-ndrpdr.robot |  4 ++-
 ...thip4udp-ip4base-iacl10sf-10kflows-ndrpdr.robot |  4 ++-
 ...thip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot |  4 ++-
 ...hip4udp-ip4base-iacl10sl-100kflows-ndrpdr.robot |  4 ++-
 ...thip4udp-ip4base-iacl10sl-10kflows-ndrpdr.robot |  4 ++-
 ...ethip4udp-ip4base-iacl1sf-100flows-ndrpdr.robot |  4 ++-
 ...thip4udp-ip4base-iacl1sf-100kflows-ndrpdr.robot |  4 ++-
 ...ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot |  4 ++-
 ...ethip4udp-ip4base-iacl1sl-100flows-ndrpdr.robot |  4 ++-
 ...thip4udp-ip4base-iacl1sl-100kflows-ndrpdr.robot |  4 ++-
 ...ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot |  4 ++-
 ...thip4udp-ip4base-iacl50sf-100flows-ndrpdr.robot |  4 ++-
 ...hip4udp-ip4base-iacl50sf-100kflows-ndrpdr.robot |  4 ++-
 ...thip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot |  4 ++-
 ...thip4udp-ip4base-iacl50sl-100flows-ndrpdr.robot |  4 ++-
 ...hip4udp-ip4base-iacl50sl-100kflows-ndrpdr.robot |  4 ++-
 ...thip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot |  4 ++-
 ...0ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot |  4 ++-
 ...thip4udp-ip4base-oacl10sf-100flows-ndrpdr.robot |  4 ++-
 ...hip4udp-ip4base-oacl10sf-100kflows-ndrpdr.robot |  4 ++-
 ...thip4udp-ip4base-oacl10sf-10kflows-ndrpdr.robot |  4 ++-
 ...thip4udp-ip4base-oacl10sl-100flows-ndrpdr.robot |  4 ++-
 ...hip4udp-ip4base-oacl10sl-100kflows-ndrpdr.robot |  4 ++-
 ...thip4udp-ip4base-oacl10sl-10kflows-ndrpdr.robot |  4 ++-
 ...ethip4udp-ip4base-oacl1sf-100flows-ndrpdr.robot |  4 ++-
 ...thip4udp-ip4base-oacl1sf-100kflows-ndrpdr.robot |  4 ++-
 ...ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr.robot |  4 ++-
 ...ethip4udp-ip4base-oacl1sl-100flows-ndrpdr.robot |  4 ++-
 ...thip4udp-ip4base-oacl1sl-100kflows-ndrpdr.robot |  4 ++-
 ...ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr.robot |  4 ++-
 ...thip4udp-ip4base-oacl50sf-100flows-ndrpdr.robot |  4 ++-
 ...hip4udp-ip4base-oacl50sf-100kflows-ndrpdr.robot |  4 ++-
 ...thip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot |  4 ++-
 ...thip4udp-ip4base-oacl50sl-100flows-ndrpdr.robot |  4 ++-
 ...hip4udp-ip4base-oacl50sl-100kflows-ndrpdr.robot |  4 ++-
 ...thip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot |  4 ++-
 ...ip4udp-ip4base-udpsrcscale15-nat44-ndrpdr.robot |  4 ++-
 ...udp-ip4scale10-udpsrcscale15-nat44-ndrpdr.robot |  4 ++-
 ...dp-ip4scale100-udpsrcscale15-nat44-ndrpdr.robot |  4 ++-
 ...p-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot |  4 ++-
 ...p-ip4scale2000-udpsrcscale15-nat44-ndrpdr.robot |  4 ++-
 ...p-ip4scale4000-udpsrcscale15-nat44-ndrpdr.robot |  4 ++-
 ...2n1l-10ge2p1x710-avf-dot1q-ip4base-ndrpdr.robot |  3 +-
 ...n1l-10ge2p1x710-avf-ethip4-ip4base-ndrpdr.robot |  3 +-
 ...0ge2p1x710-avf-ethip4-ip4scale200k-ndrpdr.robot |  3 +-
 ...10ge2p1x710-avf-ethip4-ip4scale20k-ndrpdr.robot |  3 +-
 ...-10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr.robot |  3 +-
 .../2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr.robot    |  4 ++-
 ...x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot |  4 ++-
 ...2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot |  4 ++-
 ...710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot |  4 ++-
 .../2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot   |  4 ++-
 ...1l-10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot |  4 ++-
 ...n1l-10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot |  4 ++-
 ...2n1l-10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot |  4 ++-
 ...ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot |  4 ++-
 ...ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot |  4 ++-
 ...thip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot |  4 ++-
 ...thip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot |  4 ++-
 ...0ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot |  4 ++-
 ...thip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot |  4 ++-
 ...thip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot |  4 ++-
 ...an-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot |  4 ++-
 ...vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot |  4 ++-
 ...vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot |  4 ++-
 ...ip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot |  4 ++-
 .../10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot |  4 ++-
 .../10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot |  4 ++-
 ...2p1x710-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot |  4 ++-
 .../10ge2p1x710-ethip4vxlan-l2xcbase-ndrpdr.robot  |  4 ++-
 .../ip6/10ge2p1x710-avf-dot1q-ip6base-ndrpdr.robot |  3 +-
 .../10ge2p1x710-avf-ethip6-ip6base-ndrpdr.robot    |  3 +-
 ...0ge2p1x710-avf-ethip6-ip6scale200k-ndrpdr.robot |  3 +-
 ...10ge2p1x710-avf-ethip6-ip6scale20k-ndrpdr.robot |  3 +-
 .../10ge2p1x710-avf-ethip6-ip6scale2m-ndrpdr.robot |  3 +-
 .../ip6/10ge2p1x710-dot1q-ip6base-ndrpdr.robot     |  4 ++-
 ...x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot |  4 ++-
 ...2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot |  4 ++-
 .../ip6/10ge2p1x710-ethip6-ip6base-ndrpdr.robot    |  2 ++
 .../10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot   |  4 ++-
 .../10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot    |  4 ++-
 .../ip6/10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot |  4 ++-
 ...2n1l-10ge2p1x710-avf-dot1q-ip6base-ndrpdr.robot |  3 +-
 ...n1l-10ge2p1x710-avf-ethip6-ip6base-ndrpdr.robot |  3 +-
 ...0ge2p1x710-avf-ethip6-ip6scale200k-ndrpdr.robot |  3 +-
 ...10ge2p1x710-avf-ethip6-ip6scale20k-ndrpdr.robot |  3 +-
 ...-10ge2p1x710-avf-ethip6-ip6scale2m-ndrpdr.robot |  3 +-
 .../2n1l-10ge2p1x710-dot1q-ip6base-ndrpdr.robot    |  2 ++
 ...x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot |  4 ++-
 ...2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot |  4 ++-
 .../2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr.robot   |  2 ++
 ...1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot |  4 ++-
 ...n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot |  4 ++-
 ...2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot |  4 ++-
 .../10ge2p1x710-ethip6lispip4-ip6base-ndrpdr.robot |  4 ++-
 .../10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot |  4 ++-
 ...ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr.robot |  3 +-
 ...10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot |  3 +-
 .../l2/10ge2p1x710-avf-eth-l2patch-ndrpdr.robot    |  3 +-
 .../l2/10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot   |  3 +-
 .../l2/10ge2p1x710-dot1ad-l2xcbase-ndrpdr.robot    |  2 ++
 .../10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot  |  4 ++-
 .../l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot     |  4 ++-
 ...h-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr.robot |  4 ++-
 ...-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr.robot |  4 ++-
 ...h-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr.robot |  4 ++-
 ...h-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr.robot |  4 ++-
 ...-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr.robot |  4 ++-
 ...h-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr.robot |  4 ++-
 ...th-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr.robot |  4 ++-
 ...h-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr.robot |  4 ++-
 ...th-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr.robot |  4 ++-
 ...th-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr.robot |  4 ++-
 ...h-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr.robot |  4 ++-
 ...th-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr.robot |  4 ++-
 ...h-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr.robot |  4 ++-
 ...-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr.robot |  4 ++-
 ...h-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr.robot |  4 ++-
 ...h-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr.robot |  5 +--
 ...-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr.robot |  4 ++-
 ...h-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr.robot |  4 ++-
 ...basemaclrn-macip-iacl10sl-100flows-ndrpdr.robot |  4 ++-
 ...asemaclrn-macip-iacl10sl-100kflows-ndrpdr.robot |  4 ++-
 ...basemaclrn-macip-iacl10sl-10kflows-ndrpdr.robot |  4 ++-
 ...dbasemaclrn-macip-iacl1sl-100flows-ndrpdr.robot |  4 ++-
 ...basemaclrn-macip-iacl1sl-100kflows-ndrpdr.robot |  4 ++-
 ...dbasemaclrn-macip-iacl1sl-10kflows-ndrpdr.robot |  4 ++-
 ...basemaclrn-macip-iacl50sl-100flows-ndrpdr.robot |  4 ++-
 ...asemaclrn-macip-iacl50sl-100kflows-ndrpdr.robot |  4 ++-
 ...basemaclrn-macip-iacl50sl-10kflows-ndrpdr.robot |  4 ++-
 .../l2/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot |  4 ++-
 ...h-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr.robot |  4 ++-
 ...-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr.robot |  4 ++-
 ...h-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr.robot |  4 ++-
 ...h-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr.robot |  4 ++-
 ...-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr.robot |  4 ++-
 ...h-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr.robot |  4 ++-
 ...th-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr.robot |  4 ++-
 ...h-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr.robot |  4 ++-
 ...th-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr.robot |  4 ++-
 ...th-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr.robot |  4 ++-
 ...h-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr.robot |  4 ++-
 ...th-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr.robot |  4 ++-
 ...h-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr.robot |  4 ++-
 ...-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr.robot |  4 ++-
 ...h-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr.robot |  4 ++-
 ...h-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr.robot |  4 ++-
 ...-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr.robot |  4 ++-
 ...h-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr.robot |  4 ++-
 ...0ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot |  4 ++-
 ...10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot |  4 ++-
 .../10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot |  4 ++-
 .../perf/l2/10ge2p1x710-eth-l2patch-ndrpdr.robot   |  6 ++--
 .../perf/l2/10ge2p1x710-eth-l2xcbase-ndrpdr.robot  |  2 ++
 ...1x710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot |  3 +-
 ...ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr.robot |  3 +-
 ...10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot |  3 +-
 .../2n1l-10ge2p1x710-avf-eth-l2patch-ndrpdr.robot  |  3 +-
 .../2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot |  3 +-
 ...l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot |  2 ++
 .../2n1l-10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot   |  4 ++-
 ...n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot |  4 ++-
 ...0ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot |  4 ++-
 ...10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot |  4 ++-
 ...-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot |  4 ++-
 .../l2/2n1l-10ge2p1x710-eth-l2patch-ndrpdr.robot   |  4 ++-
 .../l2/2n1l-10ge2p1x710-eth-l2xcbase-ndrpdr.robot  |  2 ++
 ...2p1x710-ethip4-loadbalancer-maglev-ndrpdr.robot |  4 ++-
 ...eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr.robot |  4 ++-
 ...0-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr.robot |  4 ++-
 ...710-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr.robot |  4 ++-
 ...710-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr.robot |  4 ++-
 ...710-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr.robot |  4 ++-
 ...710-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr.robot |  4 ++-
 ...x710-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr.robot |  4 ++-
 ...x710-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr.robot |  4 ++-
 ...x710-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr.robot |  4 ++-
 ...x710-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr.robot |  4 ++-
 ...x710-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr.robot |  4 ++-
 ...x710-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr.robot |  4 ++-
 ...710-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr.robot |  4 ++-
 ...710-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr.robot |  4 ++-
 ...x710-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr.robot |  4 ++-
 ...x710-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr.robot |  4 ++-
 ...x710-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr.robot |  4 ++-
 ...x710-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr.robot |  4 ++-
 ...710-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr.robot |  4 ++-
 ...710-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr.robot |  4 ++-
 ...x710-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr.robot |  4 ++-
 ...x710-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr.robot |  4 ++-
 ...710-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr.robot |  4 ++-
 ...710-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr.robot |  4 ++-
 ...710-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr.robot |  4 ++-
 ...710-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr.robot |  4 ++-
 ...10-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr.robot |  4 ++-
 ...l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf.robot |  4 ++-
 ...l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf.robot |  4 ++-
 ...xlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr.robot |  4 ++-
 ...xlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr.robot |  4 ++-
 ...an-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf.robot |  4 ++-
 ...an-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf.robot |  4 ++-
 ...p4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr.robot |  4 ++-
 ...p4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr.robot |  4 ++-
 ...an-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf.robot |  4 ++-
 ...an-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf.robot |  4 ++-
 ...p4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr.robot |  4 ++-
 ...p4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr.robot |  4 ++-
 ...an-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf.robot |  4 ++-
 ...an-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf.robot |  4 ++-
 ...p4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr.robot |  4 ++-
 ...p4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr.robot |  4 ++-
 ...4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr.robot |  4 ++-
 ...4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr.robot |  4 ++-
 ...n-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf.robot |  4 ++-
 ...n-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf.robot |  4 ++-
 ...4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr.robot |  4 ++-
 ...4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr.robot |  4 ++-
 ...n-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf.robot |  4 ++-
 ...n-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf.robot |  4 ++-
 ...x710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot |  6 ++--
 ...-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot |  6 ++--
 ...hip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot |  6 ++--
 ...ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot |  6 ++--
 ...thip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot |  6 ++--
 ...thip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot |  6 ++--
 ...ge2p1x710-eth-ip4tcphttp-wrk8u8c50con-cps.robot |  4 ++-
 ...ge2p1x710-eth-ip4tcphttp-wrk8u8c50con-rps.robot |  4 ++-
 ...2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot |  4 ++-
 ...aclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot |  4 ++-
 ...ot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot |  4 ++-
 ...cbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot |  4 ++-
 ...2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot |  4 ++-
 ...aclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot |  4 ++-
 ...ot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot |  4 ++-
 ...cbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot |  4 ++-
 ...2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot |  4 ++-
 ...aclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot |  4 ++-
 ...ot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot |  4 ++-
 ...cbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot |  4 ++-
 ...2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot |  4 ++-
 ...aclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot |  4 ++-
 ...-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot |  4 ++-
 ...cbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot |  4 ++-
 ...thip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot |  4 ++-
 ...p4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot |  4 ++-
 ...2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot |  4 ++-
 ...aclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot |  4 ++-
 ...2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot |  4 ++-
 ...aclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot |  4 ++-
 ...2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot |  4 ++-
 ...aclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot |  4 ++-
 ...-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot |  4 ++-
 ...cbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot |  4 ++-
 ...thip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot |  4 ++-
 ...p4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot |  4 ++-
 ...dstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot |  4 ++-
 ...-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot |  4 ++-
 ...iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot |  4 ++-
 483 files changed, 1433 insertions(+), 504 deletions(-)

diff --git a/resources/libraries/python/PapiExecutor.py b/resources/libraries/python/PapiExecutor.py
index 60d35a8543..0e0a9332c4 100644
--- a/resources/libraries/python/PapiExecutor.py
+++ b/resources/libraries/python/PapiExecutor.py
@@ -448,7 +448,7 @@ class PapiSocketExecutor(object):
         if log:
             logger.info(
                 "{cmd} ({host} - {remote_vpp_socket}):\n{reply}".
-                format(cmd=cmd, reply=reply,
+                format(cmd=cmd, reply=reply.encode('utf-8').strip(),
                        remote_vpp_socket=remote_vpp_socket, host=node['host']))
         return reply
 
diff --git a/resources/libraries/robot/shared/interfaces.robot b/resources/libraries/robot/shared/interfaces.robot
index 514ed91a5b..86ae61d3a4 100644
--- a/resources/libraries/robot/shared/interfaces.robot
+++ b/resources/libraries/robot/shared/interfaces.robot
@@ -138,9 +138,40 @@
 | | Set Test Variable | ${prev_layer} | if
 | | Set interfaces in path up
 
+| Initialize layer driver
+| | [Documentation]
+| | ... | Initialize driver based interfaces on each DUT. Interfaces are
+| | ... | brought up.
+| | ...
+| | [Arguments] | ${driver}
+| | ...
+# TODO: Introduce the Pre- Initialize layer driver for preparing driver before
+# VPP starts and then Post- Initialize layer driver for preparing interfaces
+# after VPP starts. This way we can control actions needed for proper handling
+# of various driver-based interfaces in VPP.
+| | :FOR | ${dut} | IN | @{duts}
+| | | Run Keyword | Initialize layer ${driver} on node | ${dut}
+| | Set Test Variable | ${prev_layer} | vf
+| | Set interfaces in path up
+
+| Initialize layer vfio-pci on node
+| | [Documentation]
+| | ... | Initialize vfio-pci interfaces on DUT.
+| | ...
+| | ... | *Arguments:*
+| | ... | - dut - DUT node. Type: string
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Initialize layer vfio-pci on node \| DUT1 \|
+| | ...
+| | [Arguments] | ${dut}
+| | ...
+| | No operation
+
 | Initialize layer avf on node
 | | [Documentation]
-| | ... | Initialize AVF interfaces on DUT. Interfaces are brought up.
+| | ... | Initialize AVF interfaces on DUT.
 | | ...
 | | ... | *Arguments:*
 | | ... | - dut - DUT node. Type: string
@@ -173,15 +204,6 @@
 | | Set Test Variable | ${${dut_str}_if1_mac} | ${dut_eth_vf_if1_mac}
 | | Set Test Variable | ${${dut_str}_if2_mac} | ${dut_eth_vf_if2_mac}
 
-| Initialize AVF interfaces
-| | [Documentation]
-| | ... | Initialize AVF interfaces on each DUT. Interfaces are brought up.
-| | ...
-| | :FOR | ${dut} | IN | @{duts}
-| | | Initialize layer avf on node | ${dut}
-| | Set Test Variable | ${prev_layer} | vf
-| | Set interfaces in path up
-
 | Initialize layer bonding on node
 | | [Documentation]
 | | ... | Bonded interface and variables to be created on across east and
diff --git a/tests/vpp/device/container_memif/eth2p-ethicmpv4-ip4base-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-ethicmpv4-ip4base-eth-2memif-1dcr-dev.robot
index 5e0ccff596..2cbea18243 100644
--- a/tests/vpp/device/container_memif/eth2p-ethicmpv4-ip4base-eth-2memif-1dcr-dev.robot
+++ b/tests/vpp/device/container_memif/eth2p-ethicmpv4-ip4base-eth-2memif-1dcr-dev.robot
@@ -42,6 +42,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Container
 | ${container_engine}= | Docker
@@ -67,7 +68,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Start containers for test | auto_scale=${False} | pinning=${False}
+| | When Initialize layer driver | ${nic_driver}
+| | And Start containers for test | auto_scale=${False} | pinning=${False}
 | | And Initialize IPv4 routing with memif pairs
 | | Then Send packet and verify headers
 | | ... | ${tg} | 10.10.10.1 | 20.20.20.1
diff --git a/tests/vpp/device/container_memif/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2memif-1dcr-dev.robot
index 4a3da26b79..ec49c7ab88 100644
--- a/tests/vpp/device/container_memif/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2memif-1dcr-dev.robot
+++ b/tests/vpp/device/container_memif/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2memif-1dcr-dev.robot
@@ -41,6 +41,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Container
 | ${container_engine}= | Docker
@@ -66,7 +67,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | And Start containers for test | auto_scale=${False} | pinning=${False}
 | | And Initialize L2 Bridge Domain with memif pairs | auto_scale=${False}
 | | Then Send ICMPv4 bidirectionally and verify received packets
diff --git a/tests/vpp/device/container_memif/eth2p-ethicmpv4-l2xcbase-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-ethicmpv4-l2xcbase-eth-2memif-1dcr-dev.robot
index a8c0d78745..0c88aaef8e 100644
--- a/tests/vpp/device/container_memif/eth2p-ethicmpv4-l2xcbase-eth-2memif-1dcr-dev.robot
+++ b/tests/vpp/device/container_memif/eth2p-ethicmpv4-l2xcbase-eth-2memif-1dcr-dev.robot
@@ -40,6 +40,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Container
 | ${container_engine}= | Docker
@@ -65,7 +66,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Start containers for test | auto_scale=${False} | pinning=${False}
+| | When Initialize layer driver | ${nic_driver}
+| | And Start containers for test | auto_scale=${False} | pinning=${False}
 | | And Initialize L2 xconnect with memif pairs
 | | Then Send ICMPv4 bidirectionally and verify received packets
 | | ... | ${tg} | ${tg_if1} | ${tg_if2}
diff --git a/tests/vpp/device/container_memif/eth2p-ethicmpv6-ip6base-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-ethicmpv6-ip6base-eth-2memif-1dcr-dev.robot
index cece7f0f6a..67812dd4f8 100644
--- a/tests/vpp/device/container_memif/eth2p-ethicmpv6-ip6base-eth-2memif-1dcr-dev.robot
+++ b/tests/vpp/device/container_memif/eth2p-ethicmpv6-ip6base-eth-2memif-1dcr-dev.robot
@@ -42,6 +42,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Container
 | ${container_engine}= | Docker
@@ -67,7 +68,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Start containers for test | auto_scale=${False} | pinning=${False}
+| | When Initialize layer driver | ${nic_driver}
+| | And Start containers for test | auto_scale=${False} | pinning=${False}
 | | And Set interfaces in path up
 | | And Set up memif interfaces on DUT node
 | | ... | ${dut1} | memif-DUT1_CNF | memif-DUT1_CNF
diff --git a/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot b/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot
index 152b310474..648bb17fc7 100644
--- a/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot
+++ b/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot
@@ -39,6 +39,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_spi}= | ${1000}
 | ${dut_spi}= | ${1001}
@@ -73,7 +74,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Configure topology for IPv4 IPsec testing
+| | When Initialize layer driver | ${nic_driver}
+| | And Configure topology for IPv4 IPsec testing
 | | And Generate keys for IPSec | ${encr_alg} | ${auth_alg}
 | | And Configure manual keyed connection for IPSec
 | | ... | ${dut1} | ${dut1_if1} | ${encr_alg} | ${encr_key} | ${auth_alg}
diff --git a/tests/vpp/device/crypto/eth2p-ethip4ipsec1tptsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot b/tests/vpp/device/crypto/eth2p-ethip4ipsec1tptsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot
index f1208a2249..2e43f71284 100644
--- a/tests/vpp/device/crypto/eth2p-ethip4ipsec1tptsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot
+++ b/tests/vpp/device/crypto/eth2p-ethip4ipsec1tptsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot
@@ -39,6 +39,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_spi}= | ${1000}
 | ${dut_spi}= | ${1001}
@@ -73,7 +74,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Configure topology for IPv4 IPsec testing
+| | When Initialize layer driver | ${nic_driver}
+| | And Configure topology for IPv4 IPsec testing
 | | And Generate keys for IPSec | ${encr_alg} | ${auth_alg}
 | | And Configure manual keyed connection for IPSec
 | | ... | ${dut1} | ${dut1_if1} | ${encr_alg} | ${encr_key} | ${auth_alg}
diff --git a/tests/vpp/device/crypto/eth2p-ethip6ipsec1tnlsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot b/tests/vpp/device/crypto/eth2p-ethip6ipsec1tnlsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot
index d7a234fc80..e4107084c7 100644
--- a/tests/vpp/device/crypto/eth2p-ethip6ipsec1tnlsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot
+++ b/tests/vpp/device/crypto/eth2p-ethip6ipsec1tnlsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot
@@ -39,6 +39,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_spi}= | ${1000}
 | ${dut_spi}= | ${1001}
@@ -74,7 +75,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Configure topology for IPv6 IPsec testing
+| | When Initialize layer driver | ${nic_driver}
+| | And Configure topology for IPv6 IPsec testing
 | | And Generate keys for IPSec | ${encr_alg} | ${auth_alg}
 | | And Configure manual keyed connection for IPSec
 | | ... | ${dut1} | ${dut1_if1} | ${encr_alg} | ${encr_key} | ${auth_alg}
diff --git a/tests/vpp/device/crypto/eth2p-ethip6ipsec1tptsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot b/tests/vpp/device/crypto/eth2p-ethip6ipsec1tptsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot
index bf8460fb91..5e323edfcc 100644
--- a/tests/vpp/device/crypto/eth2p-ethip6ipsec1tptsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot
+++ b/tests/vpp/device/crypto/eth2p-ethip6ipsec1tptsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot
@@ -39,6 +39,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${tg_spi}= | ${1000}
 | ${dut_spi}= | ${1001}
@@ -74,7 +75,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Configure topology for IPv6 IPsec testing
+| | When Initialize layer driver | ${nic_driver}
+| | And Configure topology for IPv6 IPsec testing
 | | And Generate keys for IPSec | ${encr_alg} | ${auth_alg}
 | | And Configure manual keyed connection for IPSec
 | | ... | ${dut1} | ${dut1_if1} | ${encr_alg} | ${encr_key} | ${auth_alg}
diff --git a/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-dev.robot b/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-dev.robot
index 0c845de6f3..12d8304ae6 100644
--- a/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-dev.robot
+++ b/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-dev.robot
@@ -40,6 +40,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${tap1_VPP_ip}= | 16.0.10.1
 | ${tap1_NM_ip}= | 16.0.10.2
@@ -70,7 +71,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Set interfaces in path up
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ${int1}= | And Add Tap Interface | ${dut1} | tap0
 | | And VPP Interface Set IP Address
 | | ... | ${dut1} | ${int1} | ${tap1_VPP_ip} | ${prefix}
diff --git a/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-namespace-dev.robot b/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-namespace-dev.robot
index 7b6bbf4cb6..4d7a4f41e6 100644
--- a/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-namespace-dev.robot
+++ b/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-namespace-dev.robot
@@ -40,6 +40,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${tap1_VPP_ip}= | 16.0.10.1
 | ${tap1_NM_ip}= | 16.0.10.2
@@ -71,7 +72,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Set interfaces in path up
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ${int1}= | And Add Tap Interface | ${dut1} | tap0
 | | And VPP Interface Set IP Address
 | | ... | ${dut1} | ${int1} | ${tap1_VPP_ip} | ${prefix}
diff --git a/tests/vpp/device/interfaces/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2tap-dev.robot b/tests/vpp/device/interfaces/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2tap-dev.robot
index e3eb2f4e7a..3bfe6e1709 100644
--- a/tests/vpp/device/interfaces/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2tap-dev.robot
+++ b/tests/vpp/device/interfaces/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2tap-dev.robot
@@ -41,6 +41,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${bid_TAP}= | tapBr
 
@@ -63,7 +64,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Set interfaces in path up
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ${int1}= | And Add Tap Interface | ${dut1} | tap0
 | | ${int2}= | And Add Tap Interface | ${dut1} | tap1
 | | And Set Interface State | ${dut1} | ${int1} | up
diff --git a/tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-dev.robot b/tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-dev.robot
index 0ce0430ce3..1ff7cd731b 100644
--- a/tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-dev.robot
+++ b/tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-dev.robot
@@ -39,6 +39,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 
 *** Keywords ***
@@ -60,7 +61,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize IPv4 forwarding in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 forwarding in circular topology
 | | ... | remote_host1_ip=192.168.0.1 | remote_host2_ip=192.168.0.2
 | | Then Send IPv4 ping packet and verify headers
 | | ... | ${tg} | ${tg_if1} | ${dut1} | ${dut1_if2}
diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copblklistbase-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copblklistbase-dev.robot
index dce802d9aa..35eb142aab 100644
--- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copblklistbase-dev.robot
+++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copblklistbase-dev.robot
@@ -39,6 +39,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 
 *** Keywords ***
@@ -60,7 +61,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize IPv4 forwarding in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 forwarding in circular topology
 | | And Add Fib Table | ${dut1} | 1
 | | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copwhtlistbase-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copwhtlistbase-dev.robot
index 0a1e5af08a..e99e91dccc 100644
--- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copwhtlistbase-dev.robot
+++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copwhtlistbase-dev.robot
@@ -39,6 +39,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 
 *** Keywords ***
@@ -60,7 +61,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize IPv4 forwarding in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 forwarding in circular topology
 | | And Add Fib Table | ${dut1} | 1
 | | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot
index ccdc74f06a..a44da15189 100644
--- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot
+++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot
@@ -39,6 +39,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 
 *** Keywords ***
@@ -61,7 +62,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize IPv4 forwarding in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 forwarding in circular topology
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
 | | ... | ${dut1} | ip4 | dst | 255.255.255.255
 | | And Vpp Configures Classify Session L3
@@ -73,11 +75,6 @@
 | | ... | ${tg} | 10.10.10.2 | 20.20.20.2
 | | ... | ${tg_if1} | ${tg_if1_mac} | ${dut1_if1_mac}
 | | ... | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac}
-# TODO: Add check of number of hits of the classify session after traffic
-# Until there is implemented check of number of hits of the classify session
-# after passing the traffic log the show classify tables verbose to allow visual
-# check of hit number when needed.
-| | And Show Classify Tables Verbose | ${dut1}
 
 *** Test Cases ***
 | tc01-64B-ethip4-ip4base-iacldstbase-dev
diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot
index de479f8cfa..5ed80aafde 100644
--- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot
+++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot
@@ -38,6 +38,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${cir}= | ${100}
 | ${eir}= | ${150}
@@ -64,16 +65,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize IPv4 forwarding in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 forwarding in circular topology
 | | And Initialize IPv4 policer 2r3c-'ca' in circular topology
 | | Then Send packet and verify marking
 | | ... | ${tg} | ${tg_if1} | ${tg_if2} | ${tg_if1_mac} | ${dut1_if1_mac}
 | | ... | 10.10.10.2 | 20.20.20.2
-# TODO: Add check of number of hits of the classify session after traffic
-# Until there is implemented check of number of hits of the classify session
-# after passing the traffic log the show classify tables verbose to allow visual
-# check of hit number when needed.
-| | And Show Classify Tables Verbose | ${dut1}
 
 *** Test Cases ***
 | tc01-64B-ethip4-ip4base-ipolicemarkbase-dev
diff --git a/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2bdbasemaclrn-dev.robot b/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2bdbasemaclrn-dev.robot
index 2f3fa31eb9..19a6c40a7f 100644
--- a/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2bdbasemaclrn-dev.robot
+++ b/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2bdbasemaclrn-dev.robot
@@ -40,6 +40,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${50}
 
 *** Keywords ***
@@ -61,7 +62,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | And Initialize layer ip4vxlan
 | | And Initialize L2 bridge domain
 | | Then Send VXLAN encapsulated packet and verify received packet
diff --git a/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2xcbase-dev.robot b/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2xcbase-dev.robot
index 250867b827..c905386e3c 100644
--- a/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2xcbase-dev.robot
+++ b/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2xcbase-dev.robot
@@ -39,6 +39,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${50}
 
 *** Keywords ***
@@ -60,7 +61,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | And Initialize layer ip4vxlan
 | | And Initialize L2 cross connect
 | | Then Send VXLAN encapsulated packet and verify received packet
diff --git a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lisp-ip4base-dev.robot b/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lisp-ip4base-dev.robot
index db5b3227d4..813b77a112 100644
--- a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lisp-ip4base-dev.robot
+++ b/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lisp-ip4base-dev.robot
@@ -45,6 +45,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 
 *** Keywords ***
@@ -65,7 +66,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Configure topology for IPv4 LISP testing
+| | When Initialize layer driver | ${nic_driver}
+| | And Configure topology for IPv4 LISP testing
 | | And Configure LISP in 2-node circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${NONE}
 | | ... | ${duts_locator_set} | ${dut1_ip4_eid}
diff --git a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4base-dev.robot b/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4base-dev.robot
index f4b2cb50c1..8d7126c680 100644
--- a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4base-dev.robot
+++ b/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4base-dev.robot
@@ -45,6 +45,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${is_gpe}= | ${1}
 
@@ -66,7 +67,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Configure topology for IPv4 LISP testing
+| | When Initialize layer driver | ${nic_driver}
+| | And Configure topology for IPv4 LISP testing
 | | And Configure LISP in 2-node circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${NONE}
 | | ... | ${duts_locator_set} | ${dut1_ip4_eid}
diff --git a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6base-dev.robot b/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6base-dev.robot
index 402bfbfee2..5beaa33e11 100644
--- a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6base-dev.robot
+++ b/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6base-dev.robot
@@ -45,6 +45,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${ot_mode}= | 6to4
 | ${is_gpe}= | ${1}
@@ -67,7 +68,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Configure topology for IPv6 LISPoIP4 testing
+| | When Initialize layer driver | ${nic_driver}
+| | And Configure topology for IPv6 LISPoIP4 testing
 | | And Vpp All RA Suppress Link Layer | ${nodes}
 | | And Configure LISP in 2-node circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${NONE}
diff --git a/tests/vpp/device/ip6/eth2p-ethicmpv6-ip6base-dev.robot b/tests/vpp/device/ip6/eth2p-ethicmpv6-ip6base-dev.robot
index 084335fc2e..051f206e5a 100644
--- a/tests/vpp/device/ip6/eth2p-ethicmpv6-ip6base-dev.robot
+++ b/tests/vpp/device/ip6/eth2p-ethicmpv6-ip6base-dev.robot
@@ -39,6 +39,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 
 *** Keywords ***
@@ -60,7 +61,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize IPv6 forwarding in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv6 forwarding in circular topology
 | | ... | remote_host1_ip=3ffe:5f::1 | remote_host2_ip=3ffe:5f::2
 | | Then Send IPv6 echo request packet and verify headers
 | | ... | ${tg} | ${tg_if1} | ${dut1} | ${dut1_if2}
diff --git a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copblklistbase-dev.robot b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copblklistbase-dev.robot
index 7a56c936ec..c9a3309eaa 100644
--- a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copblklistbase-dev.robot
+++ b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copblklistbase-dev.robot
@@ -39,6 +39,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 
 *** Keywords ***
@@ -60,7 +61,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize IPv6 forwarding in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv6 forwarding in circular topology
 | | And Add Fib Table | ${dut1} | 1 | ipv6=${True}
 | | And Vpp Route Add | ${dut1} | 2002:1::0 | 64 | vrf=1 | local=${True}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
diff --git a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copwhtlistbase-dev.robot b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copwhtlistbase-dev.robot
index 83c4363326..fa017059ef 100644
--- a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copwhtlistbase-dev.robot
+++ b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copwhtlistbase-dev.robot
@@ -39,6 +39,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 
 *** Keywords ***
@@ -60,7 +61,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize IPv6 forwarding in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv6 forwarding in circular topology
 | | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
 | | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
diff --git a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-iacldstbase-dev.robot b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-iacldstbase-dev.robot
index e75f3ed572..a214bc50b1 100644
--- a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-iacldstbase-dev.robot
+++ b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-iacldstbase-dev.robot
@@ -39,6 +39,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 
 *** Keywords ***
@@ -61,7 +62,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize IPv6 forwarding in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv6 forwarding in circular topology
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
 | | ... | ${dut1} | ip6 | dst | ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
 | | And Vpp Configures Classify Session L3
@@ -73,11 +75,6 @@
 | | ... | ${tg} | 2001:1::2 | 2001:2::2
 | | ... | ${tg_if1} | ${tg_if1_mac} | ${dut1_if1_mac}
 | | ... | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac}
-# TODO: Add check of number of hits of the classify session after traffic
-# Until there is implemented check of number of hits of the classify session
-# after passing the traffic log the show classify tables verbose to allow visual
-# check of hit number when needed.
-| | And Show Classify Tables Verbose | ${dut1}
 
 *** Test Cases ***
 | tc01-78B-ethip6-ip6base-iacldstbase-dev
diff --git a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-ipolicemarkbase-dev.robot b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-ipolicemarkbase-dev.robot
index 73abe62cb7..f87030f724 100644
--- a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-ipolicemarkbase-dev.robot
+++ b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-ipolicemarkbase-dev.robot
@@ -38,6 +38,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${cir}= | ${100}
 | ${eir}= | ${150}
@@ -64,16 +65,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize IPv6 forwarding in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv6 forwarding in circular topology
 | | And Initialize IPv6 policer 2r3c-'ca' in circular topology
 | | Then Send packet and verify marking
 | | ... | ${tg} | ${tg_if1} | ${tg_if2} | ${tg_if1_mac} | ${dut1_if1_mac}
 | | ... | 2001:1::2 | 2001:2::2
-# TODO: Add check of number of hits of the classify session after traffic
-# Until there is implemented check of number of hits of the classify session
-# after passing the traffic log the show classify tables verbose to allow visual
-# check of hit number when needed.
-| | And Show Classify Tables Verbose | ${dut1}
 
 *** Test Cases ***
 | tc01-78B-ethip6-ip6base-ipolicemarkbase-dev
diff --git a/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip4base-dev.robot b/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip4base-dev.robot
index 084f8c694a..1147a663d9 100644
--- a/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip4base-dev.robot
+++ b/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip4base-dev.robot
@@ -44,6 +44,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${ot_mode}= | 4to6
 | ${is_gpe}= | ${1}
@@ -66,7 +67,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Configure topology for IPv4 LISPoIP6 testing
+| | When Initialize layer driver | ${nic_driver}
+| | And Configure topology for IPv4 LISPoIP6 testing
 | | And Vpp All RA Suppress Link Layer | ${nodes}
 | | And Configure LISP in 2-node circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${NONE}
diff --git a/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6base-dev.robot b/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6base-dev.robot
index e2b74c2730..0ea8d6ed4a 100644
--- a/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6base-dev.robot
+++ b/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6base-dev.robot
@@ -45,6 +45,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${is_gpe}= | ${1}
 
@@ -66,7 +67,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Configure topology for IPv6 LISP testing
+| | When Initialize layer driver | ${nic_driver}
+| | And Configure topology for IPv6 LISP testing
 | | And Configure LISP in 2-node circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${NONE}
 | | ... | ${duts_locator_set} | ${dut1_ip6_eid}
diff --git a/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot b/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot
index dd2cb7c13d..52830e6d1b 100644
--- a/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot
+++ b/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot
@@ -49,6 +49,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so | gbp_plugin.so
 | ... | acl_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | avf
 | ${overhead}= | ${4}
 
 *** Keywords ***
@@ -72,7 +73,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize layer interface
 | | And Initialize layer dot1q
 | | And Initialize GBP routing domains
diff --git a/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot b/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot
index 9d79d80a0a..807933d4cc 100644
--- a/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot
+++ b/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot
@@ -40,6 +40,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | avf
 | ${overhead}= | ${4}
 
 *** Keywords ***
@@ -62,7 +63,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize layer interface
 | | And Initialize layer dot1q
 | | And Initialize L2 bridge domain
diff --git a/tests/vpp/device/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-dev.robot b/tests/vpp/device/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-dev.robot
index 3e71c71ed7..033f5c4192 100644
--- a/tests/vpp/device/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-dev.robot
+++ b/tests/vpp/device/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-dev.robot
@@ -40,6 +40,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 
 *** Keywords ***
@@ -62,7 +63,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | And Initialize L2 bridge domain
 | | Then Send ICMPv4 bidirectionally and verify received packets
 | | ... | ${tg} | ${tg_if1} | ${tg_if2}
diff --git a/tests/vpp/device/l2xc/eth2p-ethicmpv4-l2xcbase-dev.robot b/tests/vpp/device/l2xc/eth2p-ethicmpv4-l2xcbase-dev.robot
index a9a5a70bed..e12eb29dd0 100644
--- a/tests/vpp/device/l2xc/eth2p-ethicmpv4-l2xcbase-dev.robot
+++ b/tests/vpp/device/l2xc/eth2p-ethicmpv4-l2xcbase-dev.robot
@@ -40,6 +40,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 
 *** Keywords ***
@@ -62,7 +63,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize L2 xconnect in 2-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 xconnect in 2-node circular topology
 | | Then Send ICMPv4 bidirectionally and verify received packets
 | | ... | ${tg} | ${tg_if1} | ${tg_if2}
 
diff --git a/tests/vpp/device/vm_vhost/ip4/eth2p-ethicmpv4-ip4base-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/ip4/eth2p-ethicmpv4-ip4base-eth-2vhost-1vm-dev.robot
index 0e403e78af..eb86da9107 100644
--- a/tests/vpp/device/vm_vhost/ip4/eth2p-ethicmpv4-ip4base-eth-2vhost-1vm-dev.robot
+++ b/tests/vpp/device/vm_vhost/ip4/eth2p-ethicmpv4-ip4base-eth-2vhost-1vm-dev.robot
@@ -41,6 +41,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${nf_chains}= | ${1}
 | ${nf_nodes}= | ${1}
 | ${nf_dtc} | ${1}
@@ -68,7 +69,8 @@
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize IPv4 forwarding with vhost in 2-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 forwarding with vhost in 2-node circular topology
 | | ... | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/device/vm_vhost/ip6/eth2p-ethicmpv6-ip6base-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/ip6/eth2p-ethicmpv6-ip6base-eth-2vhost-1vm-dev.robot
index c0a4b30e8b..28dcc07d91 100644
--- a/tests/vpp/device/vm_vhost/ip6/eth2p-ethicmpv6-ip6base-eth-2vhost-1vm-dev.robot
+++ b/tests/vpp/device/vm_vhost/ip6/eth2p-ethicmpv6-ip6base-eth-2vhost-1vm-dev.robot
@@ -41,6 +41,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${nf_chains}= | ${1}
 | ${nf_nodes}= | ${1}
 | ${nf_dtc} | ${1}
@@ -68,7 +69,8 @@
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize IPv6 forwarding with vhost in 2-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv6 forwarding with vhost in 2-node circular topology
 | | ... | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | vnf=vpp_chain_ip6
diff --git a/tests/vpp/device/vm_vhost/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot
index 2c95459905..0070d39ef6 100644
--- a/tests/vpp/device/vm_vhost/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot
+++ b/tests/vpp/device/vm_vhost/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot
@@ -43,6 +43,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${nf_chains}= | ${1}
 | ${nf_nodes}= | ${1}
 | ${nf_dtc} | ${1}
@@ -70,7 +71,8 @@
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains with Vhost-User | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
diff --git a/tests/vpp/device/vm_vhost/l2xc/eth2p-ethicmpv4-l2xcbase-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/l2xc/eth2p-ethicmpv4-l2xcbase-eth-2vhost-1vm-dev.robot
index d88d9a58f2..b50256791c 100644
--- a/tests/vpp/device/vm_vhost/l2xc/eth2p-ethicmpv4-l2xcbase-eth-2vhost-1vm-dev.robot
+++ b/tests/vpp/device/vm_vhost/l2xc/eth2p-ethicmpv4-l2xcbase-eth-2vhost-1vm-dev.robot
@@ -42,6 +42,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
 | ${nf_chains}= | ${1}
 | ${nf_nodes}= | ${1}
 | ${nf_dtc} | ${1}
@@ -69,7 +70,8 @@
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize L2 xconnect with Vhost-User | nf_nodes=${nf_nodes}
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 xconnect with Vhost-User | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | vnf=vpp_chain_l2xc
 | | ... | pinning=${False}
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
index 6e58345c82..d13d3bc2d0 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
@@ -53,6 +53,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${osi_layer}= | L2
 | ${overhead}= | ${4}
 | ${subid}= | 10
@@ -86,7 +87,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Start containers for test
+| | When Initialize layer driver | ${nic_driver}
+| | And Start containers for test
 | | And Initialize L2 Bridge Domain with memif pairs and VLAN in circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
 | | Then Find NDR and PDR intervals using optimized search
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot
index e1a223b796..fa9080567b 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot
@@ -49,6 +49,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${osi_layer}= | L2
 | ${overhead}= | ${0}
 # Traffic profile:
@@ -78,7 +79,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | And Start containers for test
 | | And Initialize L2 Bridge Domain with memif pairs
 | | Then Find NDR and PDR intervals using optimized search
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
index f672672ef7..9424efdad3 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
@@ -49,6 +49,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${osi_layer}= | L2
 | ${overhead}= | ${0}
 # Traffic profile:
@@ -78,7 +79,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Start containers for test
+| | When Initialize layer driver | ${nic_driver}
+| | And Start containers for test
 | | And Initialize L2 xconnect with memif pairs
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot
index 7a0ede8a76..47cebd686a 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot
@@ -48,6 +48,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${osi_layer}= | L2
 | ${overhead}= | ${0}
 # Traffic profile:
@@ -77,7 +78,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Start containers for test
+| | When Initialize layer driver | ${nic_driver}
+| | And Start containers for test
 | | And Initialize L2 xconnect with memif pairs
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
index c5a9004a75..0559353732 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
@@ -49,6 +49,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${osi_layer}= | L3
 | ${overhead}= | ${0}
 # Traffic profile:
@@ -78,7 +79,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Start containers for test
+| | When Initialize layer driver | ${nic_driver}
+| | And Start containers for test
 | | And Initialize IPv4 routing with memif pairs
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
index 0fba346c1c..b63b82ef48 100644
--- a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
@@ -53,6 +53,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${osi_layer}= | L2
 | ${overhead}= | ${4}
 | ${subid}= | 10
@@ -86,7 +87,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Start containers for test
+| | When Initialize layer driver | ${nic_driver}
+| | And Start containers for test
 | | And Initialize L2 Bridge Domain with memif pairs and VLAN in circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
 | | Then Find NDR and PDR intervals using optimized search
diff --git a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
index 1679892548..7a0b8cdfe7 100644
--- a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
@@ -49,6 +49,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${osi_layer}= | L2
 | ${overhead}= | ${0}
 # Traffic profile:
@@ -78,7 +79,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | And Start containers for test
 | | And Initialize L2 Bridge Domain with memif pairs
 | | Then Find NDR and PDR intervals using optimized search
diff --git a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
index af51cfd0c3..314a9b7d4c 100644
--- a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
@@ -49,6 +49,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${osi_layer}= | L2
 | ${overhead}= | ${0}
 # Traffic profile:
@@ -78,7 +79,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Start containers for test
+| | When Initialize layer driver | ${nic_driver}
+| | And Start containers for test
 | | And Initialize L2 xconnect with memif pairs
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
index e9491698cf..1a37872af0 100644
--- a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
@@ -49,6 +49,7 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${osi_layer}= | L3
 | ${overhead}= | ${0}
 # Traffic profile:
@@ -78,7 +79,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Start containers for test
+| | When Initialize layer driver | ${nic_driver}
+| | And Start containers for test
 | | And Initialize IPv4 routing with memif pairs
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index c353d99f1e..2910877115 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -94,7 +95,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index ebb683d184..a343996a36 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -94,7 +95,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 61d85b05ff..a9a61c7305 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -94,7 +95,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 2ea0b2864c..95de63cac8 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -94,7 +95,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 943a3d31e2..295f5198cf 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -56,6 +56,7 @@
 | ${osi_layer}= | L3
 | ${crypto_type}= | HW_DH895xcc
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -96,7 +97,8 @@
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Add cryptodev to all DUTs | ${phy_cores}
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 04adab3bce..981ce29ab0 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -56,6 +56,7 @@
 | ${osi_layer}= | L3
 | ${crypto_type}= | HW_DH895xcc
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -96,7 +97,8 @@
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Add cryptodev to all DUTs | ${phy_cores}
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
index 18d74430cc..646ede08b8 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -56,6 +56,7 @@
 | ${osi_layer}= | L3
 | ${crypto_type}= | HW_DH895xcc
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -99,7 +100,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And VPP IPsec Select Backend | ${dut1} | ${ipsec_proto} | index=${1}
 | | And VPP IPsec Select Backend | ${dut2} | ${ipsec_proto} | index=${1}
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
index 619d10d1e6..f647ab53f0 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -56,6 +56,7 @@
 | ${osi_layer}= | L3
 | ${crypto_type}= | HW_DH895xcc
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -99,7 +100,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And VPP IPsec Select Backend | ${dut1} | ${ipsec_proto} | index=${1}
 | | And VPP IPsec Select Backend | ${dut2} | ${ipsec_proto} | index=${1}
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
index 74fb106743..8bdd5f6078 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
@@ -56,6 +56,7 @@
 | ${osi_layer}= | L3
 | ${crypto_type}= | HW_DH895xcc
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -97,7 +98,8 @@
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Add cryptodev to all DUTs | ${phy_cores}
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Add Multiple Tunnels
 | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels}
 | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
index 9788b33f4e..63bb8fc81f 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
@@ -56,6 +56,7 @@
 | ${osi_layer}= | L3
 | ${crypto_type}= | HW_DH895xcc
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -97,7 +98,8 @@
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Add cryptodev to all DUTs | ${phy_cores}
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Add Multiple Tunnels
 | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels}
 | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
index 3e2a89ae70..82f4aa1a29 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
@@ -56,6 +56,7 @@
 | ${osi_layer}= | L3
 | ${crypto_type}= | HW_DH895xcc
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -99,7 +100,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And VPP IPsec Select Backend | ${dut1} | ${ipsec_proto} | index=${1}
 | | And VPP IPsec Select Backend | ${dut2} | ${ipsec_proto} | index=${1}
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Add Multiple Tunnels
 | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels}
 | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
index 2473918a10..fef0397e99 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -56,6 +56,7 @@
 | ${osi_layer}= | L3
 | ${crypto_type}= | HW_DH895xcc
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -99,7 +100,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And VPP IPsec Select Backend | ${dut1} | ${ipsec_proto} | index=${1}
 | | And VPP IPsec Select Backend | ${dut2} | ${ipsec_proto} | index=${1}
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Add Multiple Tunnels
 | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels}
 | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 57ab67d53b..c8c8e274e8 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -94,7 +95,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index d25c299186..0af89bdb12 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -94,7 +95,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index b1c01b2438..d0acae2143 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -95,7 +96,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index a2aafe1350..c14ea1f309 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -95,7 +96,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
index b863faeee1..c520654026 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -97,7 +98,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Add Multiple Tunnels
 | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels}
 | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
index 361c89bbb3..9d4513e520 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -97,7 +98,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Add Multiple Tunnels
 | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels}
 | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
index 6d692d25b4..e719bd3d76 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -98,7 +99,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Add Multiple Tunnels
 | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels}
 | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
index fe849739ba..6db79ee9ad 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -98,7 +99,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Add Multiple Tunnels
 | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels}
 | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index e97e756a86..1152e32ef9 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -56,6 +56,7 @@
 | ${osi_layer}= | L3
 | ${crypto_type}= | HW_DH895xcc
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -96,7 +97,8 @@
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Add cryptodev to all DUTs | ${phy_cores}
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 24a3b601a5..ae770c1665 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -56,6 +56,7 @@
 | ${osi_layer}= | L3
 | ${crypto_type}= | HW_DH895xcc
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -96,7 +97,8 @@
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Add cryptodev to all DUTs | ${phy_cores}
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
index 77b956d919..06687e0f9e 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -56,6 +56,7 @@
 | ${osi_layer}= | L3
 | ${crypto_type}= | HW_DH895xcc
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -99,7 +100,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And VPP IPsec Select Backend | ${dut1} | ${ipsec_proto} | index=${1}
 | | And VPP IPsec Select Backend | ${dut2} | ${ipsec_proto} | index=${1}
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
index d73e8278d1..39a90d73bc 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -56,6 +56,7 @@
 | ${osi_layer}= | L3
 | ${crypto_type}= | HW_DH895xcc
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -99,7 +100,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And VPP IPsec Select Backend | ${dut1} | ${ipsec_proto} | index=${1}
 | | And VPP IPsec Select Backend | ${dut2} | ${ipsec_proto} | index=${1}
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
index 9fa5e73b8d..410d0f2249 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ${osi_layer}= | L3
 | ${crypto_type}= | HW_DH895xcc
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -96,7 +97,8 @@
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Add cryptodev to all DUTs | ${phy_cores}
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Add Multiple Tunnels
 | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels}
 | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
index 817f26b004..503b034ab9 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ${osi_layer}= | L3
 | ${crypto_type}= | HW_DH895xcc
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -96,7 +97,8 @@
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Add cryptodev to all DUTs | ${phy_cores}
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Add Multiple Tunnels
 | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels}
 | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
index 8778e24bed..066a7704dc 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
@@ -56,6 +56,7 @@
 | ${osi_layer}= | L3
 | ${crypto_type}= | HW_DH895xcc
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -99,7 +100,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And VPP IPsec Select Backend | ${dut1} | ${ipsec_proto} | index=${1}
 | | And VPP IPsec Select Backend | ${dut2} | ${ipsec_proto} | index=${1}
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Add Multiple Tunnels
 | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels}
 | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
index bffb15e21a..54e00e2c1b 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -56,6 +56,7 @@
 | ${osi_layer}= | L3
 | ${crypto_type}= | HW_DH895xcc
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -99,7 +100,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And VPP IPsec Select Backend | ${dut1} | ${ipsec_proto} | index=${1}
 | | And VPP IPsec Select Backend | ${dut2} | ${ipsec_proto} | index=${1}
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Add Multiple Tunnels
 | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels}
 | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 57de2c073b..048cd74f24 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -94,7 +95,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index f3382ca934..9914769388 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -94,7 +95,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 4c48c9d4ca..4b9b27b231 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -95,7 +96,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 242fedac14..9c52849a07 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -95,7 +96,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
index b58df01a4e..c93a8046a1 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -97,7 +98,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Add Multiple Tunnels
 | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels}
 | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
index 54b1bc282a..8d1e1e5d99 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -97,7 +98,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Add Multiple Tunnels
 | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels}
 | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
index f0d594a659..c45341d763 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -98,7 +99,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Add Multiple Tunnels
 | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels}
 | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
index 45cafbefb1..551c3f3779 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -98,7 +99,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Add Multiple Tunnels
 | | ... | ${nodes} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels}
 | | ... | ${encr_alg} | ${auth_alg} | ${dut1_if2_ip4} | ${dut2_if1_ip4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 2b09cb4450..1c7d4c3f83 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -94,6 +95,7 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 105373eac8..384b4f0d47 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -94,6 +95,7 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index c95af99799..4d2b85024e 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -94,6 +95,7 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 6b8ff3cfd5..e0fbb0f88d 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -94,6 +95,7 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 4348ee1da9..e8ee80eff5 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -94,6 +95,7 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index b907e88c4b..f4870617cf 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -94,6 +95,7 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index eb753ab622..f09cf6bcdf 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -95,6 +96,7 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index c017e110fb..3942e78dde 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -95,6 +96,7 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 851d1edf2a..00cf2b087d 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -94,7 +95,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index c1dbcd01c8..07e99fb089 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -94,7 +95,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index e700289f95..910e721168 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -95,7 +96,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index ab913eb676..363ac74656 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -95,7 +96,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 62289cfcce..65c94dfe9f 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -94,7 +95,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 05ed153786..1d25f2298e 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -94,7 +95,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index c3711873a3..2e54a8c41b 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -95,7 +96,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index d6c2e5d623..95e03b26af 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -95,7 +96,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index b6b2db8060..4916d495c3 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -94,7 +95,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index e3ff4b5f87..a9c46a0f7e 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -94,7 +95,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 9790d47a9c..6737de460a 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -95,7 +96,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index b7e4d79900..344c05e76d 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -95,7 +96,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index ed45a9e789..f64cf84caf 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -94,7 +95,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 07015f43e9..4b3880b077 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -94,7 +95,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index e8f5284c29..4b597ba011 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -94,7 +95,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 2880bf1ff4..0cc1f17085 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -94,7 +95,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPSec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
 | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 1e8a884eb8..f29e52e4ad 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -94,6 +95,7 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 65df2f8d60..7b9bd0847c 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -94,6 +95,7 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 2c26196910..d1e58f13f0 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -95,6 +96,7 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 0c1abb6aa8..bb7dd4d765 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -55,6 +55,7 @@
 | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${tg_if1_ip4}= | 192.168.10.2
 | ${dut1_if1_ip4}= | 192.168.10.1
@@ -95,6 +96,7 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPSec in 3-node circular topology
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr.robot
index d4a7675eda..e7c31254cc 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr.robot
@@ -60,6 +60,7 @@
 | ${osi_layer}= | L3
 | ${crypto_type}= | HW_DH895xcc
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${58}
 | ${dut2_spi}= | ${1000}
 | ${dut1_spi}= | ${1001}
@@ -98,10 +99,10 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Add cryptodev to all DUTs | ${phy_cores}
-| | And Configure topology for IPv4 IPsec testing
 | | And Apply startup configuration on all VPP DUTs
-| | When Generate keys for IPSec | ${encr_alg} | ${auth_alg}
-| | When Initialize LISP GPE IPv4 over IPsec in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg}
+| | And Initialize LISP GPE IPv4 over IPsec in 3-node circular topology
 | | ... | ${encr_alg} | ${auth_alg}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-avf-dot1q-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-avf-dot1q-ip4base-ndrpdr.robot
index d301e48fac..ea891fd960 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-avf-dot1q-ip4base-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-avf-dot1q-ip4base-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${4}
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
@@ -81,7 +82,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPv4 forwarding with VLAN dot1q sub-interfaces in circular topology
 | | ... | ${tg_if1_net} | ${tg_if2_net} | ${subid} | ${tag_rewrite}
 | | Then Find NDR and PDR intervals using optimized search
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-avf-eth-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-avf-eth-ip4base-ndrpdr.robot
index bd92299d81..6d239ef7ae 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-avf-eth-ip4base-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-avf-eth-ip4base-ndrpdr.robot
@@ -48,6 +48,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src253
@@ -73,7 +74,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPv4 forwarding in circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-avf-ethip4-ip4scale200k-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-avf-ethip4-ip4scale200k-ndrpdr.robot
index ae3297f241..3e16fdc1d9 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-avf-ethip4-ip4scale200k-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-avf-ethip4-ip4scale200k-ndrpdr.robot
@@ -48,6 +48,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${100000}
 # Traffic profile:
@@ -75,7 +76,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPv4 forwarding with scaling in circular topology
 | | ... | ${rts_per_flow}
 | | Then Find NDR and PDR intervals using optimized search
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-avf-ethip4-ip4scale20k-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-avf-ethip4-ip4scale20k-ndrpdr.robot
index c0cfe85513..95d63d49ab 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-avf-ethip4-ip4scale20k-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-avf-ethip4-ip4scale20k-ndrpdr.robot
@@ -48,6 +48,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${10000}
 # Traffic profile:
@@ -75,7 +76,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPv4 forwarding with scaling in circular topology
 | | ... | ${rts_per_flow}
 | | Then Find NDR and PDR intervals using optimized search
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr.robot
index 8264fdd986..3813edc59c 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr.robot
@@ -48,6 +48,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${1000000}
 # Traffic profile:
@@ -75,7 +76,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPv4 forwarding with scaling in circular topology
 | | ... | ${rts_per_flow}
 | | Then Find NDR and PDR intervals using optimized search
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-dot1q-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-dot1q-ip4base-ndrpdr.robot
index dfb3bef6f9..95a3a24cb8 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-dot1q-ip4base-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-dot1q-ip4base-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${4}
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding with VLAN dot1q sub-interfaces in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 forwarding with VLAN dot1q sub-interfaces in circular topology
 | | ... | ${tg_if1_net} | ${tg_if2_net} | ${subid} | ${tag_rewrite}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot
index 43b1bbaa80..ac8c58338d 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot
@@ -49,6 +49,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src253
@@ -74,7 +75,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 forwarding in circular topology
 | | And Add Fib Table | ${dut1} | 1
 | | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
 | | And Add Fib Table | ${dut2} | 1
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot
index 27e6a9c55d..90ffb67b10 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot
@@ -49,6 +49,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src253
@@ -74,7 +75,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 forwarding in circular topology
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
 | | ... | ${dut1} | ip4 | dst | 255.255.255.0
 | | And Vpp Configures Classify Session L3
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot
index f5fbaa0a3a..58f8aa5dff 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${cir}= | ${100}
 | ${eir}= | ${150}
@@ -80,7 +81,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 forwarding in circular topology
 | | And Initialize IPv4 policer 2r3c-'ca' in circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ndrpdr.robot
index bbf14ee3b7..408ab742cc 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ndrpdr.robot
@@ -48,6 +48,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src253
@@ -74,7 +75,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 forwarding in circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot
index 30f893b106..6c465caca9 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot
@@ -48,6 +48,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${100000}
 # Traffic profile:
@@ -75,7 +76,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding with scaling in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 forwarding with scaling in circular topology
 | | ... | ${rts_per_flow}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot
index bcdd223d11..3d485d82f7 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot
@@ -48,6 +48,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${10000}
 # Traffic profile:
@@ -75,7 +76,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding with scaling in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 forwarding with scaling in circular topology
 | | ... | ${rts_per_flow}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot
index 34c8990ca8..9fb8fe258d 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot
@@ -48,6 +48,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${1000000}
 # Traffic profile:
@@ -75,7 +76,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding with scaling in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 forwarding with scaling in circular topology
 | | ... | ${rts_per_flow}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr.robot
index 5cad96d23f..499478c43b 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr.robot
index 32035bbd81..624bd3aa7b 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr.robot
index 2bde18d0c0..ffd5768b29 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot
index b49e2514a6..9a17f8c974 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr.robot
index f926cccb5a..cbc8432827 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr.robot
index 538bfd5d73..a3e467e04d 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr.robot
index 6ba034023d..e444f0f083 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr.robot
index a5dd0bf39b..1e14af8b3f 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot
index e5dfd3de66..66997c1fdc 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -91,7 +92,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr.robot
index a107e2c47d..7d25ff770c 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr.robot
index e4b23b661f..3d86088c2f 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${ip_nr}= | ${100}
 # ACL test setup
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot
index da1be6b577..34b5498042 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -91,7 +92,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr.robot
index 9e2187275b..7323167e85 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr.robot
index 2c366ab1a8..11da0998d2 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
index ec8e777fae..c22eb73392 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -91,7 +92,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr.robot
index ccd3e54217..5a82ff00ed 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr.robot
index d67ed1897d..9058996bee 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
index 995ee90d08..eec8247e29 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -91,7 +92,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot
index 6385bcd08d..4ce93086ca 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | nat_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4udp-1u1p
@@ -77,7 +78,8 @@
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize NAT44 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize NAT44 in circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr.robot
index eafa9f4549..8284b6cfdf 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr.robot
index 215ad7f777..75e6f8545d 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr.robot
index cfc0208bcc..f9deb9f49c 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr.robot
index 151c096281..188e99756c 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr.robot
index b189f1bc22..46d3d8183a 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr.robot
index de6e4ebbbd..4a901bdab1 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr.robot
index e97984131a..475418138c 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr.robot
index 95fe9ce1b0..a345e3140f 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr.robot
index b8fee10f46..182bbd38e4 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr.robot
index e3b992bebf..60391be0fa 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr.robot
index 9b85b777b1..864333647b 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr.robot
index ad0fd9267c..b06819df0f 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr.robot
index ccfc6a9ca2..976726527d 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr.robot
index 32d71f451a..1702f1f047 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot
index 096c62fa1a..d606479e11 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr.robot
index 08e2c998ef..37a30775b8 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr.robot
index 067d5848ff..2a899b7a78 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot
index cd40822029..eaa84a374f 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr.robot
index 286fe22a21..e3e267f13e 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | nat_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4udp-1u15p
@@ -77,7 +78,8 @@
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize NAT44 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize NAT44 in circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr.robot
index 191cb78057..c1c081e0ff 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | nat_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4udp-10u15p
@@ -78,7 +79,8 @@
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize NAT44 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize NAT44 in circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr.robot
index ee1a9d94e4..e74d204c2b 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | nat_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4udp-100u15p
@@ -78,7 +79,8 @@
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize NAT44 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize NAT44 in circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot
index 16165ff33a..85c68c5998 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | nat_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4udp-1000u15p
@@ -78,7 +79,8 @@
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize NAT44 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize NAT44 in circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr.robot
index 2b99cf1dd3..d9ef112ff7 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | nat_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4udp-2000u15p
@@ -78,7 +79,8 @@
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize NAT44 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize NAT44 in circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr.robot
index 72302bf082..78d2aab602 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | nat_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4udp-4000u15p
@@ -78,7 +79,8 @@
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize NAT44 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize NAT44 in circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-dot1q-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-dot1q-ip4base-ndrpdr.robot
index b962529184..d5ac16656e 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-dot1q-ip4base-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-dot1q-ip4base-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${4}
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
@@ -81,7 +82,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPv4 forwarding with VLAN dot1q sub-interfaces in circular topology
 | | ... | ${tg_if1_net} | ${tg_if2_net} | ${subid} | ${tag_rewrite}
 | | Then Find NDR and PDR intervals using optimized search
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4base-ndrpdr.robot
index cc3a5f74b4..9b149c8512 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4base-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4base-ndrpdr.robot
@@ -48,6 +48,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4-ip4src253
@@ -73,7 +74,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPv4 forwarding in circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4scale200k-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4scale200k-ndrpdr.robot
index bbdcf11453..69df2c4fd2 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4scale200k-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4scale200k-ndrpdr.robot
@@ -48,6 +48,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${100000}
 # Traffic profile:
@@ -75,7 +76,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPv4 forwarding with scaling in circular topology
 | | ... | ${rts_per_flow}
 | | Then Find NDR and PDR intervals using optimized search
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4scale20k-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4scale20k-ndrpdr.robot
index 47ce853c29..4db460a8d3 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4scale20k-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4scale20k-ndrpdr.robot
@@ -48,6 +48,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${10000}
 # Traffic profile:
@@ -75,7 +76,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPv4 forwarding with scaling in circular topology
 | | ... | ${rts_per_flow}
 | | Then Find NDR and PDR intervals using optimized search
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr.robot
index 6d4f7d1773..03fa8384ad 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr.robot
@@ -48,6 +48,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${1000000}
 # Traffic profile:
@@ -75,7 +76,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPv4 forwarding with scaling in circular topology
 | | ... | ${rts_per_flow}
 | | Then Find NDR and PDR intervals using optimized search
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr.robot
index 77cd70a812..d6f7c25c1c 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${4}
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
@@ -80,7 +81,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding with VLAN dot1q sub-interfaces in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 forwarding with VLAN dot1q sub-interfaces in circular topology
 | | ... | ${tg_if1_net} | ${tg_if2_net} | ${subid} | ${tag_rewrite}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot
index 7f6330743a..7a168aaf83 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot
@@ -49,6 +49,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4-ip4src253
@@ -74,7 +75,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 forwarding in circular topology
 | | And Add Fib Table | ${dut1} | 1
 | | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot
index b1ce401f2a..6553888b22 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot
@@ -49,6 +49,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4-ip4src253
@@ -74,7 +75,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 forwarding in circular topology
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
 | | ... | ${dut1} | ip4 | dst | 255.255.255.0
 | | And Vpp Configures Classify Session L3
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot
index de42e17918..d7ed461d74 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot
@@ -48,6 +48,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${cir}= | ${100}
 | ${eir}= | ${150}
@@ -78,7 +79,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 forwarding in circular topology
 | | And Initialize IPv4 policer 2r3c-'ca' in circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot
index 24d857d49d..0b44a6249e 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot
@@ -48,6 +48,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4-ip4src253
@@ -73,7 +74,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 forwarding in circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot
index 742cff1b65..2b78f27af0 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot
@@ -47,6 +47,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${100000}
 # Traffic profile:
@@ -74,7 +75,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding with scaling in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 forwarding with scaling in circular topology
 | | ... | ${rts_per_flow}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot
index 854764f6f6..28eafa7a09 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot
@@ -47,6 +47,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${10000}
 # Traffic profile:
@@ -74,7 +75,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding with scaling in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 forwarding with scaling in circular topology
 | | ... | ${rts_per_flow}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot
index c30789bb4a..8a25d47202 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot
@@ -47,6 +47,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${1000000}
 # Traffic profile:
@@ -74,7 +75,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding with scaling in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 forwarding with scaling in circular topology
 | | ... | ${rts_per_flow}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot
index ff924694e5..a6fb17a459 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot
@@ -49,6 +49,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot
index c41f0b95d9..07f89c7b05 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot
@@ -49,6 +49,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
index 1041662741..203193e32e 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
@@ -49,6 +49,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
index b30a65efe4..5a224d7351 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
@@ -49,6 +49,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot
index 59de2237a0..90262b5e1e 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | nat_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4udp-1u1p
@@ -77,7 +78,8 @@
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize NAT44 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize NAT44 in circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot
index 1b4f9f90fe..702227be3e 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot
@@ -49,6 +49,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot
index 6aebe2decc..dd03c224b5 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot
@@ -49,6 +49,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv4 routing with IPv4 ACLs on DUT1 in circular topology
 | | ... | ${ip_nr}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot
index ac91f41193..4ec4b440af 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${50}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-dot1qip4-vlan100ip4src254ip4dst254
@@ -79,7 +80,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with VLAN and VXLANoIPv4 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with VLAN and VXLANoIPv4 in 3-node circular topology
 | | ... | vxlan_count=${vxlan_count}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot
index d70428b488..38d7a0cb8d 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${50}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-dot1qip4-vlan10ip4src254ip4dst254
@@ -79,7 +80,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with VLAN and VXLANoIPv4 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with VLAN and VXLANoIPv4 in 3-node circular topology
 | | ... | vxlan_count=${vxlan_count}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot
index d195ccd566..25822c3663 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${50}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-dot1qip4-vlan1kip4src254ip4dst254
@@ -79,7 +80,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with VLAN and VXLANoIPv4 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with VLAN and VXLANoIPv4 in 3-node circular topology
 | | ... | vxlan_count=${vxlan_count}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot
index a52533df6f..65c62dc238 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${50}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-dot1qip4-vlan1ip4src254ip4dst254
@@ -79,7 +80,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with VLAN and VXLANoIPv4 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with VLAN and VXLANoIPv4 in 3-node circular topology
 | | ... | vxlan_count=${vxlan_count}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot
index 4fd4e9aea0..5b730d3943 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${8}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src253
@@ -77,7 +78,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize LISP IPv4 forwarding in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize LISP IPv4 forwarding in 3-node circular topology
 | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
 | | ... | ${dut2_to_tg_ip4} | ${prefix4}
 | | And Configure LISP topology in 3-node circular topology
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot
index ba56397992..725ea9df71 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${48}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src253
@@ -77,7 +78,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology
 | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
 | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
 | | And Configure LISP topology in 3-node circular topology
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot
index 0b3d0a7544..0e27771ded 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot
@@ -49,6 +49,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${50}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
@@ -74,7 +75,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-ndrpdr.robot
index 4e90a376ff..3510e99127 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-ndrpdr.robot
@@ -49,6 +49,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${50}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
@@ -74,7 +75,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip6/10ge2p1x710-avf-dot1q-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-avf-dot1q-ip6base-ndrpdr.robot
index e0aac6c7f7..7dd7d28014 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-avf-dot1q-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-avf-dot1q-ip6base-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${4}
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
@@ -81,7 +82,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPv6 forwarding with VLAN dot1q sub-interfaces in circular topology
 | | ... | ${tg_if1_net} | ${tg_if2_net} | ${subid} | ${tag_rewrite}
 | | Then Find NDR and PDR intervals using optimized search
diff --git a/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6base-ndrpdr.robot
index 2d89cbe5f7..76222b6265 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6base-ndrpdr.robot
@@ -48,6 +48,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
@@ -73,7 +74,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPv6 forwarding in circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6scale200k-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6scale200k-ndrpdr.robot
index a6740d55f9..e1ca2c7efa 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6scale200k-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6scale200k-ndrpdr.robot
@@ -49,6 +49,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${100000}
 # Traffic profile:
@@ -75,7 +76,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPv6 forwarding with scaling in circular topology
 | | ... | ${rts_per_flow}
 | | Then Find NDR and PDR intervals using optimized search
diff --git a/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6scale20k-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6scale20k-ndrpdr.robot
index 17080b89ae..ae1a0f2343 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6scale20k-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6scale20k-ndrpdr.robot
@@ -49,6 +49,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${10000}
 # Traffic profile:
@@ -75,7 +76,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPv6 forwarding with scaling in circular topology
 | | ... | ${rts_per_flow}
 | | Then Find NDR and PDR intervals using optimized search
diff --git a/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6scale2m-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6scale2m-ndrpdr.robot
index 89403e7d85..194870335f 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6scale2m-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6scale2m-ndrpdr.robot
@@ -49,6 +49,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${1000000}
 # Traffic profile:
@@ -75,7 +76,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPv6 forwarding with scaling in circular topology
 | | ... | ${rts_per_flow}
 | | Then Find NDR and PDR intervals using optimized search
diff --git a/tests/vpp/perf/ip6/10ge2p1x710-dot1q-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-dot1q-ip6base-ndrpdr.robot
index 9a00716688..5051df558d 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-dot1q-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-dot1q-ip6base-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${4}
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv6 forwarding with VLAN dot1q sub-interfaces in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv6 forwarding with VLAN dot1q sub-interfaces in circular topology
 | | ... | ${tg_if1_net} | ${tg_if2_net} | ${subid} | ${tag_rewrite}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot
index b1d38f1345..9c5992b60a 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
@@ -76,7 +77,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv6 forwarding in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv6 forwarding in circular topology
 | | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
 | | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
 | | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
diff --git a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot
index 0a6239e799..40f41505de 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot
@@ -49,6 +49,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
@@ -74,7 +75,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv6 forwarding in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv6 forwarding in circular topology
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
 | | ... | ${dut1} | ip6 | dst | ffff:ffff:ffff:ffff:ffff:ffff:ffff:0
 | | And Vpp Configures Classify Session L3
diff --git a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-ndrpdr.robot
index d0b266e252..6af0d03179 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-ndrpdr.robot
@@ -48,6 +48,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
@@ -73,6 +74,7 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPv6 forwarding in circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot
index 87187f04c7..d1d9fa14d9 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot
@@ -49,6 +49,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${100000}
 # Traffic profile:
@@ -75,7 +76,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv6 forwarding with scaling in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv6 forwarding with scaling in circular topology
 | | ... | ${rts_per_flow}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot
index 51dbcba498..4fd6303dac 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot
@@ -49,6 +49,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${10000}
 # Traffic profile:
@@ -75,7 +76,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv6 forwarding with scaling in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv6 forwarding with scaling in circular topology
 | | ... | ${rts_per_flow}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot
index a9311a0ba3..399f0c9f03 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot
@@ -49,6 +49,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${1000000}
 # Traffic profile:
@@ -75,7 +76,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv6 forwarding with scaling in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv6 forwarding with scaling in circular topology
 | | ... | ${rts_per_flow}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-dot1q-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-dot1q-ip6base-ndrpdr.robot
index de25b4d7a4..da2a09a5bf 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-dot1q-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-dot1q-ip6base-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${4}
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
@@ -81,7 +82,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPv6 forwarding with VLAN dot1q sub-interfaces in circular topology
 | | ... | ${tg_if1_net} | ${tg_if2_net} | ${subid} | ${tag_rewrite}
 | | Then Find NDR and PDR intervals using optimized search
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6base-ndrpdr.robot
index f58161ff6b..a12066d1e0 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6base-ndrpdr.robot
@@ -48,6 +48,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip6-ip6src253
@@ -73,7 +74,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPv6 forwarding in circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6scale200k-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6scale200k-ndrpdr.robot
index 825271eb57..8739e3450d 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6scale200k-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6scale200k-ndrpdr.robot
@@ -49,6 +49,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${100000}
 # Traffic profile:
@@ -75,7 +76,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPv6 forwarding with scaling in circular topology
 | | ... | ${rts_per_flow}
 | | Then Find NDR and PDR intervals using optimized search
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6scale20k-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6scale20k-ndrpdr.robot
index 2714557750..d6ea0e7786 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6scale20k-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6scale20k-ndrpdr.robot
@@ -49,6 +49,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${10000}
 # Traffic profile:
@@ -75,7 +76,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPv6 forwarding with scaling in circular topology
 | | ... | ${rts_per_flow}
 | | Then Find NDR and PDR intervals using optimized search
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6scale2m-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6scale2m-ndrpdr.robot
index ed6c7c9572..5e63ee310f 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6scale2m-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6scale2m-ndrpdr.robot
@@ -49,6 +49,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${1000000}
 # Traffic profile:
@@ -75,7 +76,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPv6 forwarding with scaling in circular topology
 | | ... | ${rts_per_flow}
 | | Then Find NDR and PDR intervals using optimized search
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-dot1q-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-dot1q-ip6base-ndrpdr.robot
index 82954843e2..37c67f15c6 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-dot1q-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-dot1q-ip6base-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${4}
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
@@ -79,6 +80,7 @@
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
+| | When Initialize layer driver | ${nic_driver}
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding with VLAN dot1q sub-interfaces in circular topology
 | | ... | ${tg_if1_net} | ${tg_if2_net} | ${subid} | ${tag_rewrite}
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot
index 818d435545..e3190e6785 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip6-ip6src253
@@ -76,7 +77,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv6 forwarding in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv6 forwarding in circular topology
 | | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
 | | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot
index 8d9335e747..26e21c598d 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot
@@ -49,6 +49,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip6-ip6src253
@@ -74,7 +75,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv6 forwarding in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv6 forwarding in circular topology
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
 | | ... | ${dut1} | ip6 | dst | ffff:ffff:ffff:ffff:ffff:ffff:ffff:0
 | | And Vpp Configures Classify Session L3
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr.robot
index 0670a3ccb3..65ac618511 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr.robot
@@ -47,6 +47,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip6-ip6src253
@@ -72,6 +73,7 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize IPv6 forwarding in circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot
index aabcae6b12..ea574cb8ae 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot
@@ -48,6 +48,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${100000}
 # Traffic profile:
@@ -74,7 +75,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv6 forwarding with scaling in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv6 forwarding with scaling in circular topology
 | | ... | ${rts_per_flow}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot
index cddf74a079..be1d861594 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot
@@ -48,6 +48,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${10000}
 # Traffic profile:
@@ -74,7 +75,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv6 forwarding with scaling in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv6 forwarding with scaling in circular topology
 | | ... | ${rts_per_flow}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot
index cd1cf8808a..c7f288110c 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot
@@ -48,6 +48,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${1000000}
 # Traffic profile:
@@ -74,7 +75,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv6 forwarding with scaling in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize IPv6 forwarding with scaling in circular topology
 | | ... | ${rts_per_flow}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip4-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip4-ip6base-ndrpdr.robot
index 4dd0c8094f..c1bc2655e5 100644
--- a/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip4-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip4-ip6base-ndrpdr.robot
@@ -46,6 +46,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 # LISP overhead
 | ${overhead}= | 48
 # Traffic profile:
@@ -73,7 +74,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology
 | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
 | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
 | | And Configure LISP topology in 3-node circular topology
diff --git a/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot
index dbfedf3172..482e1caceb 100644
--- a/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot
@@ -46,6 +46,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 # LISP overhead
 | ${overhead}= | 8
 # Traffic profile:
@@ -73,7 +74,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize LISP IPv6 forwarding in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize LISP IPv6 forwarding in 3-node circular topology
 | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
 | | ... | ${dut2_to_tg_ip6} | ${prefix6}
 | | And Configure LISP topology in 3-node circular topology
diff --git a/tests/vpp/perf/l2/10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr.robot
index fb4ae166bc..4ce69fea8a 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${4}
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
@@ -80,7 +81,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize L2 bridge domains with VLAN dot1q sub-interfaces in circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
 | | Then Find NDR and PDR intervals using optimized search
diff --git a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot
index 81b0b9a515..d7c182dafe 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot
@@ -49,6 +49,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
@@ -73,7 +74,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize layer interface
 | | And Initialize L2 bridge domain
 | | Then Find NDR and PDR intervals using optimized search
diff --git a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-ndrpdr.robot
index 0e40fce2c1..894b3190ff 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-ndrpdr.robot
@@ -48,6 +48,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
@@ -73,7 +74,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize L2 patch
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot
index af329fb4af..e0cabfa9b8 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot
@@ -48,6 +48,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
@@ -73,7 +74,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize L2 Xconnect In 3-node Circular Topology
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/l2/10ge2p1x710-dot1ad-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-dot1ad-l2xcbase-ndrpdr.robot
index e3dba2f5e8..8e4d777ada 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-dot1ad-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-dot1ad-l2xcbase-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${8}
 | ${subid}= | 10
 | ${outer_vlan_id}= | 100
@@ -81,6 +82,7 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
+| | When Initialize layer driver | ${nic_driver}
 | | And Set interfaces in path up
 | | When Initialize VLAN sub-interfaces in 3-node circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot
index 701d1e3bfb..32d95326d4 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${4}
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
@@ -80,7 +81,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains with VLAN dot1q sub-interfaces in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domains with VLAN dot1q sub-interfaces in circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot
index 8e06a53e23..75e1d7b187 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${4}
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
@@ -77,7 +78,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize VLAN dot1q sub-interfaces in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize VLAN dot1q sub-interfaces in circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And Configure L2 tag rewrite method on interfaces
 | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr.robot
index 916bdb08ca..b7f3d15585 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr.robot
index 34c98e3f33..9e923609db 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr.robot
index 38e1d7e271..cfbfc630af 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr.robot
index ab267feb7f..2b7d9927c2 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr.robot
index be42da51fe..81e660a20c 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr.robot
index 5f05504f32..c15d58858d 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr.robot
index c1a13899c2..0feec2956b 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr.robot
index 99fea0b43e..42239964e9 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr.robot
index 4d3c2f82fa..b0fefd59ad 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr.robot
index d1a267d4f6..a27c3f4b53 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr.robot
index fc80e3b3ff..c9d2662c86 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr.robot
index e3c89f6c17..d546e37dbc 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr.robot
index af91f4fea8..efc638ae06 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr.robot
index c092d224eb..7f8050dd8a 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr.robot
index 1ea5fa3e89..21f41a9b62 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr.robot
index c7c915029a..11edddabe0 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,8 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
-| | ${traffic_profile}= | Set Variable | trex-sl-3n-ethip4udp-10u10p-conc
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr.robot
index 063198299a..b55092d9bf 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr.robot
index 18c80ddc56..c8e20baa01 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr.robot
index 6514b6edc1..7979b90f4b 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -92,7 +93,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with MACIP ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with MACIP ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr.robot
index 59da7f51c3..e7b561b3a7 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -92,7 +93,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with MACIP ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with MACIP ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr.robot
index e0a5145135..45c0577b98 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -92,7 +93,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with MACIP ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with MACIP ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr.robot
index 25e07dc923..a6f6b8fd07 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -91,7 +92,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with MACIP ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with MACIP ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr.robot
index 79d7dc554a..9232d2147a 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -91,7 +92,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with MACIP ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with MACIP ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr.robot
index f0e3f5d2e9..db1012b18b 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -91,7 +92,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with MACIP ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with MACIP ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr.robot
index a762ce3f9a..da7e12c9b8 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -91,7 +92,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with MACIP ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with MACIP ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr.robot
index c3e72dc6fc..7e193557ff 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -91,7 +92,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with MACIP ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with MACIP ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr.robot
index f9e6db37d1..8e68e77709 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -91,7 +92,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with MACIP ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with MACIP ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot
index afa2b2cdb5..4bad45f188 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot
@@ -47,6 +47,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
@@ -72,7 +73,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | And Initialize L2 bridge domain
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr.robot
index 10f06d4f6f..1b26ed03c4 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr.robot
index 782a49fac3..c9489a5573 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr.robot
index fc7183f700..13ce8de0be 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr.robot
index 1d81e3941c..d731c587a4 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr.robot
index ebd8ac83ff..0f86ea68c8 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr.robot
index 373cd09423..ea0333f254 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr.robot
index abcb5b281e..d91f710e9c 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr.robot
index cb2511c720..a9e21eaadc 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr.robot
index d8e9a3ff8b..1a5bb16e06 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr.robot
index 4281d998b9..8dbfe77c2c 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr.robot
index bb4d7e3007..c97086d6d2 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr.robot
index 3a5affa7c7..f232714b88 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr.robot
index c16131dc27..182b38b8d1 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr.robot
index 8ae6b66df1..654985b4e7 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr.robot
index 6a5a58234f..d6076c5a76 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit+reflect
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr.robot
index 9ff794101f..8647761536 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr.robot
index ad119db485..9f169de2a9 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr.robot
index 237f6bcf72..7bb482e576 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # ACL test setup
 | ${acl_action}= | permit
@@ -90,7 +91,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot
index 687c16caec..a0c6d33c26 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-macsrc50kdst50k
@@ -76,7 +77,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | And Initialize L2 bridge domain
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot
index 29f7a1f923..0164ab9480 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-macsrc5kdst5k
@@ -76,7 +77,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | And Initialize L2 bridge domain
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot
index 7aca0f8a6a..45e2016c85 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-macsrc500kdst500k
@@ -76,7 +77,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | And Initialize L2 bridge domain
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2patch-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2patch-ndrpdr.robot
index 623bbab2fd..25b93906d3 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2patch-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2patch-ndrpdr.robot
@@ -47,6 +47,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
@@ -71,10 +72,9 @@
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
-| | And Add DPDK dev default RXD to all DUTs | 2048
-| | And Add DPDK dev default TXD to all DUTs | 2048
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 patch
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 patch
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2xcbase-ndrpdr.robot
index f73664b3a9..2907a4fde8 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2xcbase-ndrpdr.robot
@@ -47,6 +47,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
@@ -72,6 +73,7 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize L2 xconnect in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot
index d8ffffe932..7f59192428 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot
@@ -59,6 +59,7 @@
 | ... | acl_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${4}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-dot1qip4-vlan1ip4src254ip4dst254-bvi
@@ -84,7 +85,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize layer interface
 | | And Initialize layer dot1q
 | | And Initialize GBP routing domains
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr.robot
index 720d024924..d5d3596c8e 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${4}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-dot1qip4-vlan1ip4src254ip4dst254
@@ -76,7 +77,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize layer interface
 | | And Initialize layer dot1q
 | | And Initialize L2 bridge domain
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot
index 92361082dd..eaf267b145 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot
@@ -49,6 +49,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4-ip4src254
@@ -73,7 +74,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize layer interface
 | | And Initialize L2 bridge domain
 | | Then Find NDR and PDR intervals using optimized search
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2patch-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2patch-ndrpdr.robot
index a208e5b2cc..079d58d292 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2patch-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2patch-ndrpdr.robot
@@ -48,6 +48,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4-ip4src254
@@ -73,7 +74,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize L2 patch
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot
index 8d8594ab77..7419f824dc 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot
@@ -47,6 +47,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | avf
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4-ip4src254
@@ -72,7 +73,7 @@
 | | And Add DPDK no PCI to all DUTs
 | | And Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize L2 Xconnect In 2-node Circular Topology
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot
index 59591472c3..0166470762 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${4}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-dot1qip4-vlan1ip4src254ip4dst254
@@ -76,6 +77,7 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize layer interface
 | | And Initialize layer dot1q
 | | And Initialize L2 bridge domain
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot
index f1c3b9a034..562c26de29 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot
@@ -50,6 +50,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${4}
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
@@ -77,7 +78,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize VLAN dot1q sub-interfaces in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize VLAN dot1q sub-interfaces in circular topology
 | | ... | ${dut1} | ${dut1_if2} | SUB_ID=${subid}
 | | And Configure L2 tag rewrite method on interfaces
 | | ... | ${dut1} | ${subif_index_1} | TAG_REWRITE_METHOD=${tag_rewrite}
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot
index 3c03ff194d..77af4e6a88 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot
@@ -47,6 +47,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4-ip4src254
@@ -72,7 +73,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | And Initialize L2 bridge domain
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot
index f76f4e0a41..9ce2d37579 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4-macsrc50kdst50k
@@ -76,7 +77,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | And Initialize L2 bridge domain
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot
index bb814595e2..6f48822647 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4-macsrc5kdst5k
@@ -76,7 +77,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | And Initialize L2 bridge domain
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot
index db53a96f2c..1e70c0af87 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4-macsrc500kdst500k
@@ -76,7 +77,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | And Initialize L2 bridge domain
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2patch-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2patch-ndrpdr.robot
index 893b6151b6..fdd7cb953f 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2patch-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2patch-ndrpdr.robot
@@ -47,6 +47,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4-ip4src254
@@ -72,7 +73,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 patch
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize L2 patch
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2xcbase-ndrpdr.robot
index aad27f5377..ce48d4ef15 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2xcbase-ndrpdr.robot
@@ -47,6 +47,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4-ip4src254
@@ -72,6 +73,7 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize L2 xconnect in 2-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/lb/2n1l-10ge2p1x710-ethip4-loadbalancer-maglev-ndrpdr.robot b/tests/vpp/perf/lb/2n1l-10ge2p1x710-ethip4-loadbalancer-maglev-ndrpdr.robot
index ce9bc7bd93..bf706f37c1 100644
--- a/tests/vpp/perf/lb/2n1l-10ge2p1x710-ethip4-loadbalancer-maglev-ndrpdr.robot
+++ b/tests/vpp/perf/lb/2n1l-10ge2p1x710-ethip4-loadbalancer-maglev-ndrpdr.robot
@@ -48,6 +48,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | lb_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n-ethip4udp-lb
@@ -73,7 +74,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize loadbalancer maglev
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize loadbalancer maglev
 | | Then Find NDR and PDR intervals using optimized search
 | | ... | traffic_directions=${1}
 
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr.robot
index 7095c26df5..e90415f8e5 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr.robot
index 9faefb01e2..44c1341198 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr.robot
index b3a5c73546..e5e0981cc8 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr.robot
index 7011e71046..167804ca39 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr.robot
index 1cf02ac78b..eeb59ed8e9 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr.robot
index 9bde1b9514..3ec3801f1f 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr.robot
index e8bee04fb3..219a8783c4 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr.robot
index 50922122ce..c4092b0b55 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr.robot
index e66dde9909..cb1f7b2bee 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr.robot
index 6b8d9101fb..0446d10033 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr.robot
index ae2390f74a..fd9398cd17 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr.robot
index 4a17aa4277..ac97de5a17 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr.robot
index d9c5302135..353cf75cf6 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr.robot
index c100f7b290..1dfa8581eb 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr.robot
index 2b7ad90cac..23feb4ec18 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr.robot
index 235ebd554d..cf408114d5 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr.robot
index 7e85d82fa4..e5296c3849 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr.robot
index af3fa7d4c0..e967975642 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr.robot
index 329e529cb0..ab71d20bf6 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr.robot
index ba1f156cb9..2ee3efcce6 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr.robot
index 804b7de36f..7d867db234 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr.robot
@@ -53,6 +53,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -85,7 +86,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr.robot
index cd9719ee6d..e90c9c3da4 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr.robot
index bbc8da9217..7203f343a1 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr.robot
index 63e66c8ddc..802f81e25d 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr.robot
index 3366b1feaf..b43ba36af9 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr.robot
index e0e02e9b4c..d00b76f181 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr.robot
index e7879e4c89..a9ceb47da0 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr.robot
index c33f180e2c..7c1972f1db 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr.robot
index 4efc267eab..2e22143958 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr.robot
index 35cd350914..1f7ba52989 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr.robot
index 3e2b4404a1..414bae8e33 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr.robot
index 63c2fbe78c..bd19fa7309 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr.robot
index fcad197236..0eed0a8a16 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr.robot
index a5cf0cfd85..693135706e 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr.robot
index 38100206e9..85c3c62e89 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr.robot
index 5705a976b8..73d57bba20 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr.robot
index 66860d68d3..d9c95c4af7 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr.robot
index 654738f85d..99bfc25ea2 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr.robot
index ca7ec7b255..beede2b31e 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr.robot
index 7036190173..2379bb130d 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr.robot
index 40cb3ddbe2..e934a7cc50 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr.robot
index 91b3b5c343..7a5990c44d 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr.robot
index 3a41566c84..4bcd1d3fd1 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr.robot
index 316352f5f1..02793a4c31 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr.robot
index 82d6391bd2..07f4ee8750 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr.robot
index 31f82a5dda..d072b576b5 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr.robot
index 96c5db65ef..025b76acf0 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr.robot
index 8bcc07d543..4f3277121e 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr.robot
index 880f5b77eb..e5f3ce0591 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr.robot
index 8866cc1654..0d2cb15395 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr.robot
index 184edf8328..8d6ff46603 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr.robot
index 0cb16510f0..364cdb0a50 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr.robot
index 2943e3c80d..0fb745bdb7 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr.robot
index 8f13d713c1..25adc80903 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr.robot
index b19ea39838..346b64730c 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr.robot
index 6f6abf1426..9f7bcd41fc 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr.robot
index b5c366ce13..892c66a864 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr.robot
index e6dd8566f3..719aaf6aad 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr.robot
index fa740f32f2..5f0687e72c 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr.robot
index f8036600e1..9d294931a0 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr.robot
index f0d27c8560..4709d3358a 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr.robot
index 096683063e..40d0760c6a 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr.robot
index 1b72df7cbd..d0b4a03c09 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr.robot
index 0c555a7d69..519ae96fe2 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr.robot
index 2de40ee772..7197a32607 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr.robot
index cef1098c24..a559ecf7cf 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr.robot
index 20ddcd9e0d..632abb79c2 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface	
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface	
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr.robot
index 61f4805335..ebd0c7b588 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr.robot
index ada525e060..ded732b30a 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr.robot
index c5fe624f24..e10935727d 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr.robot
index eb2722f32c..3ec676bf63 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr.robot
index bd85786d94..9ca0003e90 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr.robot
index 7fa89780fe..9f0276d6e5 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr.robot
index bc80ce1ad5..bf8788587c 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr.robot
index 2814a82039..66dd8d6f00 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr.robot
index ab91a253e3..25de6ec86c 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr.robot
index 36142a85bd..fa5b236f74 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr.robot
index 61503b4327..29a088fc9e 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr.robot
index f89234d45f..7ba36e1ee3 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr.robot
index 3cf0f5ed4f..2f0b7163eb 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr.robot
index 266eed5915..31ec2d6e5a 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr.robot
index aef9d4b0dc..e11ad92154 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr.robot
index a7f3b738ec..34ff2c6527 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr.robot
index cb700835cd..44af947b85 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Start containers for test
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | auto_scale=${False}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr.robot
index c19a6e76c5..efd4ecc9ee 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr.robot
index 2f76c2d6e6..ff35283377 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr.robot
index f6d4cf7d12..bb0bd03104 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr.robot
index 0e34591399..d0355df44c 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr.robot
index 5be02881ff..4c34fe7f5d 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr.robot
index 383a96f4a4..5e52d6a302 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr.robot
index 6c38b7c42f..b5098254b0 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr.robot
index 187ec521ca..3fcac8e942 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr.robot
index adcf2db926..91c351b712 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr.robot
index ec5521138b..cc17c82383 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr.robot
index 5f62e74479..b4b20f64fe 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr.robot
index 9899ae6e7c..3f1bd66104 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr.robot
index 82d557b43f..8fa70d5aac 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr.robot
index cf219b3aa1..dfedbacba5 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr.robot
index 0b2f5f9923..47c3c27231 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr.robot
index 542a546ba0..05569541cc 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr.robot
index 70d4a793e3..62a956ac46 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr.robot
index 0571c565cd..d5253d06a9 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr.robot
index 5d38bf5508..b4b6e0e070 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr.robot
index 8f0d8204ee..0de75bbd1f 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr.robot
index ba0fdb2d21..2d5763ab24 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr.robot
index 6cfd06f7b6..4f617f3f47 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr.robot
index b8af17ac6e..01f092a411 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr.robot
index feb14fc1f2..451ad0ee57 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr.robot
index 95149d1613..c8a4874723 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr.robot
index 7749560656..40546dd964 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr.robot
index 12b28568c7..1293e86738 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr.robot
index 768df4bbb2..ccbef818ff 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr.robot
index 5f03ed7cb8..b6a3175d66 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr.robot
index 758e48c783..fc369c4725 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr.robot
index 5e17c517aa..daa2392cdc 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr.robot
index 5b49e56145..67026779dd 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr.robot
index fdf043ced1..7d83a4f6f0 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr.robot
index a967d056d0..329ded90df 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr.robot
index ea4e95e144..c127f53846 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr.robot
index 5d75de4358..327b4c9523 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr.robot
index 2275753aa0..f0f6cc4288 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr.robot
index a3be237edd..da60f130a1 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr.robot
index cda6c52ceb..d6fdf9f32b 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr.robot
index 30ff5f723b..2e61add2c9 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr.robot
index 37ffb30e09..37cc520162 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr.robot
index 0b4418133e..5a875cdf69 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf.robot
index d08e086e9e..c8a4b59ca3 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf.robot
@@ -53,6 +53,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -85,7 +86,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_total_chains}
 | | And Initialize layer dot1q
 | | ... | count=${nf_chains} | vlan_per_chain=${False}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf.robot
index 932f135fa0..344c5ffe67 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf.robot
@@ -53,6 +53,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -85,7 +86,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_total_chains}
 | | And Initialize layer dot1q
 | | ... | count=${nf_chains} | vlan_per_chain=${False}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr.robot
index 6646264738..ae6e1e3ab3 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr.robot
@@ -55,6 +55,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -85,7 +86,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize layer dot1q
 | | ... | count=${nf_chains} | vlan_per_chain=${False}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr.robot
index b65ee0e661..795476bd73 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr.robot
@@ -55,6 +55,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -85,7 +86,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize layer dot1q
 | | ... | count=${nf_chains} | vlan_per_chain=${False}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf.robot
index e7404b9894..a5378d0773 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf.robot
@@ -53,6 +53,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -85,7 +86,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_total_chains}
 | | And Initialize layer dot1q
 | | ... | count=${nf_chains} | vlan_per_chain=${False}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf.robot
index ff1c6184fc..4cff50ddd6 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf.robot
@@ -53,6 +53,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -85,7 +86,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_total_chains}
 | | And Initialize layer dot1q
 | | ... | count=${nf_chains} | vlan_per_chain=${False}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr.robot
index bf53dab305..e2fa61d897 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr.robot
@@ -55,6 +55,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -85,7 +86,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize layer dot1q
 | | ... | count=${nf_chains} | vlan_per_chain=${False}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr.robot
index 23c880a937..1ddae3f7f0 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr.robot
@@ -55,6 +55,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -85,7 +86,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize layer dot1q
 | | ... | count=${nf_chains} | vlan_per_chain=${False}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf.robot
index 117afb7ebe..652be6b279 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf.robot
@@ -53,6 +53,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -85,7 +86,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_total_chains}
 | | And Initialize layer dot1q
 | | ... | count=${nf_chains} | vlan_per_chain=${False}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf.robot
index 6e4a3aa461..6dc246a6d4 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf.robot
@@ -53,6 +53,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -85,7 +86,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_total_chains}
 | | And Initialize layer dot1q
 | | ... | count=${nf_chains} | vlan_per_chain=${False}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr.robot
index 924ef0b1ab..249aa96ddd 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr.robot
@@ -55,6 +55,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -85,7 +86,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize layer dot1q
 | | ... | count=${nf_chains} | vlan_per_chain=${False}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr.robot
index 5d5ea5744c..e9bbd125f8 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr.robot
@@ -55,6 +55,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -85,7 +86,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize layer dot1q
 | | ... | count=${nf_chains} | vlan_per_chain=${False}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf.robot
index 5651bf1fe3..58583b15ab 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf.robot
@@ -53,6 +53,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -85,7 +86,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_total_chains}
 | | And Initialize layer dot1q
 | | ... | count=${nf_chains} | vlan_per_chain=${False}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf.robot
index 153f3ab4b6..afd983302e 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf.robot
@@ -53,6 +53,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -85,7 +86,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_total_chains}
 | | And Initialize layer dot1q
 | | ... | count=${nf_chains} | vlan_per_chain=${False}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr.robot
index e6f04156a1..2ed6d8ac75 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr.robot
@@ -55,6 +55,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -85,7 +86,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize layer dot1q
 | | ... | count=${nf_chains} | vlan_per_chain=${False}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr.robot
index 2ae04825da..a6f7805f98 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr.robot
@@ -55,6 +55,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -85,7 +86,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize layer dot1q
 | | ... | count=${nf_chains} | vlan_per_chain=${False}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr.robot
index 1fd804a039..dd67361faf 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr.robot
@@ -55,6 +55,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -85,7 +86,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize layer dot1q
 | | ... | count=${nf_chains} | vlan_per_chain=${False}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr.robot
index 8e02d5d2e8..d14983adfc 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr.robot
@@ -55,6 +55,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -85,7 +86,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize layer dot1q
 | | ... | count=${nf_chains} | vlan_per_chain=${False}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf.robot
index 4d2d601c08..69727720f7 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf.robot
@@ -53,6 +53,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -85,7 +86,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_total_chains}
 | | And Initialize layer dot1q
 | | ... | count=${nf_chains} | vlan_per_chain=${False}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf.robot
index b02e4aa787..85e15f54d3 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf.robot
@@ -53,6 +53,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -85,7 +86,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_total_chains}
 | | And Initialize layer dot1q
 | | ... | count=${nf_chains} | vlan_per_chain=${False}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr.robot
index 3995fda452..73fc61a101 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr.robot
@@ -55,6 +55,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -85,7 +86,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize layer dot1q
 | | ... | count=${nf_chains} | vlan_per_chain=${False}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr.robot
index ab67c244df..e9417b1670 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr.robot
@@ -55,6 +55,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -85,7 +86,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize layer dot1q
 | | ... | count=${nf_chains} | vlan_per_chain=${False}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf.robot
index e8846ac9fe..3ee26c099d 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf.robot
@@ -53,6 +53,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
@@ -85,7 +86,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_total_chains}
 | | And Initialize layer dot1q
 | | ... | count=${nf_chains} | vlan_per_chain=${False}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf.robot
index cdd79aba3a..d5c54cc9ca 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf.robot
@@ -53,6 +53,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${54}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -85,7 +86,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
 | | ... | count=${nf_total_chains}
 | | And Initialize layer dot1q
 | | ... | count=${nf_chains} | vlan_per_chain=${False}
diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot
index ecb52a657c..1bedcffd86 100644
--- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 # outer IPv6 header: 40B
 | ${overhead}= | ${40}
 # SIDs
@@ -95,9 +96,10 @@
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
+| | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv6 forwarding over SRv6 with encapsulation with '1' x SID 'with' decapsulation in 3-node circular topology
+| | When Initialize layer driver | vfio-pci
+| | And Initialize IPv6 forwarding over SRv6 with encapsulation with '1' x SID 'with' decapsulation in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot
index 6ebcd7f66c..50e723e60a 100644
--- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 # outer IPv6 header + SRH with 2 SIDs: 40+40B
 | ${overhead}= | ${80}
 # SIDs
@@ -98,9 +99,10 @@
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
+| | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv6 forwarding over SRv6 with encapsulation with '2' x SID 'with' decapsulation in 3-node circular topology
+| | When Initialize layer driver | vfio-pci
+| | And Initialize IPv6 forwarding over SRv6 with encapsulation with '2' x SID 'with' decapsulation in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot
index 29d234fc83..dd46569cb6 100644
--- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 # outer IPv6 header + SRH with 2 SIDs: 40+40B
 | ${overhead}= | ${80}
 # SIDs
@@ -98,9 +99,10 @@
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
+| | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv6 forwarding over SRv6 with encapsulation with '2' x SID 'without' decapsulation in 3-node circular topology
+| | When Initialize layer driver | vfio-pci
+| | And Initialize IPv6 forwarding over SRv6 with encapsulation with '2' x SID 'without' decapsulation in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot
index cab30c06f4..72d6fe91d2 100644
--- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot
@@ -53,6 +53,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so | srv6ad_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 # outer IPv6 header + SRH with 3 SIDs: 40+(8+3*16)B
 | ${overhead}= | ${96}
 # SIDs
@@ -111,10 +112,11 @@
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
+| | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
+| | When Initialize layer driver | vfio-pci
 | | And Start containers for test | nf_chains=${1} | nf_nodes=${1}
-| | When Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'dynamic_proxy' behaviour in 3-node circular topology
+| | And Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'dynamic_proxy' behaviour in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot
index de0239598e..76338a552d 100644
--- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot
@@ -53,6 +53,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so | srv6am_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 # outer IPv6 header + SRH with 3 SIDs: 40+(8+3*16)B
 | ${overhead}= | ${96}
 # SIDs
@@ -111,10 +112,11 @@
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
+| | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
+| | When Initialize layer driver | vfio-pci
 | | And Start containers for test | nf_chains=${1} | nf_nodes=${1}
-| | When Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'masquerading' behaviour in 3-node circular topology
+| | And Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'masquerading' behaviour in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot
index dc9f31b417..2227b4c9b9 100644
--- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot
@@ -53,6 +53,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so | srv6as_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 # outer IPv6 header + SRH with 3 SIDs: 40+(8+3*16)B
 | ${overhead}= | ${96}
 # SIDs
@@ -111,10 +112,11 @@
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
+| | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
+| | When Initialize layer driver | vfio-pci
 | | And Start containers for test | nf_chains=${1} | nf_nodes=${1}
-| | When Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'static_proxy' behaviour in 3-node circular topology
+| | And Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'static_proxy' behaviour in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/tcp/2n1l-10ge2p1x710-eth-ip4tcphttp-wrk8u8c50con-cps.robot b/tests/vpp/perf/tcp/2n1l-10ge2p1x710-eth-ip4tcphttp-wrk8u8c50con-cps.robot
index 210ca3b288..af480b6efd 100644
--- a/tests/vpp/perf/tcp/2n1l-10ge2p1x710-eth-ip4tcphttp-wrk8u8c50con-cps.robot
+++ b/tests/vpp/perf/tcp/2n1l-10ge2p1x710-eth-ip4tcphttp-wrk8u8c50con-cps.robot
@@ -41,6 +41,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | http_static_plugin.so
 | ... | hs_apps_plugin.so
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${traffic_profile}= | wrk-sf-2n-ethip4tcphttp-8u8c50con-cps
 | ${http_static_plugin}= | ${false}
 
@@ -66,7 +67,8 @@
 | | | Run keyword | ${dut}.Add session local endpoints table buckets | 2500000
 | | | Run keyword | ${dut}.Add session local endpoints table memory | 3g
 | | Apply startup configuration on all VPP DUTs
-| | When Set up HTTP server with parameters on the VPP node
+| | When Initialize layer driver | vfio-pci
+| | And Set up HTTP server with parameters on the VPP node
 | | ... | ${http_static_plugin} | 31000 | 64 | 4000m
 | | Then Measure connections per second | ${traffic_profile}
 
diff --git a/tests/vpp/perf/tcp/2n1l-10ge2p1x710-eth-ip4tcphttp-wrk8u8c50con-rps.robot b/tests/vpp/perf/tcp/2n1l-10ge2p1x710-eth-ip4tcphttp-wrk8u8c50con-rps.robot
index f8a5d82255..2998535804 100644
--- a/tests/vpp/perf/tcp/2n1l-10ge2p1x710-eth-ip4tcphttp-wrk8u8c50con-rps.robot
+++ b/tests/vpp/perf/tcp/2n1l-10ge2p1x710-eth-ip4tcphttp-wrk8u8c50con-rps.robot
@@ -41,6 +41,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | http_static_plugin.so
 | ... | hs_apps_plugin.so
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${traffic_profile}= | wrk-sf-2n-ethip4tcphttp-8u8c50con-rps
 | ${http_static_plugin}= | ${true}
 
@@ -66,7 +67,8 @@
 | | | Run keyword | ${dut}.Add session local endpoints table buckets | 2500000
 | | | Run keyword | ${dut}.Add session local endpoints table memory | 3g
 | | Apply startup configuration on all VPP DUTs
-| | When Set up HTTP server with parameters on the VPP node
+| | When Initialize layer driver | vfio-pci
+| | And Set up HTTP server with parameters on the VPP node
 | | ... | ${http_static_plugin} | 500000 | 4 | 4000m
 | | Then Measure requests per second | ${traffic_profile}
 
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index 0e4d79ea2e..9da3a8787d 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -55,6 +55,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | lacp_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${4}
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
@@ -92,7 +93,8 @@
 | | And Add VLAN Strip Offload switch off between DUTs in 3-node single link topology
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains with Vhost-User and VLAN with VPP link bonding in a 3-node circular topology
+| | When Initialize layer driver | vfio-pci
+| | And Initialize L2 bridge domains with Vhost-User and VLAN with VPP link bonding in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${subid}
 | | ... | ${tag_rewrite} | ${bond_mode} | ${lb_mode}
 | | And Configure chains of NFs connected via vhost-user
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
index 60bc7b6021..c308a54535 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
@@ -55,6 +55,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | lacp_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${4}
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
@@ -92,7 +93,8 @@
 | | And Add VLAN Strip Offload switch off between DUTs in 3-node single link topology
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains with Vhost-User and VLAN with VPP link bonding in a 3-node circular topology
+| | When Initialize layer driver | vfio-pci
+| | And Initialize L2 bridge domains with Vhost-User and VLAN with VPP link bonding in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${subid}
 | | ... | ${tag_rewrite} | ${bond_mode} | ${lb_mode}
 | | And Configure chains of NFs connected via vhost-user
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
index c7c5af2269..a9c723b979 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -55,6 +55,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | lacp_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${4}
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
@@ -90,7 +91,8 @@
 | | And Add VLAN Strip Offload switch off between DUTs in 3-node single link topology
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 xconnect with Vhost-User and VLAN with VPP link bonding in 3-node circular topology
+| | When Initialize layer driver | vfio-pci
+| | And Initialize L2 xconnect with Vhost-User and VLAN with VPP link bonding in 3-node circular topology
 | | ... | ${subid} | ${tag_rewrite} | ${bond_mode} | ${lb_mode}
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
index e2e5300ac0..6c753cbf1c 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
@@ -55,6 +55,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | lacp_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${4}
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
@@ -90,7 +91,8 @@
 | | And Add VLAN Strip Offload switch off between DUTs in 3-node single link topology
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 xconnect with Vhost-User and VLAN with VPP link bonding in 3-node circular topology
+| | When Initialize layer driver | vfio-pci
+| | And Initialize L2 xconnect with Vhost-User and VLAN with VPP link bonding in 3-node circular topology
 | | ... | ${subid} | ${tag_rewrite} | ${bond_mode} | ${lb_mode}
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index 6c20699ead..a40829235b 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -56,6 +56,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | lacp_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${4}
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
@@ -93,7 +94,8 @@
 | | And Add VLAN Strip Offload switch off between DUTs in 3-node double link topology
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains with Vhost-User and VLAN with VPP link bonding in a 3-node circular topology
+| | When Initialize layer driver | vfio-pci
+| | And Initialize L2 bridge domains with Vhost-User and VLAN with VPP link bonding in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${subid}
 | | ... | ${tag_rewrite} | ${bond_mode} | ${lb_mode}
 | | And Configure chains of NFs connected via vhost-user
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
index 035383cb39..5eca71c9df 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
@@ -56,6 +56,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | lacp_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${4}
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
@@ -93,7 +94,8 @@
 | | And Add VLAN Strip Offload switch off between DUTs in 3-node double link topology
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains with Vhost-User and VLAN with VPP link bonding in a 3-node circular topology
+| | When Initialize layer driver | vfio-pci
+| | And Initialize L2 bridge domains with Vhost-User and VLAN with VPP link bonding in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${subid}
 | | ... | ${tag_rewrite} | ${bond_mode} | ${lb_mode}
 | | And Configure chains of NFs connected via vhost-user
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
index 6596a53aa7..7cf79c904c 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -56,6 +56,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | lacp_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${4}
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
@@ -91,7 +92,8 @@
 | | And Add VLAN Strip Offload switch off between DUTs in 3-node double link topology
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 xconnect with Vhost-User and VLAN with VPP link bonding in 3-node circular topology
+| | When Initialize layer driver | vfio-pci
+| | And Initialize L2 xconnect with Vhost-User and VLAN with VPP link bonding in 3-node circular topology
 | | ... | ${subid} | ${tag_rewrite} | ${bond_mode} | ${lb_mode}
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
index 4655ee122d..2084d8f1da 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
@@ -56,6 +56,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | lacp_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${4}
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
@@ -91,7 +92,8 @@
 | | And Add VLAN Strip Offload switch off between DUTs in 3-node double link topology
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 xconnect with Vhost-User and VLAN with VPP link bonding in 3-node circular topology
+| | When Initialize layer driver | vfio-pci
+| | And Initialize L2 xconnect with Vhost-User and VLAN with VPP link bonding in 3-node circular topology
 | | ... | ${subid} | ${tag_rewrite} | ${bond_mode} | ${lb_mode}
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index 1d4e8355e9..bdb0e17a42 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -54,6 +54,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${4}
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
@@ -87,7 +88,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains with Vhost-User and VLAN in circular topology
+| | When Initialize layer driver | vfio-pci
+| | And Initialize L2 bridge domains with Vhost-User and VLAN in circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
index 4c2848e283..4751d14163 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
@@ -54,6 +54,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${4}
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
@@ -87,7 +88,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains with Vhost-User and VLAN in circular topology
+| | When Initialize layer driver | vfio-pci
+| | And Initialize L2 bridge domains with Vhost-User and VLAN in circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
index 7201e4ed66..3897e2228f 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${4}
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
@@ -83,7 +84,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology
+| | When Initialize layer driver | vfio-pci
+| | And Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology
 | | ... | ${subid} | ${tag_rewrite}
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
index c82e67e679..8511069d6b 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${4}
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
@@ -83,7 +84,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology
+| | When Initialize layer driver | vfio-pci
+| | And Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology
 | | ... | ${subid} | ${tag_rewrite}
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index e62b9ce183..ee1fe539c4 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | vfio-pci
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
index 11d28ae876..0a88172c48 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | vfio-pci
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
index 29a294cbc0..a167933224 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -80,7 +81,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 xconnect with Vhost-User | nf_nodes=${nf_nodes}
+| | When Initialize layer driver | vfio-pci
+| | And Initialize L2 xconnect with Vhost-User | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${True} | vnf=testpmd_io
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
index cba785e676..4a06f36e96 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -80,7 +81,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 xconnect with Vhost-User | nf_nodes=${nf_nodes}
+| | When Initialize layer driver | vfio-pci
+| | And Initialize L2 xconnect with Vhost-User | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${True} | vnf=vpp_chain_l2xc
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot
index 63ed079ec4..f12fe17547 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -80,7 +81,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding with vhost in 3-node circular topology
+| | When Initialize layer driver | vfio-pci
+| | And Initialize IPv4 forwarding with vhost in 3-node circular topology
 | | ... | nf_nodes=${nf_nodes} | testpmd_mac=${TRUE}
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot
index a766f162a4..20f2beeb65 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -80,7 +81,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding with vhost in 3-node circular topology
+| | When Initialize layer driver | vfio-pci
+| | And Initialize IPv4 forwarding with vhost in 3-node circular topology
 | | ... | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index 582e42924f..e5f7bf242c 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -53,6 +53,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${50}
 | ${bd_id1}= | 1
 | ${bd_id2}= | 2
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology
+| | When Initialize layer driver | vfio-pci
+| | And Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2}
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_chains} | jumbo=${jumbo}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
index 30405af392..e70db2e210 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
@@ -53,6 +53,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${50}
 | ${bd_id1}= | 1
 | ${bd_id2}= | 2
@@ -84,7 +85,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology
+| | When Initialize layer driver | vfio-pci
+| | And Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2}
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_chains} | jumbo=${jumbo}
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index f905bb7b87..c7d5410913 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -53,6 +53,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${4}
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
@@ -86,7 +87,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains with Vhost-User and VLAN in circular topology
+| | When Initialize layer driver | vfio-pci
+| | And Initialize L2 bridge domains with Vhost-User and VLAN in circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
index b6ef506f06..2a5c08297c 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
@@ -53,6 +53,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${4}
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
@@ -86,7 +87,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains with Vhost-User and VLAN in circular topology
+| | When Initialize layer driver | vfio-pci
+| | And Initialize L2 bridge domains with Vhost-User and VLAN in circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index 1af87c7c96..0b9c4422c7 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | vfio-pci
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
index 61cec557d0..31f29c94dc 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
@@ -52,6 +52,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -81,7 +82,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer interface
+| | When Initialize layer driver | vfio-pci
+| | And Initialize layer interface
 | | ... | count=${nf_chains}
 | | And Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
index 0e3ddfda02..92a05c51ca 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -80,7 +81,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 xconnect with Vhost-User | nf_nodes=${nf_nodes}
+| | When Initialize layer driver | vfio-pci
+| | And Initialize L2 xconnect with Vhost-User | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${True} | vnf=testpmd_io
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
index 29f706033b..1d9e309dda 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L2
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -80,7 +81,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 xconnect with Vhost-User | nf_nodes=${nf_nodes}
+| | When Initialize layer driver | vfio-pci
+| | And Initialize L2 xconnect with Vhost-User | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${True} | vnf=vpp_chain_l2xc
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot
index 6f668e8acb..1678b17b10 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -80,7 +81,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding with vhost in 2-node circular topology
+| | When Initialize layer driver | vfio-pci
+| | And Initialize IPv4 forwarding with vhost in 2-node circular topology
 | | ... | nf_nodes=${nf_nodes} | testpmd_mac=${TRUE}
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot
index 167be482ed..8e9f63389e 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot
@@ -51,6 +51,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -80,7 +81,8 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding with vhost in 2-node circular topology
+| | When Initialize layer driver | vfio-pci
+| | And Initialize IPv4 forwarding with vhost in 2-node circular topology
 | | ... | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
diff --git a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot
index f105faf039..6f3eb7e27f 100644
--- a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot
@@ -54,6 +54,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${50}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -92,7 +93,8 @@
 | | &{vxlan2} = | Create Dictionary | vni=0 | vtep=172.27.0.2
 | | @{dut1_vxlans} = | Create List | ${vxlan1}
 | | @{dut2_vxlans} = | Create List | ${vxlan2}
-| | Set interfaces in path up
+| | When Initialize layer driver | ${nic_driver}
+| | And Set interfaces in path up
 | | When Init L2 bridge domains with single DUT with Vhost-User and VXLANoIPv4 in 3-node circular topology
 | | ... | 172.16.0.1 | 16 | 172.26.0.1 | 16 | 172.16.0.2 | 172.26.0.2
 | | ... | ${dut1_vxlans} | ${dut2_vxlans} | 172.17.0.0 | 16 | 172.27.0.0 | 16
diff --git a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot
index 5e9e729386..36528cb713 100644
--- a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot
@@ -54,6 +54,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${50}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -92,7 +93,8 @@
 | | &{vxlan2} = | Create Dictionary | vni=0 | vtep=172.27.0.2
 | | @{dut1_vxlans} = | Create List | ${vxlan1}
 | | @{dut2_vxlans} = | Create List | ${vxlan2}
-| | Set interfaces in path up
+| | When Initialize layer driver | ${nic_driver}
+| | And Set interfaces in path up
 | | When Init L2 bridge domains with single DUT with Vhost-User and VXLANoIPv4 in 3-node circular topology
 | | ... | 172.16.0.1 | 16 | 172.26.0.1 | 16 | 172.16.0.2 | 172.26.0.2
 | | ... | ${dut1_vxlans} | ${dut2_vxlans} | 172.17.0.0 | 16 | 172.27.0.0 | 16
diff --git a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot
index 4f6e871aeb..ad4c5ca8b8 100644
--- a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot
@@ -54,6 +54,7 @@
 | @{plugins_to_enable}= | dpdk_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${overhead}= | ${50}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -92,7 +93,8 @@
 | | &{vxlan2} = | Create Dictionary | vni=0 | vtep=172.27.0.2
 | | @{dut1_vxlans} = | Create List | ${vxlan1}
 | | @{dut2_vxlans} = | Create List | ${vxlan2}
-| | Set interfaces in path up
+| | When Initialize layer driver | ${nic_driver}
+| | And Set interfaces in path up
 | | When Init L2 bridge domains with single DUT with Vhost-User and VXLANoIPv4 in 3-node circular topology
 | | ... | 172.16.0.1 | 16 | 172.26.0.1 | 16 | 172.16.0.2 | 172.26.0.2
 | | ... | ${dut1_vxlans} | ${dut2_vxlans} | 172.17.0.0 | 16 | 172.27.0.0 | 16
-- 
2.16.6