Attempt to fix hhvm tests (10)
Attempt to fix hhvm tests (10)

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