Using "@override_settings" might solve this issue (see my comment in the test module).  In any event, it makes me really uncomfortable to add a special case for the test suite -- we shouldn't need to do this.