Test on 5.8 too