Attempt fix of #11557 by refining setup/teardown logic.
1 file changed