Apply minimal test fix from Standard8's long-polling PR