diff --git a/common/src/test.rs b/common/src/test.rs
index 6a77fd42d..c11c692cb 100644
--- a/common/src/test.rs
+++ b/common/src/test.rs
@@ -130,7 +130,7 @@ where
     F: Fn() -> Fut,
     Fut: Future<Output = Option<T>>,
 {
-    crate::time::timeout(crate::time::Duration::from_secs(60), async {
+    crate::time::timeout(crate::time::Duration::from_secs(20), async {
         loop {
             if let Some(r) = f().await {
                 return r;
@@ -148,7 +148,7 @@ where
     F: Fn() -> Fut,
     Fut: Future<Output = Result<T, E>>,
 {
-    crate::time::timeout(crate::time::Duration::from_secs(60), async {
+    crate::time::timeout(crate::time::Duration::from_secs(20), async {
         loop {
             if let Ok(r) = f().await {
                 return r;
@@ -166,7 +166,7 @@ where
     Fut: Future<Output = T>,
     T: std::fmt::Debug + PartialEq,
 {
-    let result = crate::time::timeout(crate::time::Duration::from_secs(60), async {
+    let result = crate::time::timeout(crate::time::Duration::from_secs(20), async {
         loop {
             let result = f().await;
             if expected == result {
diff --git a/xmtp_mls/src/groups/device_sync/consent_sync.rs b/xmtp_mls/src/groups/device_sync/consent_sync.rs
index 357de7b88..965fdb770 100644
--- a/xmtp_mls/src/groups/device_sync/consent_sync.rs
+++ b/xmtp_mls/src/groups/device_sync/consent_sync.rs
@@ -137,7 +137,7 @@ pub(crate) mod tests {
         .await
         .unwrap();
 
-        // Wait up to 3 seconds for sync to process (typically is almost instant)
+        // Wait up to 20 seconds for sync to process (typically is almost instant)
         xmtp_common::wait_for_eq(
             || {
                 let consent_b = amal_b.syncable_consent_records(amal_b_conn).unwrap().len();