-| Test Teardown | Run Keywords | Read plugin-ACL configuration from VAT
-| ... | ${node} | AND
-| ... | Clear plugin-acl settings | ${node} | ${dut_to_tg_if1}
-| Suite Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | AND
-| ... | Run Keyword If Any Tests Failed
-| ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node}
+| Test Setup | Clear Packet Trace on All DUTs | ${nodes}
+| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes}
+| ... | AND | Read plugin-ACL configuration from VAT | ${node}
+| ... | AND | Clear plugin-acl settings | ${node} | ${dut_to_tg_if1}
+| Suite Teardown
+| ... | Restart Honeycomb and VPP | ${node}