Test fix for #11717