diff --git a/.gitignore b/.gitignore
index 5b932c17b8..b29171c7d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -155,6 +155,7 @@
 /tools/valgrind
 /tools/vim
 /tools/win
+/tools/xdisplaycheck
 /tools/whitespace.txt
 /webrtc/examples/android/media_demo/bin
 /webrtc/examples/android/media_demo/gen
diff --git a/setup_links.py b/setup_links.py
index 99b526076c..9aeb1e8764 100755
--- a/setup_links.py
+++ b/setup_links.py
@@ -75,6 +75,7 @@ DIRECTORIES = [
   'tools/valgrind',
   'tools/vim',
   'tools/win',
+  'tools/xdisplaycheck',
 ]
 
 from sync_chromium import get_target_os_list
diff --git a/talk/libjingle_media_unittest.isolate b/talk/libjingle_media_unittest.isolate
index c250042dd6..2d67d0f969 100644
--- a/talk/libjingle_media_unittest.isolate
+++ b/talk/libjingle_media_unittest.isolate
@@ -34,6 +34,7 @@
         'files': [
           '<(PRODUCT_DIR)/libjingle_media_unittest<(EXECUTABLE_SUFFIX)',
           'media/testdata/captured-320x240-2s-48.frames',
+          'media/testdata/faces.1280x720_P420.yuv',
         ],
       },
     }],
diff --git a/webrtc/modules/modules_unittests.isolate b/webrtc/modules/modules_unittests.isolate
index bc6437f37f..5035f6ed0e 100644
--- a/webrtc/modules/modules_unittests.isolate
+++ b/webrtc/modules/modules_unittests.isolate
@@ -129,7 +129,7 @@
         ],
       },
     }],
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
+    ['(OS=="linux" or OS=="mac" or OS=="win") and use_x11==0', {
       'variables': {
         'command': [
           '<(DEPTH)/testing/test_env.py',
@@ -142,5 +142,22 @@
         ],
       },
     }],
+    ['(OS=="linux" or OS=="mac" or OS=="win") and use_x11==1', {
+      'variables': {
+        'command': [
+          '<(DEPTH)/testing/xvfb.py',
+          '<(PRODUCT_DIR)',
+          '<(DEPTH)/testing/test_env.py',
+          '<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)',
+        ],
+        'files': [
+          '<(DEPTH)/DEPS',
+          '<(DEPTH)/testing/test_env.py',
+          '<(DEPTH)/testing/xvfb.py',
+          '<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
+        ],
+      },
+    }],
   ],
 }
diff --git a/webrtc/test/test.gyp b/webrtc/test/test.gyp
index a19288eaed..442b08723a 100644
--- a/webrtc/test/test.gyp
+++ b/webrtc/test/test.gyp
@@ -140,6 +140,11 @@
             'CLANG_ENABLE_OBJC_ARC': 'YES',
           },
         }],
+        ['use_x11==1', {
+          'dependencies': [
+            '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+          ],
+        }],
       ],
     },
     {