I think that is the right way to attack the issue.  This test shouldn't be testing that previously run tests cleaned up properly, which is what it was doing in a small way, not by design.