diff --git a/bramble-core/src/test/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementIntegrationTest.java b/bramble-core/src/test/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementIntegrationTest.java
index d16b6052c..0b8adb015 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementIntegrationTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementIntegrationTest.java
@@ -345,11 +345,12 @@ public class TransportKeyAgreementIntegrationTest
 					.canSendOutgoingStreams(aliceId, DUPLEX_TRANSPORT_ID));
 		}
 
-		// Sync initial client versioning updates
+		// Sync initial client versioning updates and mailbox properties updates
 		syncMessage(alice, bob, bobId, 1, true);
 		syncMessage(bob, alice, aliceId, 1, true);
-		syncMessage(alice, bob, bobId, 1, true);
-		sendAcks(bob, alice, aliceId, 1);
+		syncMessage(alice, bob, bobId, 2, true);
+		syncMessage(bob, alice, aliceId, 1, true);
+		sendAcks(alice, bob, bobId, 1);
 
 		return new Pair<>(aliceId, bobId);
 	}
diff --git a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java
index 29131fe8b..e022adf92 100644
--- a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java
+++ b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java
@@ -1051,11 +1051,12 @@ public class IntroductionIntegrationTest
 				true);
 		contact0From1 = contactManager1.getContact(contactId0From1);
 
-		// Sync initial client versioning updates and transport properties
+		// Sync initial client versioning updates, mailbox properties updates,
+		// and transport properties
 		sync0To1(1, true);
 		sync1To0(1, true);
-		sync0To1(2, true);
-		sync1To0(1, true);
+		sync0To1(3, true);
+		sync1To0(2, true);
 
 		// a new introduction should be possible
 		assertTrue(introductionManager0
diff --git a/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java
index 599ebef07..9226fde90 100644
--- a/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java
+++ b/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java
@@ -172,16 +172,18 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
 				true);
 		contact0From2 = contactManager2.getContact(contactId0From2);
 
-		// Sync initial client versioning updates
+		// Sync initial client versioning updates and mailbox properties updates
 		sync0To1(1, true);
 		sync1To0(1, true);
-		sync0To1(1, true);
-		ack1To0(1);
+		sync0To1(2, true);
+		sync1To0(1, true);
+		ack0To1(1);
 
 		sync0To2(1, true);
 		sync2To0(1, true);
-		sync0To2(1, true);
-		ack2To0(1);
+		sync0To2(2, true);
+		sync2To0(1, true);
+		ack0To2(1);
 	}
 
 	protected void addContacts1And2() throws Exception {
@@ -200,13 +202,16 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
 		// Sync initial client versioning updates
 		sync1To2(1, true);
 		sync2To1(1, true);
+		// Sync 2nd client versioning msg from 1to2, mailbox properties updates,
+		// and transport properties if we should
 		if (haveTransportProperties) {
+			sync1To2(3, true);
+			sync2To1(2, true);
+			ack1To2(2);
+		} else {
 			sync1To2(2, true);
 			sync2To1(1, true);
 			ack1To2(1);
-		} else {
-			sync1To2(1, true);
-			ack2To1(1);
 		}
 	}