Bug 864908: fix SUT timeouts; r=mcote