Merge "Fix run-test with JIT enabled"