[582831] Prevent build failures on test project
4 files changed