Bug 831404 - Fix intermittent failure. r=rnewman, a=test-only