more fix for unittest
Merge pull request #5125 from ticoann/fix_jenkins_unittest

more fix for unittest