As tests do not pass on `hhvm`, I would remove it altogether and only keep `hhvm-nightly`. Whenever hhvm becomes stable again, we will add `hhvm` back (that's what I've done for Symfony).