Fix unstability caused by one test fixture
Merge pull request #2539 from Randy-Ma/master

Fix unstability caused by one test fixture