diff --git a/src/ProtocolBuffers.Test/CSharpOptionsTest.cs b/src/ProtocolBuffers.Test/CSharpOptionsTest.cs
index 3901933..752d9a0 100644
--- a/src/ProtocolBuffers.Test/CSharpOptionsTest.cs
+++ b/src/ProtocolBuffers.Test/CSharpOptionsTest.cs
@@ -36,14 +36,14 @@
 
 using Google.ProtocolBuffers.DescriptorProtos;
 using Google.ProtocolBuffers.Descriptors;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Google.ProtocolBuffers
 {
-    [TestFixture]
+    [TestClass]
     public class DescriptorUtilTest
     {
-        [Test]
+        [TestMethod]
         public void ExplicitNamespace()
         {
             FileDescriptorProto proto = new FileDescriptorProto.Builder
@@ -60,7 +60,7 @@
             Assert.AreEqual("Foo.Bar", descriptor.CSharpOptions.Namespace);
         }
 
-        [Test]
+        [TestMethod]
         public void NoNamespaceFallsBackToPackage()
         {
             FileDescriptorProto proto = new FileDescriptorProto.Builder {Name = "x", Package = "pack"}.Build();
@@ -68,7 +68,7 @@
             Assert.AreEqual("pack", descriptor.CSharpOptions.Namespace);
         }
 
-        [Test]
+        [TestMethod]
         public void NoNamespaceOrPackageFallsBackToEmptyString()
         {
             FileDescriptorProto proto = new FileDescriptorProto.Builder {Name = "x"}.Build();
@@ -76,7 +76,7 @@
             Assert.AreEqual("", descriptor.CSharpOptions.Namespace);
         }
 
-        [Test]
+        [TestMethod]
         public void ExplicitlyNamedFileClass()
         {
             FileDescriptorProto proto = new FileDescriptorProto.Builder
@@ -92,7 +92,7 @@
             Assert.AreEqual("Foo", descriptor.CSharpOptions.UmbrellaClassname);
         }
 
-        [Test]
+        [TestMethod]
         public void ImplicitFileClassWithProtoSuffix()
         {
             FileDescriptorProto proto = new FileDescriptorProto.Builder {Name = "foo_bar.proto"}.Build();
@@ -100,7 +100,7 @@
             Assert.AreEqual("FooBar", descriptor.CSharpOptions.UmbrellaClassname);
         }
 
-        [Test]
+        [TestMethod]
         public void ImplicitFileClassWithProtoDevelSuffix()
         {
             FileDescriptorProto proto = new FileDescriptorProto.Builder {Name = "foo_bar.protodevel"}.Build();
@@ -108,7 +108,7 @@
             Assert.AreEqual("FooBar", descriptor.CSharpOptions.UmbrellaClassname);
         }
 
-        [Test]
+        [TestMethod]
         public void ImplicitFileClassWithNoSuffix()
         {
             FileDescriptorProto proto = new FileDescriptorProto.Builder {Name = "foo_bar"}.Build();
@@ -116,7 +116,7 @@
             Assert.AreEqual("FooBar", descriptor.CSharpOptions.UmbrellaClassname);
         }
 
-        [Test]
+        [TestMethod]
         public void ImplicitFileClassWithDirectoryStructure()
         {
             FileDescriptorProto proto = new FileDescriptorProto.Builder {Name = "x/y/foo_bar"}.Build();