Fix test after f8b91d9acff10ede7bd3f2bc631794a3abef8ff7
Fixed test after nick previous fix
Merge branch 'PHP-5.5'