Fix failing test
(cherry picked from commit 305cbbc)