diff --git a/VAR.Json.Tests/JsonParser_Tests.cs b/VAR.Json.Tests/JsonParser_Tests.cs
index 965ba0b..511b286 100644
--- a/VAR.Json.Tests/JsonParser_Tests.cs
+++ b/VAR.Json.Tests/JsonParser_Tests.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NUnit.Framework;
 
 namespace VAR.Json.Tests
 {
-    [TestClass()]
+    [TestFixture()]
     public class JsonParser_Tests
     {
         #region Parse
@@ -14,7 +14,7 @@ namespace VAR.Json.Tests
             public int Number { get; set; }
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__SwallowObject()
         {
             JsonParser parser = new JsonParser();
@@ -31,7 +31,7 @@ namespace VAR.Json.Tests
             public SwallowObject Object { get; set; }
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__DeeperObject_L1()
         {
             JsonParser parser = new JsonParser();
@@ -50,7 +50,7 @@ namespace VAR.Json.Tests
             public DeeperObject_L1 Object { get; set; }
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__DeeperObject_L2()
         {
             JsonParser parser = new JsonParser();
@@ -65,7 +65,7 @@ namespace VAR.Json.Tests
             Assert.AreEqual(42, result.Object.Object.Number);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__SwallowObjectArray()
         {
             JsonParser parser = new JsonParser();
@@ -83,7 +83,7 @@ namespace VAR.Json.Tests
             public List<SwallowObject> Array { get; set; }
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__DeeperObjectArray_L1()
         {
             JsonParser parser = new JsonParser();
@@ -102,7 +102,7 @@ namespace VAR.Json.Tests
             public List<DeeperObjectArray_L1> Objects { get; set; }
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__DeeperObjectArray_L2()
         {
             JsonParser parser = new JsonParser();
@@ -121,7 +121,7 @@ namespace VAR.Json.Tests
 
         #region Validity tests
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail01()
         {
             JsonParser parser = new JsonParser();
@@ -129,7 +129,7 @@ namespace VAR.Json.Tests
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail02()
         {
             JsonParser parser = new JsonParser();
@@ -137,7 +137,7 @@ namespace VAR.Json.Tests
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail03()
         {
             JsonParser parser = new JsonParser();
@@ -145,7 +145,7 @@ namespace VAR.Json.Tests
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail04()
         {
             JsonParser parser = new JsonParser();
@@ -153,7 +153,7 @@ namespace VAR.Json.Tests
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail05()
         {
             JsonParser parser = new JsonParser();
@@ -161,7 +161,7 @@ namespace VAR.Json.Tests
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail06()
         {
             JsonParser parser = new JsonParser();
@@ -169,7 +169,7 @@ namespace VAR.Json.Tests
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail07()
         {
             JsonParser parser = new JsonParser();
@@ -177,7 +177,7 @@ namespace VAR.Json.Tests
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail08()
         {
             JsonParser parser = new JsonParser();
@@ -185,7 +185,7 @@ namespace VAR.Json.Tests
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail09()
         {
             JsonParser parser = new JsonParser();
@@ -193,7 +193,7 @@ namespace VAR.Json.Tests
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail10()
         {
             JsonParser parser = new JsonParser();
@@ -201,7 +201,7 @@ namespace VAR.Json.Tests
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail11()
         {
             JsonParser parser = new JsonParser();
@@ -209,7 +209,7 @@ namespace VAR.Json.Tests
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail12()
         {
             JsonParser parser = new JsonParser();
@@ -217,7 +217,7 @@ namespace VAR.Json.Tests
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail13()
         {
             JsonParser parser = new JsonParser();
@@ -225,7 +225,7 @@ namespace VAR.Json.Tests
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail14()
         {
             JsonParser parser = new JsonParser();
@@ -233,7 +233,7 @@ namespace VAR.Json.Tests
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail15()
         {
             JsonParser parser = new JsonParser();
@@ -241,7 +241,7 @@ namespace VAR.Json.Tests
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail16()
         {
             JsonParser parser = new JsonParser();
@@ -249,7 +249,7 @@ namespace VAR.Json.Tests
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail17()
         {
             JsonParser parser = new JsonParser();
@@ -257,7 +257,7 @@ namespace VAR.Json.Tests
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail18()
         {
             JsonParser parser = new JsonParser();
@@ -265,7 +265,7 @@ namespace VAR.Json.Tests
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail19()
         {
             JsonParser parser = new JsonParser();
@@ -273,7 +273,7 @@ namespace VAR.Json.Tests
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail20()
         {
             JsonParser parser = new JsonParser();
@@ -281,7 +281,7 @@ namespace VAR.Json.Tests
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail21()
         {
             JsonParser parser = new JsonParser();
@@ -289,7 +289,7 @@ namespace VAR.Json.Tests
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail22()
         {
             JsonParser parser = new JsonParser();
@@ -297,7 +297,7 @@ namespace VAR.Json.Tests
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail23()
         {
             JsonParser parser = new JsonParser();
@@ -305,7 +305,7 @@ namespace VAR.Json.Tests
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail24()
         {
             JsonParser parser = new JsonParser();
@@ -313,7 +313,7 @@ namespace VAR.Json.Tests
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail25()
         {
             JsonParser parser = new JsonParser();
@@ -321,7 +321,7 @@ namespace VAR.Json.Tests
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail26()
         {
             JsonParser parser = new JsonParser();
@@ -329,7 +329,7 @@ namespace VAR.Json.Tests
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail27()
         {
             JsonParser parser = new JsonParser();
@@ -338,7 +338,7 @@ break""]");
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail28()
         {
             JsonParser parser = new JsonParser();
@@ -347,7 +347,7 @@ break""]");
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail29()
         {
             JsonParser parser = new JsonParser();
@@ -355,7 +355,7 @@ break""]");
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail30()
         {
             JsonParser parser = new JsonParser();
@@ -363,7 +363,7 @@ break""]");
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail31()
         {
             JsonParser parser = new JsonParser();
@@ -371,7 +371,7 @@ break""]");
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail32()
         {
             JsonParser parser = new JsonParser();
@@ -379,7 +379,7 @@ break""]");
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Fail33()
         {
             JsonParser parser = new JsonParser();
@@ -387,7 +387,7 @@ break""]");
             Assert.AreEqual(true, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Pass01()
         {
             JsonParser parser = new JsonParser();
@@ -452,7 +452,7 @@ break""]");
             Assert.AreEqual(false, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Pass02()
         {
             JsonParser parser = new JsonParser();
@@ -460,7 +460,7 @@ break""]");
             Assert.AreEqual(false, parser.Tainted);
         }
 
-        [TestMethod()]
+        [Test()]
         public void Parse__Validity_Pass03()
         {
             JsonParser parser = new JsonParser();
diff --git a/VAR.Json.Tests/VAR.Json.Tests.csproj b/VAR.Json.Tests/VAR.Json.Tests.csproj
index ec600e3..9066ef0 100644
--- a/VAR.Json.Tests/VAR.Json.Tests.csproj
+++ b/VAR.Json.Tests/VAR.Json.Tests.csproj
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.props')" />
+  <Import Project="..\packages\NUnit3TestAdapter.4.0.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.4.0.0\build\net35\NUnit3TestAdapter.props')" />
+  <Import Project="..\packages\NUnit.3.13.2\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.13.2\build\NUnit.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -39,11 +40,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.1.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.1.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.13.2.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.13.2\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>
@@ -92,10 +90,9 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.props'))" />
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.targets'))" />
+    <Error Condition="!Exists('..\packages\NUnit.3.13.2\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.13.2\build\NUnit.props'))" />
+    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.4.0.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.4.0.0\build\net35\NUnit3TestAdapter.props'))" />
   </Target>
-  <Import Project="..\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/VAR.Json.Tests/packages.config b/VAR.Json.Tests/packages.config
index 6eebc36..ac9ccc4 100644
--- a/VAR.Json.Tests/packages.config
+++ b/VAR.Json.Tests/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MSTest.TestAdapter" version="2.1.1" targetFramework="net461" />
-  <package id="MSTest.TestFramework" version="2.1.1" targetFramework="net461" />
+  <package id="NUnit" version="3.13.2" targetFramework="net461" />
+  <package id="NUnit3TestAdapter" version="4.0.0" targetFramework="net461" />
 </packages>
\ No newline at end of file