Bug 920780 working around the race condition and making the test more reliable.