Fix broken test
(cherry picked from commit 17f8cdc)