Fix issue running tests

The test suite was dying halfway through every time.  For some reason,
we're now having issues with the previous settings.