fix test for 5.4/5.5
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix test for 5.4/5.5