diff --git a/webrtc/video/full_stack_tests.cc b/webrtc/video/full_stack_tests.cc
index b7125d39c9..bda26efab2 100644
--- a/webrtc/video/full_stack_tests.cc
+++ b/webrtc/video/full_stack_tests.cc
@@ -507,7 +507,15 @@ TEST_F(FullStackTest, LargeRoomVP8_5thumb) {
   RunTest(large_room);
 }
 
-TEST_F(FullStackTest, LargeRoomVP8_15thumb) {
+#if defined(WEBRTC_ANDROID) || defined(WEBRTC_WIN)
+// Fails on Android and win:
+// https://bugs.chromium.org/p/webrtc/issues/detail?id=7301
+#define MAYBE_LargeRoomVP8_50thumb DISABLED_LargeRoomVP8_50thumb
+#else
+#define MAYBE_LargeRoomVP8_50thumb LargeRoomVP8_50thumb
+#endif
+
+TEST_F(FullStackTest, MAYBE_LargeRoomVP8_15thumb) {
   VideoQualityTest::Params large_room;
   large_room.call.send_side_bwe = true;
   large_room.video = kSimulcastVp8VideoHigh;
@@ -530,14 +538,6 @@ TEST_F(FullStackTest, LargeRoomVP8_15thumb) {
   RunTest(large_room);
 }
 
-#if defined(WEBRTC_ANDROID) || defined(WEBRTC_WIN)
-// Fails on Android and win:
-// https://bugs.chromium.org/p/webrtc/issues/detail?id=7301
-#define MAYBE_LargeRoomVP8_50thumb DISABLED_LargeRoomVP8_50thumb
-#else
-#define MAYBE_LargeRoomVP8_50thumb LargeRoomVP8_50thumb
-#endif
-
 TEST_F(FullStackTest, MAYBE_LargeRoomVP8_50thumb) {
   VideoQualityTest::Params large_room;
   large_room.call.send_side_bwe = true;
diff --git a/webrtc/video/video_quality_test.cc b/webrtc/video/video_quality_test.cc
index 48347d7b4e..a938bb8a52 100644
--- a/webrtc/video/video_quality_test.cc
+++ b/webrtc/video/video_quality_test.cc
@@ -1515,6 +1515,7 @@ void VideoQualityTest::SetupThumbnailCapturers(size_t num_thumbnail_streams) {
     thumbnail_capturers_.emplace_back(test::FrameGeneratorCapturer::Create(
         static_cast<int>(thumbnail.width), static_cast<int>(thumbnail.height),
         thumbnail.max_framerate, clock_));
+    RTC_DCHECK(thumbnail_capturers_.back());
   }
 }