Fix failing test
(cherry picked from commit 6204313)