Followup to 727000627a3197600f6af46ec63a6c362358a414: Build changes for new tests.