INT-3435: Polishing according test failures

https://build.spring.io/browse/INT-B41-29