Get tests working on py2.6 again.