fix flaky test
Merge pull request #1539 from marcel-blonk/release-62

fix flaky test