Fix remaining test on 1.8