-| Test Setup | Setup all DUTs before test
-| Test Teardown | Run Keywords
-| ... | Run Keyword If Test Failed
-| ... | Traffic should pass with no loss | 10
-| ... | ${min_rate}pps | ${framesize} | 3-node-bridge
-| ... | fail_on_loss=${False}
-| ... | AND | Show Vpp Vhost On All DUTs
-| ... | AND | Remove startup configuration of VPP from all DUTs
-| ... | AND | Guest VM with dpdk-testpmd Teardown | ${dut1}
-| ... | ${dut1_vm_refs}
-| ... | AND | Guest VM with dpdk-testpmd Teardown | ${dut2}
-| ... | ${dut2_vm_refs}
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown
+| ... | ${min_rate}pps | ${framesize} | 3-node-xconnect
+| ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
+| ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
+| ...