Attempt to fix hhvm tests (3)
Attempt to fix hhvm tests (3)

oswaldderiemaecker/distill,oswaldderiemaecker/distill,xabbuh/distill,raulfraile/distill,raulfraile/distill,oswaldderiemaecker/distill,raulfraile/distill,xabbuh/distill