diff --git a/test/pc/e2e/BUILD.gn b/test/pc/e2e/BUILD.gn
index e0da5b89f2..0c5f36e37e 100644
--- a/test/pc/e2e/BUILD.gn
+++ b/test/pc/e2e/BUILD.gn
@@ -161,17 +161,6 @@ rtc_source_set("quality_analyzing_video_encoder") {
   ]
 }
 
-# TODO(mbonadei): Remove as soon as -Wundef and -Wextra-semi problems are
-# fixed upstream (CLs are under review).
-config("peerconnection_quality_test_cflags") {
-  if (is_clang) {
-    cflags = [
-      "-Wno-undef",
-      "-Wno-extra-semi",
-    ]
-  }
-}
-
 if (rtc_include_tests) {
   rtc_source_set("video_quality_analyzer_injection_helper") {
     visibility = [ "*" ]
@@ -236,9 +225,6 @@ if (rtc_include_tests) {
     visibility = [ "*" ]
     testonly = true
 
-    # TODO(mbonadei): Remove as soon as -Wundef and -Wextra-semi problems are
-    # fixed upstream (CLs are under review).
-    configs += [ ":peerconnection_quality_test_cflags" ]
     sources = [
       "peer_connection_quality_test.cc",
       "peer_connection_quality_test.h",
@@ -323,9 +309,6 @@ if (rtc_include_tests) {
   rtc_source_set("peer_connection_e2e_smoke_test") {
     testonly = true
 
-    # TODO(mbonadei): Remove as soon as -Wundef and -Wextra-semi problems are
-    # fixed upstream (CLs are under review).
-    configs += [ ":peerconnection_quality_test_cflags" ]
     sources = [
       "peer_connection_e2e_smoke_test.cc",
     ]
@@ -434,9 +417,6 @@ rtc_source_set("example_video_quality_analyzer") {
 rtc_source_set("default_video_quality_analyzer") {
   visibility = [ "*" ]
 
-  # TODO(mbonadei): Remove as soon as -Wundef and -Wextra-semi problems are
-  # fixed upstream (CLs are under review).
-  configs += [ ":peerconnection_quality_test_cflags" ]
   testonly = true
   sources = [
     "analyzer/video/default_video_quality_analyzer.cc",