diff --git a/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Microsoft.SqlTools.ServiceLayer.PerfTests.csproj b/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Microsoft.SqlTools.ServiceLayer.PerfTests.csproj
index b51f35d3..5a2a50ac 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Microsoft.SqlTools.ServiceLayer.PerfTests.csproj
+++ b/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Microsoft.SqlTools.ServiceLayer.PerfTests.csproj
@@ -21,9 +21,7 @@
 		<ProjectReference Include="../Microsoft.SqlTools.ServiceLayer.Test.Common/Microsoft.SqlTools.ServiceLayer.Test.Common.csproj" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="nunit" />
-		<PackageReference Include="nunit3testadapter" />
-		<PackageReference Include="nunit.console" />
+		<PackageReference Include="xunit" />
 	</ItemGroup>
 	<ItemGroup>
 		<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
diff --git a/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/ConnectionTests.cs b/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/ConnectionTests.cs
index 8094f4b0..fdba32fc 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/ConnectionTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/ConnectionTests.cs
@@ -9,14 +9,14 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.SqlTools.ServiceLayer.Test.Common;
 using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts;
-using NUnit.Framework;
+using Xunit;
 
 namespace Microsoft.SqlTools.ServiceLayer.PerfTests
 {
     public class ConnectionTests
     {
 
-        [Test]
+        [Fact]
         [CreateTestDb(TestServerType.Azure)]
         public async Task ConnectAzureTest()
         {
@@ -53,7 +53,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
             });
         }
 
-        [Test]
+        [Fact]
         [CreateTestDb(TestServerType.OnPrem)]
         public async Task ConnectOnPremTest()
         {
@@ -91,7 +91,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
             });
         }
 
-        [Test]
+        [Fact]
         [CreateTestDb(TestServerType.OnPrem)]
         public async Task DisconnectTest()
         {
diff --git a/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/IntellisenseTests.cs b/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/IntellisenseTests.cs
index b0cb02ac..c141163a 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/IntellisenseTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/IntellisenseTests.cs
@@ -13,14 +13,14 @@ using System.Threading.Tasks;
 using Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Test.Common;
 using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts;
-using NUnit.Framework;
+using Xunit;
 using Range = Microsoft.SqlTools.ServiceLayer.Workspace.Contracts.Range;
 
 namespace Microsoft.SqlTools.ServiceLayer.PerfTests
 {
     public class IntellisenseTests
     {
-        [Test]
+        [Fact]
         [CreateTestDb(TestServerType.OnPrem)]
         public async Task HoverTestOnPrem()
         {
@@ -40,7 +40,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
             });
         }
 
-        [Test]
+        [Fact]
         [CreateTestDb(TestServerType.OnPrem)]
         public async Task SuggestionsTest()
         {
@@ -59,7 +59,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
             });
         }
 
-        [Test]
+        [Fact]
         [CreateTestDb(TestServerType.OnPrem)]
         public async Task DiagnosticsTests()
         {
@@ -114,7 +114,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
             });
         }
 
-        [Test]
+        [Fact]
         [CreateTestDb(TestServerType.Azure)]
         public async Task BindingCacheColdAzureSimpleQuery()
         {
@@ -128,7 +128,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
             });
         }
 
-        [Test]
+        [Fact]
         [CreateTestDb(TestServerType.OnPrem)]
         public async Task BindingCacheColdOnPremSimpleQuery()
         {
@@ -143,7 +143,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
             
         }
 
-        [Test]
+        [Fact]
         [CreateTestDb(TestServerType.Azure)]
         public async Task BindingCacheWarmAzureSimpleQuery()
         {
@@ -159,7 +159,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
             });
         }
 
-        [Test]
+        [Fact]
         [CreateTestDb(TestServerType.OnPrem)]
         public async Task BindingCacheWarmOnPremSimpleQuery()
         {
@@ -176,7 +176,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
             });
         }
 
-        [Test]
+        [Fact]
         [CreateTestDb(TestServerType.Azure)]
         public async Task BindingCacheColdAzureComplexQuery()
         {
@@ -191,7 +191,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
             });
         }
 
-        [Test]
+        [Fact]
         [CreateTestDb(TestServerType.OnPrem)]
         public async Task BindingCacheColdOnPremComplexQuery()
         {
@@ -205,7 +205,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
             });
         }
 
-        [Test]
+        [Fact]
         [CreateTestDb(TestServerType.Azure)]
         public async Task BindingCacheWarmAzureComplexQuery()
         {
@@ -221,7 +221,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
             });
         }
 
