(hopefully) last attempt to fix tests on PHP 5.3