cherry pick e8d7732e preq-fail tests in messages