diff --git a/Assets/Tests/SocketLayer/AckSystem/AckSystemTest_BufferSize.cs b/Assets/Tests/SocketLayer/AckSystem/AckSystemTest_BufferSize.cs
index ee04032962..663ad4a85c 100644
--- a/Assets/Tests/SocketLayer/AckSystem/AckSystemTest_BufferSize.cs
+++ b/Assets/Tests/SocketLayer/AckSystem/AckSystemTest_BufferSize.cs
@@ -28,7 +28,7 @@ public void ThrowsIfTooManyMessageAreSent()
                 instance.ackSystem.Update();
             }
 
-            var exception = Assert.Throws<InvalidOperationException>(() =>
+            var exception = Assert.Throws<BufferFullException>(() =>
             {
                 instance.ackSystem.SendReliable(createRandomData(51));
                 instance.ackSystem.Update();
@@ -59,12 +59,12 @@ public void ThrowIfRingBufferIsfull()
                 instance.ackSystem.Update();
             }
 
-            var exception = Assert.Throws<InvalidOperationException>(() =>
+            var exception = Assert.Throws<BufferFullException>(() =>
             {
                 instance.ackSystem.SendReliable(createRandomData(0));
                 instance.ackSystem.Update();
             });
-            var expected = new InvalidOperationException($"Sent queue is full for {instance.connection}");
+            var expected = new BufferFullException($"Sent queue is full for {instance.connection}");
             Assert.That(exception, Has.Message.EqualTo(expected.Message));
         }
     }
diff --git a/Assets/Tests/SocketLayer/AckSystem/NoReliableConnectionTest.cs b/Assets/Tests/SocketLayer/AckSystem/NoReliableConnectionTest.cs
index 9bb8ecdacf..f9a222d485 100644
--- a/Assets/Tests/SocketLayer/AckSystem/NoReliableConnectionTest.cs
+++ b/Assets/Tests/SocketLayer/AckSystem/NoReliableConnectionTest.cs
@@ -63,7 +63,7 @@ public void ThrowsIfTooBig()
             // 3 byte header, so max size is over max
             var bigBuffer = new byte[MAX_PACKET_SIZE - 2];
 
-            var exception = Assert.Throws<ArgumentException>(() =>
+            var exception = Assert.Throws<MessageSizeException>(() =>
             {
                 _connection.SendReliable(bigBuffer);
             });
diff --git a/Assets/Tests/SocketLayer/PeerTestSendReceive.cs b/Assets/Tests/SocketLayer/PeerTestSendReceive.cs
index 5e3f76d116..e172e4e57e 100644
--- a/Assets/Tests/SocketLayer/PeerTestSendReceive.cs
+++ b/Assets/Tests/SocketLayer/PeerTestSendReceive.cs
@@ -325,7 +325,7 @@ public void FragmentedSendThrowsIfTooBig()
         {
             var message = Enumerable.Range(10, maxFragmentMessageSize + 1).Select(x => (byte)x).ToArray();
 
-            Assert.Throws<ArgumentException>(() =>
+            Assert.Throws<MessageSizeException>(() =>
             {
                 serverConnections[0].SendReliable(message);
             });