Fixed a couple of test-ordering-dependant failures introduced in [11639] that caused test failures when running the whole test suite.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11645 bcc190cf-cafb-0310-a4f2-bffc1f526a37