More test cleanups preceding Django 1.6 branch

These changes fix test failures in the Django 1.6 branch but shouldn't break tests in master.