to avoid random test failures in 50% of "make test" runs
Can you elaborate (in the code itself) why this is causing 50% test failures for you? I am not seeing this myself.