diff --git a/app/src/androidTest/java/com/google/android/samples/socialite/data/AppDatabaseTest.kt b/app/src/androidTest/java/com/google/android/samples/socialite/data/AppDatabaseTest.kt
index 01d85156..f6215e46 100644
--- a/app/src/androidTest/java/com/google/android/samples/socialite/data/AppDatabaseTest.kt
+++ b/app/src/androidTest/java/com/google/android/samples/socialite/data/AppDatabaseTest.kt
@@ -46,7 +46,7 @@ class AppDatabaseTest {
         for (detail in chatDetails) {
             assertThat(detail.attendees).hasSize(1)
             val messages = db.messageDao().loadAll(detail.chatWithLastMessage.id)
-            assertThat(messages).hasSize(2)
+            assertThat(messages).hasSize(1)
         }
     }
 }
diff --git a/app/src/androidTest/java/com/google/android/samples/socialite/data/ChatDaoTest.kt b/app/src/androidTest/java/com/google/android/samples/socialite/data/ChatDaoTest.kt
index 30413582..fce02958 100644
--- a/app/src/androidTest/java/com/google/android/samples/socialite/data/ChatDaoTest.kt
+++ b/app/src/androidTest/java/com/google/android/samples/socialite/data/ChatDaoTest.kt
@@ -35,7 +35,7 @@ class ChatDaoTest {
         for (detail in chatDetails) {
             assertThat(detail.attendees).hasSize(1)
             val messages = db.messageDao().loadAll(detail.chatWithLastMessage.id)
-            assertThat(messages).hasSize(2)
+            assertThat(messages).hasSize(1)
         }
     }
 }
diff --git a/app/src/androidTest/java/com/google/android/samples/socialite/repository/ChatRepositoryTest.kt b/app/src/androidTest/java/com/google/android/samples/socialite/repository/ChatRepositoryTest.kt
index d500dec4..36e59fec 100644
--- a/app/src/androidTest/java/com/google/android/samples/socialite/repository/ChatRepositoryTest.kt
+++ b/app/src/androidTest/java/com/google/android/samples/socialite/repository/ChatRepositoryTest.kt
@@ -46,7 +46,7 @@ class ChatRepositoryTest {
     fun findMessages() = runTest {
         val repository = createTestRepository()
         repository.findMessages(1L).test {
-            assertThat(awaitItem()).hasSize(2)
+            assertThat(awaitItem()).hasSize(1)
         }
     }
 }
diff --git a/app/src/androidTest/java/com/google/android/samples/socialite/ui/chat/ChatViewModelTest.kt b/app/src/androidTest/java/com/google/android/samples/socialite/ui/chat/ChatViewModelTest.kt
index 0427d95c..aedf2361 100644
--- a/app/src/androidTest/java/com/google/android/samples/socialite/ui/chat/ChatViewModelTest.kt
+++ b/app/src/androidTest/java/com/google/android/samples/socialite/ui/chat/ChatViewModelTest.kt
@@ -38,7 +38,7 @@ class ChatViewModelTest {
             assertThat(awaitNotNull().firstContact.name).isEqualTo("Cat")
         }
         viewModel.messages.test {
-            assertThat(awaitNotEmpty()).hasSize(2)
+            assertThat(awaitNotEmpty()).hasSize(1)
         }
     }
 }