1 files changed, 4 insertions, 8 deletions
diff --git a/src/ProtocolBuffers.Test/WireFormatTest.cs b/src/ProtocolBuffers.Test/WireFormatTest.cs
index f7ad864e..e390ce0d 100644
--- a/src/ProtocolBuffers.Test/WireFormatTest.cs
+++ b/src/ProtocolBuffers.Test/WireFormatTest.cs
@@ -173,17 +173,13 @@ namespace Google.ProtocolBuffers
             CodedInputStream input = data.CreateCodedInput();
             uint previousTag = 0;
 
-            while (true)
+            uint tag;
+            string name;
+            while (input.ReadTag(out tag, out name))
             {
-                uint tag = input.ReadTag();
-                if (tag == 0)
-                {
-                    break;
-                }
-
                 Assert.IsTrue(tag > previousTag);
                 previousTag = tag;
-                input.SkipField(tag);
+                input.SkipField();
             }
         }