Trying to fix failing tests on 5.4 and HHVM