Fix integration-cli tests Upstream-commit: 8022e6292ed8e4676fdc65ad80ee3b68629493e7 Component: engine