Try another approach to get tests working in Py2.6