Followup to r75965: replace the test_uuid-specific patch with a generic fix
(other tests may have the same problem).
2 files changed