Fix regression tests after r11127 and 11129