diff --git a/src/BizHawk.Tests/Client.Common/Movie/ZwinderStateManagerTests.cs b/src/BizHawk.Tests/Client.Common/Movie/ZwinderStateManagerTests.cs
index 024c7fd155..ef0471e78f 100644
--- a/src/BizHawk.Tests/Client.Common/Movie/ZwinderStateManagerTests.cs
+++ b/src/BizHawk.Tests/Client.Common/Movie/ZwinderStateManagerTests.cs
@@ -119,11 +119,17 @@ namespace BizHawk.Tests.Client.Common.Movie
 				buff.Capture(frame, (s) => ss.SaveStateBinary(new BinaryWriter(s)));
 			}
 			// states are 504 bytes large, buffer is 1048576 bytes large
-			Assert.AreEqual(buff.Count, 2080);
-			Assert.AreEqual(buff.GetState(0).Frame, 10);
-			Assert.AreEqual(buff.GetState(2079).Frame, 2089);
-			Assert.AreEqual(StateSource.GetFrameNumberInState(buff.GetState(0).GetReadStream()), 10);
-			Assert.AreEqual(StateSource.GetFrameNumberInState(buff.GetState(2079).GetReadStream()), 2089);
+			Assert.AreEqual(2080, buff.Count, "buff.Count");
+			Assert.AreEqual(10, buff.GetState(0).Frame, "buff.GetState(0).Frame");
+			Assert.AreEqual(2089, buff.GetState(2079).Frame, "buff.GetState(2079).Frame");
+			Assert.AreEqual(
+				10,
+				StateSource.GetFrameNumberInState(buff.GetState(0).GetReadStream()),
+				"buff.GetState(0).ReadFrame()");
+			Assert.AreEqual(
+				2089,
+				StateSource.GetFrameNumberInState(buff.GetState(2079).GetReadStream()),
+				"buff.GetState(2079).ReadFrame()");
 
 			var ms = new MemoryStream();
 			buff.SaveStateBinary(new BinaryWriter(ms));
@@ -132,11 +138,17 @@ namespace BizHawk.Tests.Client.Common.Movie
 
 			Assert.AreEqual(buff.Size, buff2.Size);
 			Assert.AreEqual(buff.Used, buff2.Used);
-			Assert.AreEqual(buff2.Count, 2080);
-			Assert.AreEqual(buff2.GetState(0).Frame, 10);
-			Assert.AreEqual(buff2.GetState(2079).Frame, 2089);
-			Assert.AreEqual(StateSource.GetFrameNumberInState(buff2.GetState(0).GetReadStream()), 10);
-			Assert.AreEqual(StateSource.GetFrameNumberInState(buff2.GetState(2079).GetReadStream()), 2089);
+			Assert.AreEqual(2080, buff2.Count, "buff2.Count");
+			Assert.AreEqual(10, buff2.GetState(0).Frame, "buff2.GetState(0).Frame");
+			Assert.AreEqual(2089, buff2.GetState(2079).Frame, "buff2.GetState(2079).Frame");
+			Assert.AreEqual(
+				10,
+				StateSource.GetFrameNumberInState(buff2.GetState(0).GetReadStream()),
+				"buff2.GetState(0).ReadFrame()");
+			Assert.AreEqual(
+				2089,
+				StateSource.GetFrameNumberInState(buff2.GetState(2079).GetReadStream()),
+				"buff2.GetState(2079).ReadFrame()");
 		}
 
 		[TestMethod]