Tweak cli integration tests Upstream-commit: f357b18ee3550a4214d03c10cfe0bed10d6d0df5 Component: engine