-        [Test]
+        [Fact]
         [CreateTestDb(TestServerType.OnPrem)]
         public async Task BindingCacheWarmOnPremComplexQuery()
         {
diff --git a/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/ObjectExplorerTests.cs b/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/ObjectExplorerTests.cs
index b59a971f..495bf683 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/ObjectExplorerTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/ObjectExplorerTests.cs
@@ -11,13 +11,13 @@ using System.Threading.Tasks;
 using Microsoft.SqlTools.ServiceLayer.Connection.Contracts;
 using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Test.Common;
-using NUnit.Framework;
+using Xunit;
 
 namespace Microsoft.SqlTools.ServiceLayer.PerfTests
 {
     public class ObjectExplorerTests
     {
-        [Test]
+        [Fact]
         [CreateTestDb(TestServerType.Azure)]
         public async Task CreateSessionAzure()
         {
@@ -25,7 +25,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
             await VerifyCreateSession(serverType);
         }
 
-        [Test]
+        [Fact]
         [CreateTestDb(TestServerType.OnPrem)]
         public async Task CreateSessionOnPrem()
         {
@@ -33,7 +33,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
             await VerifyCreateSession(serverType);
         }
 
-        [Test]
+        [Fact]
         [CreateTestDb(TestServerType.OnPrem)]
         public async Task ExpandDatabasesOnPrem()
         {
@@ -41,7 +41,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
             await VerifyExpand(serverType, SqlTestDb.MasterDatabaseName);
         }
 
-        [Test]
+        [Fact]
         [CreateTestDb(TestServerType.OnPrem)]
         public async Task ExpandOneDatabaseOnPrem()
         {
@@ -49,7 +49,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
             await VerifyExpand(serverType, Common.PerfTestDatabaseName);
         }
 
-        [Test]
+        [Fact]
         [CreateTestDb(TestServerType.Azure)]
         public async Task ExpandDatabasesAzure()
         {
@@ -57,7 +57,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
             await VerifyExpand(serverType, SqlTestDb.MasterDatabaseName);
         }
 
-        [Test]
+        [Fact]
         [CreateTestDb(TestServerType.Azure)]
         public async Task ExpandOneDatabaseAzure()
         {
diff --git a/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/QueryExecutionTests.cs b/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/QueryExecutionTests.cs
index c2bf81b3..26fca548 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/QueryExecutionTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/QueryExecutionTests.cs
@@ -11,61 +11,61 @@ using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts.ExecuteRequests;
 using Microsoft.SqlTools.ServiceLayer.Test.Common;
-using NUnit.Framework;
+using Xunit;
 
 namespace Microsoft.SqlTools.ServiceLayer.PerfTests
 {
     public class QueryExecutionTests
     {
-        [Test]
+        [Fact]
         public async Task QueryResultSummaryOnPremTest()
         {
             await QueryResultSummaryOnPremTestCore(TestServerType.OnPrem, Scripts.MasterBasicQuery);
         }
 
-        [Test]
+        [Fact]
         public async Task QueryResultFirstOnPremTest()
         {
             await QueryResultFirstOnPremTestCore(TestServerType.OnPrem, Scripts.MasterBasicQuery);
         }
 
-        [Test]
+        [Fact]
         public async Task LongQueryResultSummaryOnPremTest()
         {
             await QueryResultSummaryOnPremTestCore(TestServerType.OnPrem, Scripts.MasterLongQuery);
         }
 
-        [Test]
+        [Fact]
         public async Task LongQueryResultFirstOnPremTest()
         {
             await QueryResultFirstOnPremTestCore(TestServerType.OnPrem, Scripts.MasterLongQuery);
         }
 
-        [Test]
+        [Fact]
         public async Task QueryResultSummaryOnAzureTest()
         {
             await QueryResultSummaryOnPremTestCore(TestServerType.Azure, Scripts.MasterBasicQuery);
         }
 
-        [Test]
+        [Fact]
         public async Task QueryResultFirstOnAzureTest()
         {
             await QueryResultFirstOnPremTestCore(TestServerType.Azure, Scripts.MasterBasicQuery);
         }
 
-        [Test]
+        [Fact]
         public async Task LongQueryResultSummaryOnAzureTest()
         {
             await QueryResultSummaryOnPremTestCore(TestServerType.Azure, Scripts.MasterLongQuery);
         }
 
-        [Test]
+        [Fact]
         public async Task LongQueryResultFirstOnAzureTest()
         {
             await QueryResultFirstOnPremTestCore(TestServerType.Azure, Scripts.MasterLongQuery);
         }
 
-        [Test]
+        [Fact]
         [CreateTestDb(TestServerType.OnPrem)]
         public async Task CancelQueryOnPremTest()
         {
diff --git a/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/SaveResultsTests.cs b/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/SaveResultsTests.cs
index cf55158b..c86cfad9 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/SaveResultsTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/SaveResultsTests.cs
@@ -7,13 +7,13 @@
 
 using System.Threading.Tasks;
 using Microsoft.SqlTools.ServiceLayer.Test.Common;
-using NUnit.Framework;
+using Xunit;
 
 namespace Microsoft.SqlTools.ServiceLayer.PerfTests
 {
     public class SaveResultsTests
     {
-        [Test]
+        [Fact]
         public async Task TestSaveResultsToCsvTest()
         {
             await TestServiceDriverProvider.RunTestIterations(async (timer) =>
@@ -35,7 +35,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
             });
         }
 
-        [Test]
+        [Fact]
         public async Task TestSaveResultsToJsonTest()
         {
             await TestServiceDriverProvider.RunTestIterations(async (timer) =>
diff --git a/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/ScriptinTests.cs b/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/ScriptinTests.cs
index be4a09ee..463d8ee0 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/ScriptinTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/ScriptinTests.cs
@@ -11,13 +11,13 @@ using System.Threading.Tasks;
 using Microsoft.SqlTools.ServiceLayer.Test.Common;
 using Microsoft.SqlTools.SqlCore.Scripting;
 using Microsoft.SqlTools.SqlCore.Scripting.Contracts;
-using NUnit.Framework;
+using Xunit;
 
 namespace Microsoft.SqlTools.ServiceLayer.PerfTests
 {
     public class ScriptingTests
     {
-        [Test]
+        [Fact]
         [CreateTestDb(TestServerType.Azure)]
         public async Task ScripTableAzure()
         {
@@ -25,7 +25,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
             await VerifyScriptTable(serverType);
         }
 
-        [Test]
+        [Fact]
         [CreateTestDb(TestServerType.OnPrem)]
         public async Task ScripTableOnPrem()
         {