Tweak config to be more tolerant of testing-only setups