Merge regressiontests and modeltests.

Ticket: https://code.djangoproject.com/ticket/19921