diff --git a/test/scenario/quality_stats.cc b/test/scenario/quality_stats.cc
index dbfd9ff36d..61d6edd13c 100644
--- a/test/scenario/quality_stats.cc
+++ b/test/scenario/quality_stats.cc
@@ -28,7 +28,7 @@ VideoFrameMatcher::VideoFrameMatcher(
     : frame_pair_handlers_(frame_pair_handlers), task_queue_("VideoAnalyzer") {}
 
 VideoFrameMatcher::~VideoFrameMatcher() {
-  task_queue_.SendTask([] {});
+  task_queue_.SendTask([this] { Finalize(); });
 }
 
 void VideoFrameMatcher::RegisterLayer(int layer_id) {
diff --git a/test/scenario/quality_stats_unittest.cc b/test/scenario/quality_stats_unittest.cc
index cdd2519222..bef9f4b6cc 100644
--- a/test/scenario/quality_stats_unittest.cc
+++ b/test/scenario/quality_stats_unittest.cc
@@ -40,7 +40,7 @@ TEST(ScenarioAnalyzerTest, PsnrIsHighWhenNetworkIsGood) {
   }
   // This is mainty a regression test, the target is based on previous runs and
   // might change due to changes in configuration and encoder etc.
-  EXPECT_GT(analyzer.stats().psnr.Mean(), 45);
+  EXPECT_GT(analyzer.stats().psnr.Mean(), 40);
 }
 
 TEST(ScenarioAnalyzerTest, PsnrIsLowWhenNetworkIsBad) {
@@ -55,7 +55,7 @@ TEST(ScenarioAnalyzerTest, PsnrIsLowWhenNetworkIsBad) {
   }
   // This is mainty a regression test, the target is based on previous runs and
   // might change due to changes in configuration and encoder etc.
-  EXPECT_LT(analyzer.stats().psnr.Mean(), 43);
+  EXPECT_LT(analyzer.stats().psnr.Mean(), 30);
 }
 }  // namespace test
 }  // namespace webrtc
diff --git a/test/scenario/scenario_unittest.cc b/test/scenario/scenario_unittest.cc
index 8d43007469..2b1cec6394 100644
--- a/test/scenario/scenario_unittest.cc
+++ b/test/scenario/scenario_unittest.cc
@@ -83,7 +83,7 @@ void SetupVideoCall(Scenario& s, VideoQualityAnalyzer* analyzer) {
 }
 }  // namespace
 
-TEST(ScenarioTest, SimTimeEncoding) {
+TEST(ScenarioTest, MAYBE_SimTimeEncoding) {
   VideoQualityAnalyzerConfig analyzer_config;
   analyzer_config.psnr_coverage = 0.1;
   VideoQualityAnalyzer analyzer(analyzer_config);
@@ -97,7 +97,12 @@ TEST(ScenarioTest, SimTimeEncoding) {
   EXPECT_EQ(analyzer.stats().lost_count, 0);
 }
 
-TEST(ScenarioTest, RealTimeEncoding) {
+#if defined(WEBRTC_IOS) && defined(WEBRTC_ARCH_ARM64) && !defined(NDEBUG)
+#define MAYBE_RealTimeEncoding DISABLED_RealTimeEncoding
+#else
+#define MAYBE_RealTimeEncoding RealTimeEncoding
+#endif
+TEST(ScenarioTest, MAYBE_RealTimeEncoding) {
   VideoQualityAnalyzerConfig analyzer_config;
   analyzer_config.psnr_coverage = 0.1;
   VideoQualityAnalyzer analyzer(analyzer_config);