diff --git a/SMBLibrary.Tests/AesCcmTests.cs b/SMBLibrary.Tests/AesCcmTests.cs
index 5482027..6b4d75f 100644
--- a/SMBLibrary.Tests/AesCcmTests.cs
+++ b/SMBLibrary.Tests/AesCcmTests.cs
@@ -4,12 +4,12 @@
  * the GNU Lesser Public License as published by the Free Software Foundation,
  * either version 3 of the License, or (at your option) any later version.
  */
-using System;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Utilities;
 
 namespace SMBLibrary.Tests
 {
+    [TestClass]
     public class AesCcmTests
     {
         [TestMethod]
diff --git a/SMBLibrary.Tests/Components/Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll b/SMBLibrary.Tests/Components/Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll
deleted file mode 100644
index 387ad78..0000000
Binary files a/SMBLibrary.Tests/Components/Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll and /dev/null differ
diff --git a/SMBLibrary.Tests/NetBiosTests.cs b/SMBLibrary.Tests/NetBiosTests.cs
index d3f8fc4..8e7064a 100644
--- a/SMBLibrary.Tests/NetBiosTests.cs
+++ b/SMBLibrary.Tests/NetBiosTests.cs
@@ -5,7 +5,6 @@
  * either version 3 of the License, or (at your option) any later version.
  */
 using System;
-using System.Collections.Generic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using SMBLibrary.NetBios;
 using Utilities;
diff --git a/SMBLibrary.Tests/Program.cs b/SMBLibrary.Tests/Program.cs
deleted file mode 100644
index db4b0bc..0000000
--- a/SMBLibrary.Tests/Program.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-namespace SMBLibrary.Tests
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            new NTLMAuthenticationTests().TestAll();
-            new NTLMSigningTests().TestAll();
-            new AesCcmTests().TestAll();
-            new SMB2EncryptionTests().TestAll();
-            new RC4Tests().TestAll();
-            
-            new NetBiosTests().TestAll();
-            new RPCTests().TestAll();
-            new SMB2SigningTests().TestAll();
-
-            new NTDirectoryFileSystemTests().TestAll();
-        }
-    }
-}
diff --git a/SMBLibrary.Tests/RPCTests.cs b/SMBLibrary.Tests/RPCTests.cs
index bcda875..85ccdbb 100644
--- a/SMBLibrary.Tests/RPCTests.cs
+++ b/SMBLibrary.Tests/RPCTests.cs
@@ -4,12 +4,8 @@
  * the GNU Lesser Public License as published by the Free Software Foundation,
  * either version 3 of the License, or (at your option) any later version.
  */
-using System;
-using System.Collections.Generic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using SMBLibrary.RPC;
 using SMBLibrary.Services;
-using Utilities;
 
 namespace SMBLibrary.Tests
 {
diff --git a/SMBLibrary.Tests/SMB2SigningTests.cs b/SMBLibrary.Tests/SMB2SigningTests.cs
index a61c63f..de9a2a3 100644
--- a/SMBLibrary.Tests/SMB2SigningTests.cs
+++ b/SMBLibrary.Tests/SMB2SigningTests.cs
@@ -4,9 +4,6 @@
  * the GNU Lesser Public License as published by the Free Software Foundation,
  * either version 3 of the License, or (at your option) any later version.
  */
-using System;
-using System.Collections.Generic;
-using System.Security.Cryptography;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using SMBLibrary.SMB2;
 using Utilities;
diff --git a/SMBLibrary.Tests/SMBLibrary.Tests.csproj b/SMBLibrary.Tests/SMBLibrary.Tests.csproj
index 6958ab1..d32c24b 100644
--- a/SMBLibrary.Tests/SMBLibrary.Tests.csproj
+++ b/SMBLibrary.Tests/SMBLibrary.Tests.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net40</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <AssemblyName>SMBLibrary.Tests</AssemblyName>
     <RootNamespace>SMBLibrary.Tests</RootNamespace>
-    <OutputType>Exe</OutputType>
+    <OutputType>Library</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,9 +17,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework">
-      <HintPath>Components\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll</HintPath>
-    </Reference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file