Fix unit-tests with PHP >= 5.4.30