diff --git a/src/ProtocolBuffers.Test/CodedInputStreamTest.cs b/src/ProtocolBuffers.Test/CodedInputStreamTest.cs
index 64656b1..ab08df9 100644
--- a/src/ProtocolBuffers.Test/CodedInputStreamTest.cs
+++ b/src/ProtocolBuffers.Test/CodedInputStreamTest.cs
@@ -38,12 +38,12 @@
 using System.Collections.Generic;
 using System.IO;
 using Google.ProtocolBuffers.TestProtos;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Diagnostics;
 
 namespace Google.ProtocolBuffers
 {
-    [TestFixture]
+    [TestClass]
     public class CodedInputStreamTest
     {
         /// <summary>
@@ -136,7 +136,7 @@
             }
         }
 
-        [Test]
+        [TestMethod]
         public void ReadVarint()
         {
             AssertReadVarint(Bytes(0x00), 0);
@@ -214,7 +214,7 @@
             }
         }
 
-        [Test]
+        [TestMethod]
         public void ReadLittleEndian()
         {
             AssertReadLittleEndian32(Bytes(0x78, 0x56, 0x34, 0x12), 0x12345678);
@@ -226,7 +226,7 @@
                 Bytes(0x78, 0x56, 0x34, 0x12, 0xf0, 0xde, 0xbc, 0x9a), 0x9abcdef012345678UL);
         }
 
-        [Test]
+        [TestMethod]
         public void DecodeZigZag32()
         {
             Assert.AreEqual(0, CodedInputStream.DecodeZigZag32(0));
@@ -239,7 +239,7 @@
             Assert.AreEqual(unchecked((int) 0x80000000), CodedInputStream.DecodeZigZag32(0xFFFFFFFF));
         }
 
-        [Test]
+        [TestMethod]
         public void DecodeZigZag64()
         {
             Assert.AreEqual(0, CodedInputStream.DecodeZigZag64(0));
@@ -254,7 +254,7 @@
             Assert.AreEqual(unchecked((long) 0x8000000000000000L), CodedInputStream.DecodeZigZag64(0xFFFFFFFFFFFFFFFFL));
         }
 
-        [Test]
+        [TestMethod]
         public void ReadWholeMessage()
         {
             TestAllTypes message = TestUtil.GetAllSet();
@@ -272,7 +272,7 @@
             }
         }
 
-        [Test]
+        [TestMethod]
         public void SkipWholeMessage()
         {
             TestAllTypes message = TestUtil.GetAllSet();
@@ -301,7 +301,7 @@
         /// Test that a bug in SkipRawBytes has been fixed: if the skip
         /// skips exactly up to a limit, this should bnot break things
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SkipRawBytesBug()
         {
             byte[] rawBytes = new byte[] {1, 2};
@@ -342,7 +342,7 @@
             TestUtil.AssertAllFieldsSet(message3);
         }
 
-        [Test]
+        [TestMethod]
         public void ReadMaliciouslyLargeBlob()
         {
             MemoryStream ms = new MemoryStream();
@@ -400,7 +400,7 @@
             }
         }
 
-        [Test]
+        [TestMethod]
         public void MaliciousRecursion()
         {
             ByteString data64 = MakeRecursiveMessage(64).ToByteString();
@@ -431,7 +431,7 @@
             }
         }
 
-        [Test]
+        [TestMethod]
         public void SizeLimit()
         {
             // Have to use a Stream rather than ByteString.CreateCodedInput as SizeLimit doesn't
@@ -451,7 +451,7 @@
             }
         }
 
-        [Test]
+        [TestMethod]
         public void ResetSizeCounter()
         {
             CodedInputStream input = CodedInputStream.CreateInstance(
@@ -488,7 +488,7 @@
         /// is thrown.  Instead, the invalid bytes are replaced with the Unicode
         /// "replacement character" U+FFFD.
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ReadInvalidUtf8()
         {
             MemoryStream ms = new MemoryStream();
@@ -536,7 +536,7 @@
 
         enum TestNegEnum { None = 0, Value = -2 }
 
-        [Test]
+        [TestMethod]
         public void TestNegativeEnum()
         {
             byte[] bytes = new byte[10] { 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x01 };
@@ -549,7 +549,7 @@
             Assert.AreEqual(TestNegEnum.Value, val);
         }
 
-        [Test]
+        [TestMethod]
         public void TestNegativeEnumPackedArray()
         {
             int arraySize = 1 + (10 * 5);
@@ -577,7 +577,7 @@
             Assert.AreEqual(4, unk.Count);
         }
 
-        [Test]
+        [TestMethod]
         public void TestNegativeEnumArray()
         {
             int arraySize = 1 + 1 + (11 * 5);