diff --git a/infra/gcb/build_and_run_coverage.py b/infra/gcb/build_and_run_coverage.py
index 40292abf0..60f666c06 100644
--- a/infra/gcb/build_and_run_coverage.py
+++ b/infra/gcb/build_and_run_coverage.py
@@ -36,7 +36,7 @@ LATEST_REPORT_INFO_CONTENT_TYPE = 'application/json'
 UPLOAD_URL_FORMAT = 'gs://' + COVERAGE_BUCKET_NAME + '/{project}/{type}/{date}'
 
 # Languages from project.yaml that have code coverage support.
-LANGUAGES_WITH_COVERAGE_SUPPORT = ['c', 'cpp']
+LANGUAGES_WITH_COVERAGE_SUPPORT = ['c', 'c++']
 
 
 def skip_build(message):
diff --git a/infra/gcb/build_project.py b/infra/gcb/build_project.py
index 06eb6b384..f58b6cd05 100644
--- a/infra/gcb/build_project.py
+++ b/infra/gcb/build_project.py
@@ -61,7 +61,6 @@ def load_project_yaml(project_dir):
     project_yaml.setdefault('run_tests', True)
     project_yaml.setdefault('coverage_extra_args', '')
     project_yaml.setdefault('labels', {})
-    project_yaml.setdefault('language', 'cpp')
     return project_yaml