Improve remote integration-cli tests Upstream-commit: 4cdd0403cdaac7e500f3fa6740c43792a6e066a4 Component: engine