Fix unit tests failure on some configs
Merge pull request #571 from Snaipe/master

Fix unit tests failure on some configs