No need to upgrade to latest setuptools; it didn't fix the problem. Removed tests for Python 2.5 again to avoid stupid error.