Merge pull request #10909 from ahmetalpbalkan/run_test-defer

integration-cli: Better test cleanup with defer