Made test 2.6-friendly.