Use py2.6-compatible test methods