Make runtests compatible with Django 1.7
Switch to using django.utils.six