[PATCH 0/2] tests: Stabilize tests when environment leaks FDs into them