diff --git a/test/BUILD.gn b/test/BUILD.gn
index 7277e6bab3..e00bbef145 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -640,9 +640,6 @@ rtc_source_set("test_renderer_generic") {
   ]
   libs = []
   sources = [
-    "linux/glx_renderer.cc",
-    "linux/glx_renderer.h",
-    "linux/video_renderer_linux.cc",
     "video_renderer.cc",
     "video_renderer.h",
     "win/d3d_renderer.cc",
@@ -656,17 +653,22 @@ rtc_source_set("test_renderer_generic") {
     "../rtc_base:rtc_base_approved",
     "//testing/gtest",
   ]
-  if (!is_linux && !is_mac && !is_win) {
+  if (!(is_linux && use_x11) && !is_mac && !is_win) {
     sources += [ "null_platform_renderer.cc" ]
   }
-  if (is_linux || is_mac) {
+  if ((is_linux && use_x11) || is_mac) {
     sources += [
       "gl/gl_renderer.cc",
       "gl/gl_renderer.h",
     ]
   }
 
-  if (is_linux) {
+  if (is_linux && use_x11) {
+    sources += [
+      "linux/glx_renderer.cc",
+      "linux/glx_renderer.h",
+      "linux/video_renderer_linux.cc",
+    ]
     libs += [
       "Xext",
       "X11",