diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f4a0d47a00..311e7299b4b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -218,6 +218,17 @@ if(CXX_CLANG)
   )
 endif()
 
+# Fix up targets included by boringssl (ver: b9232f9e27e5668bc0414879dcdedb2a59ea75f2)
+# We might be able to remove this with newer versions.
+if(CXX_CLANG)
+  if(TARGET crypto)
+    target_compile_options(
+      crypto PRIVATE
+      -Wno-unused-but-set-variable
+    )
+  endif()
+endif()
+
 if(MSVC)
   # Disable warnings about unsafe use of std::copy
   target_compile_definitions(
diff --git a/Firestore/Example/Tests/Integration/API/FIRAggregateTests.mm b/Firestore/Example/Tests/Integration/API/FIRAggregateTests.mm
index bd326f0ac36..30441a2534c 100644
--- a/Firestore/Example/Tests/Integration/API/FIRAggregateTests.mm
+++ b/Firestore/Example/Tests/Integration/API/FIRAggregateTests.mm
@@ -24,6 +24,8 @@
 #import "Firestore/Source/API/FIRAggregateQuerySnapshot+Internal.h"
 #import "Firestore/Source/API/FIRQuery+Internal.h"
 
+#include "Firestore/core/src/util/sanitizers.h"
+
 #import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h"
 
 @interface FIRAggregateTests : FSTIntegrationTestCase
@@ -306,6 +308,8 @@ - (void)testCanRunEmptyAggregateQuery {
   XCTAssertTrue([[result localizedDescription] containsString:@"Aggregations can not be empty"]);
 }
 
+// (TODO:b/283101111): Try thread sanitizer to see if timeout on Github Actions is gone.
+#if !defined(THREAD_SANITIZER)
 - (void)testAggregateFieldQuerySnapshotEquality {
   // TODO(sum/avg) remove the check below when sum and avg are supported in production
   XCTSkipIf(![FSTIntegrationTestCase isRunningAgainstEmulator], @"only tested against emulator");
@@ -381,6 +385,7 @@ - (void)testAggregateFieldQuerySnapshotEquality {
   XCTAssertNotEqual([snapshot1 hash], [snapshot4 hash]);
   XCTAssertNotEqual([snapshot3 hash], [snapshot4 hash]);
 }
+#endif  // #if !defined(THREAD_SANITIZER)
 
 - (void)testAllowsAliasesLongerThan1500Bytes {
   // TODO(sum/avg) remove the check below when sum and avg are supported in production