[#43339565] Fix some flaky integration tests