reduce the chance of a sporadic failure.
Merge pull request #375 from gcheng/release

reduce the chance of a sporadic failure of unit test on CI machine