Issue #2365469: Fix hhvm tests.