LPS-41839 Fix broken test in 6.1.x