Fix PHP-949 tests for 2.5.x server builds
Merge pull request #583