There are at least these options here 1) go through all ~100 places where test_expect_equal_file is used and fix the call order: quick look tells that the offending uses are in dump-restore, hooks, search-limiting and symbol-hiding. 2) enforce "expected" filename has some format *and* fix all current uses of it. Add testbed_error () function which yells loudly ane exits... 3) guess which is output and which is expected from args so that machine helps tester here (for both diff output & copied files)a 4) just copy compared files to some directory, those are named as basename of the original -- diff order still inconsistent. I'd just go with option 1 and fix new *violations* when stumble upon one. Tomi