Fix #120 test failing with 8.1.0RC1