diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index 6f507a655f..47728a7dcb 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -341,6 +341,7 @@ source_set("rtc_event_log") {
 
   deps = [
     ":webrtc_common",
+    "//webrtc/modules/rtp_rtcp",
   ]
 
   if (rtc_enable_protobuf) {
diff --git a/webrtc/modules/video_capture/BUILD.gn b/webrtc/modules/video_capture/BUILD.gn
index 78f5212950..3df74b62e1 100644
--- a/webrtc/modules/video_capture/BUILD.gn
+++ b/webrtc/modules/video_capture/BUILD.gn
@@ -7,6 +7,7 @@
 # be found in the AUTHORS file in the root of the source tree.
 
 import("../../build/webrtc.gni")
+import("//testing/test.gni")
 
 # Note this target is missing an implementation for the video capture.
 # Targets must link with either 'video_capture' or
@@ -20,8 +21,8 @@ source_set("video_capture_module") {
     "video_capture_config.h",
     "video_capture_defines.h",
     "video_capture_delay.h",
-    "video_capture_factory.h",
     "video_capture_factory.cc",
+    "video_capture_factory.h",
     "video_capture_impl.cc",
     "video_capture_impl.h",
   ]
@@ -163,4 +164,53 @@ if (!build_with_chromium) {
       configs -= [ "//build/config/clang:find_bad_constructs" ]
     }
   }
+
+  # TODO(mflodman): Change to "if (!is_android)" when tests are working on Mac
+  if (is_linux && rtc_include_tests) {
+    test("video_capture_tests") {
+      sources = [
+        "test/video_capture_main_mac.mm",
+        "test/video_capture_unittest.cc",
+      ]
+
+      cflags = []
+      if (is_linux || is_mac) {
+        cflags += [ "-Wno-write-strings" ]
+      }
+
+      ldflags = []
+      if (is_linux || is_mac) {
+        ldflags += [
+          "-lpthread",
+          "-lm",
+        ]
+      }
+      if (is_linux) {
+        ldflags += [
+          "-lrt",
+          "-lXext",
+          "-lX11",
+        ]
+      }
+
+      deps = [
+        ":video_capture_internal_impl",
+        ":video_capture_module",
+        "//webrtc/modules/utility",
+        "//webrtc/system_wrappers",
+        "//webrtc/test:video_test_common",
+      ]
+      if (!is_mac) {
+        deps += [ "//webrtc/test:test_support_main" ]
+      }
+
+      # TODO(mflodman): Add Mac dependencies / xcode_settings.
+
+      if (is_clang) {
+        # Suppress warnings from Chrome's Clang plugins.
+        # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
+        configs -= [ "//build/config/clang:find_bad_constructs" ]
+      }
+    }
+  }
 }