diff --git a/src/test/kotlin/com/shr4pnel/ferretirc/IrcClientTest.kt b/src/test/kotlin/com/shr4pnel/ferretirc/IrcClientTest.kt
index 0bbff1c..7fa3a0a 100644
--- a/src/test/kotlin/com/shr4pnel/ferretirc/IrcClientTest.kt
+++ b/src/test/kotlin/com/shr4pnel/ferretirc/IrcClientTest.kt
@@ -95,4 +95,23 @@ class IrcClientTest {
             assertEquals(message.message, receivedMessage.message)
             assertEquals(message.target.chanName, receivedMessage.targets.first())
         }
+
+    @Test
+    fun manyMessagesLand() =
+        runTest {
+            val channels = client.server.fetchChannels()
+            val channel = channels.first()
+            val max = 100
+
+            val messages = mutableListOf<Message.PrivMsg>()
+            val receivedMessages = mutableListOf<ServerMessage.PrivMsg>()
+
+            for (i in 1..max) messages.add(Message.PrivMsg(channel, "$i: bring me to life"))
+
+            for (i in 0..<max) {
+                val msg = client.waitForNextAfterAction<ServerMessage.PrivMsg> { guestUser.queueMessage(messages[i]) }
+                receivedMessages.add(msg)
+            }
+            for (i in 0..<max) assertEquals(messages[i].message, receivedMessages[i].message)
+        }
 }