The fix was introduced, along with re-ordering to do other macros that check test environment capabilities before master/slave is set up.