I realize you're just modifying a bad solution that was previously in place here, but would it work to make this happen in ``TestCase.tearDown`` for each test case that uses it?