Merge pull request #471 from iamqizhao/master

fix a flaky test