Made #844 work for isolated tests.