FABRIC-683 and FABRIC-674 - stabilise mq test