[COMMIT] Fix make check in the presence of variant language environments