diff --git a/src/Cassandra.IntegrationTests/Ado/AdoBasicTests.cs b/src/Cassandra.IntegrationTests/Ado/AdoBasicTests.cs
index 5391fdf34..328046616 100644
--- a/src/Cassandra.IntegrationTests/Ado/AdoBasicTests.cs
+++ b/src/Cassandra.IntegrationTests/Ado/AdoBasicTests.cs
@@ -21,6 +21,7 @@
 using Cassandra.IntegrationTests.SimulacronAPI.Models.Logs;
 using Cassandra.IntegrationTests.TestBase;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Data
 {
diff --git a/src/Cassandra.IntegrationTests/BaseIntegrationTest.cs b/src/Cassandra.IntegrationTests/BaseIntegrationTest.cs
index 28e6c2a56..7063b057c 100644
--- a/src/Cassandra.IntegrationTests/BaseIntegrationTest.cs
+++ b/src/Cassandra.IntegrationTests/BaseIntegrationTest.cs
@@ -20,6 +20,7 @@
 using Cassandra.IntegrationTests.TestBase;
 using Cassandra.IntegrationTests.TestClusterManagement;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests
 {
diff --git a/src/Cassandra.IntegrationTests/Cassandra.IntegrationTests.csproj b/src/Cassandra.IntegrationTests/Cassandra.IntegrationTests.csproj
index dd36f747f..891acaaf3 100644
--- a/src/Cassandra.IntegrationTests/Cassandra.IntegrationTests.csproj
+++ b/src/Cassandra.IntegrationTests/Cassandra.IntegrationTests.csproj
@@ -62,7 +62,7 @@
     <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageReference Include="Moq" Version="4.7.99" />
-    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit" Version="4.4.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
     <PackageReference Include="NunitXml.TestLogger" Version="6.1.0" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
diff --git a/src/Cassandra.IntegrationTests/Core/BasicTypeTests.cs b/src/Cassandra.IntegrationTests/Core/BasicTypeTests.cs
index 1f9d47df4..2f519531d 100644
--- a/src/Cassandra.IntegrationTests/Core/BasicTypeTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/BasicTypeTests.cs
@@ -23,6 +23,7 @@
 using Cassandra.IntegrationTests.TestBase;
 using Cassandra.IntegrationTests.SimulacronAPI.Models.Logs;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/BatchStatementSimulacron.cs b/src/Cassandra.IntegrationTests/Core/BatchStatementSimulacron.cs
index fadc7af07..bab36dd96 100644
--- a/src/Cassandra.IntegrationTests/Core/BatchStatementSimulacron.cs
+++ b/src/Cassandra.IntegrationTests/Core/BatchStatementSimulacron.cs
@@ -21,6 +21,7 @@
 using Cassandra.IntegrationTests.TestClusterManagement.Simulacron;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/BatchStatements.cs b/src/Cassandra.IntegrationTests/Core/BatchStatements.cs
index f24138882..532288a74 100644
--- a/src/Cassandra.IntegrationTests/Core/BatchStatements.cs
+++ b/src/Cassandra.IntegrationTests/Core/BatchStatements.cs
@@ -24,6 +24,7 @@
 using Cassandra.Serialization;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/BuilderSimulacronTests.cs b/src/Cassandra.IntegrationTests/Core/BuilderSimulacronTests.cs
index 07723010b..5fa89047d 100644
--- a/src/Cassandra.IntegrationTests/Core/BuilderSimulacronTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/BuilderSimulacronTests.cs
@@ -16,6 +16,7 @@
 
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/ClientTimeoutTests.cs b/src/Cassandra.IntegrationTests/Core/ClientTimeoutTests.cs
index 2dfb40e87..a54413bfc 100644
--- a/src/Cassandra.IntegrationTests/Core/ClientTimeoutTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/ClientTimeoutTests.cs
@@ -27,6 +27,7 @@
 using Cassandra.Tests;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/ClientWarningsTests.cs b/src/Cassandra.IntegrationTests/Core/ClientWarningsTests.cs
index 58d37bfe8..9bc575ff8 100644
--- a/src/Cassandra.IntegrationTests/Core/ClientWarningsTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/ClientWarningsTests.cs
@@ -23,6 +23,9 @@
 using Cassandra.IntegrationTests.TestClusterManagement;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using StringAssert = NUnit.Framework.Legacy.StringAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/ClusterPeersV2SimulacronTests.cs b/src/Cassandra.IntegrationTests/Core/ClusterPeersV2SimulacronTests.cs
index 519e9cd37..881ab848b 100644
--- a/src/Cassandra.IntegrationTests/Core/ClusterPeersV2SimulacronTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/ClusterPeersV2SimulacronTests.cs
@@ -19,6 +19,7 @@
 using Cassandra.IntegrationTests.TestClusterManagement.Simulacron;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/ClusterSimulacronTests.cs b/src/Cassandra.IntegrationTests/Core/ClusterSimulacronTests.cs
index 577af44df..5ea8dfe49 100644
--- a/src/Cassandra.IntegrationTests/Core/ClusterSimulacronTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/ClusterSimulacronTests.cs
@@ -28,6 +28,7 @@
 using Cassandra.Tests;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/ClusterTests.cs b/src/Cassandra.IntegrationTests/Core/ClusterTests.cs
index 11395ec9f..2647b34df 100644
--- a/src/Cassandra.IntegrationTests/Core/ClusterTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/ClusterTests.cs
@@ -26,6 +26,7 @@
 using Cassandra.IntegrationTests.TestClusterManagement.Simulacron;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/CollectionsNestedTests.cs b/src/Cassandra.IntegrationTests/Core/CollectionsNestedTests.cs
index b8f2e7209..3d0371194 100644
--- a/src/Cassandra.IntegrationTests/Core/CollectionsNestedTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/CollectionsNestedTests.cs
@@ -20,6 +20,9 @@
 using Cassandra.IntegrationTests.TestBase;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using StringAssert = NUnit.Framework.Legacy.StringAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 #pragma warning disable 618
 
 namespace Cassandra.IntegrationTests.Core
diff --git a/src/Cassandra.IntegrationTests/Core/CollectionsTests.cs b/src/Cassandra.IntegrationTests/Core/CollectionsTests.cs
index e11dea5e0..b33504f9f 100644
--- a/src/Cassandra.IntegrationTests/Core/CollectionsTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/CollectionsTests.cs
@@ -24,6 +24,8 @@
 using Cassandra.IntegrationTests.TestBase;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs b/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs
index 0894bea5b..76881b492 100644
--- a/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs
@@ -27,6 +27,8 @@
 using Castle.Core;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/ConnectionTests.cs b/src/Cassandra.IntegrationTests/Core/ConnectionTests.cs
index e1f547e47..f0f48646f 100644
--- a/src/Cassandra.IntegrationTests/Core/ConnectionTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/ConnectionTests.cs
@@ -16,6 +16,9 @@
 
 using Cassandra.IntegrationTests.TestClusterManagement;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using StringAssert = NUnit.Framework.Legacy.StringAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
diff --git a/src/Cassandra.IntegrationTests/Core/ConnectionTimeoutTest.cs b/src/Cassandra.IntegrationTests/Core/ConnectionTimeoutTest.cs
index 7f365bf49..9f9b14fa3 100644
--- a/src/Cassandra.IntegrationTests/Core/ConnectionTimeoutTest.cs
+++ b/src/Cassandra.IntegrationTests/Core/ConnectionTimeoutTest.cs
@@ -15,6 +15,7 @@
 //
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 using System.Diagnostics;
 using System.Threading.Tasks;
 using Cassandra.IntegrationTests.TestBase;
diff --git a/src/Cassandra.IntegrationTests/Core/ConsistencyTests.cs b/src/Cassandra.IntegrationTests/Core/ConsistencyTests.cs
index c89d89194..c0a7b1597 100644
--- a/src/Cassandra.IntegrationTests/Core/ConsistencyTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/ConsistencyTests.cs
@@ -15,6 +15,7 @@
 //
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 using System.Linq;
 using Cassandra.IntegrationTests.SimulacronAPI.Models.Logs;
 using Cassandra.IntegrationTests.TestBase;
diff --git a/src/Cassandra.IntegrationTests/Core/ControlConnectionSimulatorTests.cs b/src/Cassandra.IntegrationTests/Core/ControlConnectionSimulatorTests.cs
index 3cf679d6f..36d85584c 100644
--- a/src/Cassandra.IntegrationTests/Core/ControlConnectionSimulatorTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/ControlConnectionSimulatorTests.cs
@@ -26,6 +26,7 @@
 using Cassandra.Tests;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/ControlConnectionTests.cs b/src/Cassandra.IntegrationTests/Core/ControlConnectionTests.cs
index fd9801ffc..931f396e3 100644
--- a/src/Cassandra.IntegrationTests/Core/ControlConnectionTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/ControlConnectionTests.cs
@@ -22,6 +22,7 @@
 using Cassandra.IntegrationTests.TestBase;
 using Cassandra.ProtocolEvents;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 using Cassandra.IntegrationTests.TestClusterManagement;
 using Cassandra.SessionManagement;
 using Cassandra.Tests;
diff --git a/src/Cassandra.IntegrationTests/Core/CustomPayloadTests.cs b/src/Cassandra.IntegrationTests/Core/CustomPayloadTests.cs
index 1e79284e7..804c2a249 100644
--- a/src/Cassandra.IntegrationTests/Core/CustomPayloadTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/CustomPayloadTests.cs
@@ -22,6 +22,8 @@
 using Cassandra.IntegrationTests.TestClusterManagement;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/EmptyColumnTests.cs b/src/Cassandra.IntegrationTests/Core/EmptyColumnTests.cs
index 2d59c14df..50815c261 100644
--- a/src/Cassandra.IntegrationTests/Core/EmptyColumnTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/EmptyColumnTests.cs
@@ -24,6 +24,7 @@
 using Cassandra.IntegrationTests.TestClusterManagement.Simulacron;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/ExceptionsTests.cs b/src/Cassandra.IntegrationTests/Core/ExceptionsTests.cs
index f3d4f7139..0a724bda4 100644
--- a/src/Cassandra.IntegrationTests/Core/ExceptionsTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/ExceptionsTests.cs
@@ -15,6 +15,8 @@
 //
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using StringAssert = NUnit.Framework.Legacy.StringAssert;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/Cassandra.IntegrationTests/Core/LargeDataTests.cs b/src/Cassandra.IntegrationTests/Core/LargeDataTests.cs
index 7be40d713..a1cd9814b 100644
--- a/src/Cassandra.IntegrationTests/Core/LargeDataTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/LargeDataTests.cs
@@ -16,6 +16,7 @@
 
 using Cassandra.IntegrationTests.TestClusterManagement;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/Cassandra.IntegrationTests/Core/MetadataTests.cs b/src/Cassandra.IntegrationTests/Core/MetadataTests.cs
index ec1fcc146..6f07ebc52 100644
--- a/src/Cassandra.IntegrationTests/Core/MetadataTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/MetadataTests.cs
@@ -17,6 +17,8 @@
 using Cassandra.IntegrationTests.TestClusterManagement;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
diff --git a/src/Cassandra.IntegrationTests/Core/MultiThreadingTests.cs b/src/Cassandra.IntegrationTests/Core/MultiThreadingTests.cs
index 75421467c..63f303585 100644
--- a/src/Cassandra.IntegrationTests/Core/MultiThreadingTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/MultiThreadingTests.cs
@@ -16,6 +16,7 @@
 
 using Cassandra.IntegrationTests.TestClusterManagement;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
diff --git a/src/Cassandra.IntegrationTests/Core/PagingTests.cs b/src/Cassandra.IntegrationTests/Core/PagingTests.cs
index 6ec324924..d0b2a8ea0 100644
--- a/src/Cassandra.IntegrationTests/Core/PagingTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/PagingTests.cs
@@ -21,6 +21,7 @@
 using Cassandra.IntegrationTests.TestBase;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/ParameterizedStatementsTests.cs b/src/Cassandra.IntegrationTests/Core/ParameterizedStatementsTests.cs
index 0a511138a..f6be2b3a2 100644
--- a/src/Cassandra.IntegrationTests/Core/ParameterizedStatementsTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/ParameterizedStatementsTests.cs
@@ -17,6 +17,8 @@
 using System.Linq;
 using Cassandra.IntegrationTests.TestClusterManagement;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 using System;
 using System.Collections.Generic;
 using System.Numerics;
diff --git a/src/Cassandra.IntegrationTests/Core/PoolShortTests.cs b/src/Cassandra.IntegrationTests/Core/PoolShortTests.cs
index eca723edd..41c5f4ce9 100644
--- a/src/Cassandra.IntegrationTests/Core/PoolShortTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/PoolShortTests.cs
@@ -29,6 +29,7 @@
 using Cassandra.IntegrationTests.TestClusterManagement;
 using Cassandra.IntegrationTests.TestClusterManagement.Simulacron;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 using Cassandra.Tests;
 
 namespace Cassandra.IntegrationTests.Core
diff --git a/src/Cassandra.IntegrationTests/Core/PoolTests.cs b/src/Cassandra.IntegrationTests/Core/PoolTests.cs
index b72f2accc..022a89d84 100644
--- a/src/Cassandra.IntegrationTests/Core/PoolTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/PoolTests.cs
@@ -17,6 +17,8 @@
 using Cassandra.IntegrationTests.TestClusterManagement;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using StringAssert = NUnit.Framework.Legacy.StringAssert;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
diff --git a/src/Cassandra.IntegrationTests/Core/PrepareLongTests.cs b/src/Cassandra.IntegrationTests/Core/PrepareLongTests.cs
index eb59b94d5..d733fe855 100644
--- a/src/Cassandra.IntegrationTests/Core/PrepareLongTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/PrepareLongTests.cs
@@ -19,6 +19,7 @@
 using Cassandra.IntegrationTests.TestClusterManagement;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/PrepareSimulatorTests.cs b/src/Cassandra.IntegrationTests/Core/PrepareSimulatorTests.cs
index 39a90cdfe..1ea11baa0 100644
--- a/src/Cassandra.IntegrationTests/Core/PrepareSimulatorTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/PrepareSimulatorTests.cs
@@ -26,6 +26,8 @@
 using Cassandra.Tests;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/PreparedStatementsTests.cs b/src/Cassandra.IntegrationTests/Core/PreparedStatementsTests.cs
index ce5cc363e..905b61d96 100644
--- a/src/Cassandra.IntegrationTests/Core/PreparedStatementsTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/PreparedStatementsTests.cs
@@ -21,6 +21,8 @@
 using System.Threading.Tasks;
 using Cassandra.IntegrationTests.TestClusterManagement;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 using System.Net;
 using System.Collections;
 using System.Threading;
diff --git a/src/Cassandra.IntegrationTests/Core/ReconnectionTests.cs b/src/Cassandra.IntegrationTests/Core/ReconnectionTests.cs
index 7eb18d0e1..d0607fb48 100644
--- a/src/Cassandra.IntegrationTests/Core/ReconnectionTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/ReconnectionTests.cs
@@ -27,6 +27,7 @@
 using Cassandra.IntegrationTests.TestClusterManagement.Simulacron;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/SchemaAgreementSimulacronTests.cs b/src/Cassandra.IntegrationTests/Core/SchemaAgreementSimulacronTests.cs
index 30c1da7ea..5c9794c77 100644
--- a/src/Cassandra.IntegrationTests/Core/SchemaAgreementSimulacronTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/SchemaAgreementSimulacronTests.cs
@@ -25,6 +25,7 @@
 using Cassandra.IntegrationTests.TestClusterManagement.Simulacron;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/SchemaAgreementTests.cs b/src/Cassandra.IntegrationTests/Core/SchemaAgreementTests.cs
index ec89a1133..021eac1a7 100644
--- a/src/Cassandra.IntegrationTests/Core/SchemaAgreementTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/SchemaAgreementTests.cs
@@ -21,6 +21,7 @@
 using Cassandra.IntegrationTests.TestBase;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/SchemaMetadataTests.cs b/src/Cassandra.IntegrationTests/Core/SchemaMetadataTests.cs
index 2af39f5ce..e494fb86d 100644
--- a/src/Cassandra.IntegrationTests/Core/SchemaMetadataTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/SchemaMetadataTests.cs
@@ -23,6 +23,9 @@
 using Cassandra.Tasks;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using StringAssert = NUnit.Framework.Legacy.StringAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 using SortOrder = Cassandra.DataCollectionMetadata.SortOrder;
 
 namespace Cassandra.IntegrationTests.Core
diff --git a/src/Cassandra.IntegrationTests/Core/SessionAuthenticationTests.cs b/src/Cassandra.IntegrationTests/Core/SessionAuthenticationTests.cs
index 8d6fe1708..725f0da48 100644
--- a/src/Cassandra.IntegrationTests/Core/SessionAuthenticationTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/SessionAuthenticationTests.cs
@@ -26,6 +26,7 @@
 using Cassandra.IntegrationTests.TestClusterManagement;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/SessionExecuteAsyncTests.cs b/src/Cassandra.IntegrationTests/Core/SessionExecuteAsyncTests.cs
index 4634a7a19..f364a13d8 100644
--- a/src/Cassandra.IntegrationTests/Core/SessionExecuteAsyncTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/SessionExecuteAsyncTests.cs
@@ -18,6 +18,7 @@
 using System.Threading.Tasks;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/SessionStateTests.cs b/src/Cassandra.IntegrationTests/Core/SessionStateTests.cs
index 0571f6542..c287e35c1 100644
--- a/src/Cassandra.IntegrationTests/Core/SessionStateTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/SessionStateTests.cs
@@ -26,6 +26,9 @@
 using Cassandra.Tests;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using StringAssert = NUnit.Framework.Legacy.StringAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
@@ -115,4 +118,4 @@ public void Session_GetState_Should_Return_Zero_After_Cluster_Disposal()
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Cassandra.IntegrationTests/Core/SessionTests.cs b/src/Cassandra.IntegrationTests/Core/SessionTests.cs
index 1d18581c6..39e722d41 100644
--- a/src/Cassandra.IntegrationTests/Core/SessionTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/SessionTests.cs
@@ -26,6 +26,7 @@
 using Cassandra.Tests;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/SimulacronHealthTest.cs b/src/Cassandra.IntegrationTests/Core/SimulacronHealthTest.cs
index b6852066e..f96d9b0c4 100644
--- a/src/Cassandra.IntegrationTests/Core/SimulacronHealthTest.cs
+++ b/src/Cassandra.IntegrationTests/Core/SimulacronHealthTest.cs
@@ -22,6 +22,7 @@
 using Cassandra.IntegrationTests.TestClusterManagement.Simulacron;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionLongTests.cs b/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionLongTests.cs
index 21b718278..2b468b982 100644
--- a/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionLongTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionLongTests.cs
@@ -25,6 +25,7 @@
 using Cassandra.Tasks;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 #pragma warning disable 618
 
 namespace Cassandra.IntegrationTests.Core
diff --git a/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionShortTests.cs b/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionShortTests.cs
index bd9be883c..1aaf1dac7 100644
--- a/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionShortTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionShortTests.cs
@@ -28,6 +28,7 @@
 using Cassandra.Tests;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 #pragma warning disable 618
 
diff --git a/src/Cassandra.IntegrationTests/Core/StressTests.cs b/src/Cassandra.IntegrationTests/Core/StressTests.cs
index b37ed7354..dbbc6735f 100644
--- a/src/Cassandra.IntegrationTests/Core/StressTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/StressTests.cs
@@ -23,6 +23,7 @@
 using System.Threading;
 using Cassandra.IntegrationTests.Policies.Util;
 using Cassandra.IntegrationTests.TestBase;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/TimeUuidSerializationTests.cs b/src/Cassandra.IntegrationTests/Core/TimeUuidSerializationTests.cs
index 892e81f10..250c4d3ec 100644
--- a/src/Cassandra.IntegrationTests/Core/TimeUuidSerializationTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/TimeUuidSerializationTests.cs
@@ -22,6 +22,7 @@
 using Cassandra.IntegrationTests.TestClusterManagement;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/TimestampTests.cs b/src/Cassandra.IntegrationTests/Core/TimestampTests.cs
index fd1ebb216..20fe0a557 100644
--- a/src/Cassandra.IntegrationTests/Core/TimestampTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/TimestampTests.cs
@@ -20,6 +20,7 @@
 using Cassandra.IntegrationTests.TestBase;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/TupleTests.cs b/src/Cassandra.IntegrationTests/Core/TupleTests.cs
index e641cf8de..0238912d4 100644
--- a/src/Cassandra.IntegrationTests/Core/TupleTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/TupleTests.cs
@@ -23,6 +23,7 @@
 using Cassandra.IntegrationTests.TestBase;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/TypeSerializersTests.cs b/src/Cassandra.IntegrationTests/Core/TypeSerializersTests.cs
index 327ee0da3..1ada55e1c 100644
--- a/src/Cassandra.IntegrationTests/Core/TypeSerializersTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/TypeSerializersTests.cs
@@ -29,6 +29,9 @@
 using Cassandra.Tests;
 using Cassandra.Tests.Extensions.Serializers;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using StringAssert = NUnit.Framework.Legacy.StringAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
@@ -863,4 +866,4 @@ public override int GetHashCode()
             public CqlVector<BigInteger> b { get; set; }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Cassandra.IntegrationTests/Core/UdfTests.cs b/src/Cassandra.IntegrationTests/Core/UdfTests.cs
index 5e7215024..a437dd078 100644
--- a/src/Cassandra.IntegrationTests/Core/UdfTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/UdfTests.cs
@@ -23,6 +23,8 @@
 using Cassandra.IntegrationTests.TestClusterManagement;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.IntegrationTests.Core
 {
diff --git a/src/Cassandra.IntegrationTests/Core/UdtMappingsTests.cs b/src/Cassandra.IntegrationTests/Core/UdtMappingsTests.cs
index 36bbdbdfd..eefd4e2e1 100644
--- a/src/Cassandra.IntegrationTests/Core/UdtMappingsTests.cs
+++ b/src/Cassandra.IntegrationTests/Core/UdtMappingsTests.cs
@@ -16,6 +16,8 @@
 
 using Cassandra.IntegrationTests.TestClusterManagement;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/Cassandra.IntegrationTests/CqlFunctions/Structures/EntityWithNullableTimeUuid.cs b/src/Cassandra.IntegrationTests/CqlFunctions/Structures/EntityWithNullableTimeUuid.cs
index 002942e05..1edc99444 100644
--- a/src/Cassandra.IntegrationTests/CqlFunctions/Structures/EntityWithNullableTimeUuid.cs
+++ b/src/Cassandra.IntegrationTests/CqlFunctions/Structures/EntityWithNullableTimeUuid.cs
@@ -18,6 +18,7 @@
 using System.Collections.Generic;
 using Cassandra.Data.Linq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 using NUnit.Framework.Internal;
 
 #pragma warning disable 618
diff --git a/src/Cassandra.IntegrationTests/CqlFunctions/Structures/EntityWithTimeUuid.cs b/src/Cassandra.IntegrationTests/CqlFunctions/Structures/EntityWithTimeUuid.cs
index b82936448..cb63e5611 100644
--- a/src/Cassandra.IntegrationTests/CqlFunctions/Structures/EntityWithTimeUuid.cs
+++ b/src/Cassandra.IntegrationTests/CqlFunctions/Structures/EntityWithTimeUuid.cs
@@ -18,6 +18,7 @@
 using System.Collections.Generic;
 using Cassandra.Data.Linq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 using NUnit.Framework.Internal;
 
 #pragma warning disable 618
diff --git a/src/Cassandra.IntegrationTests/CqlFunctions/Tests/MaxTimeUuid.cs b/src/Cassandra.IntegrationTests/CqlFunctions/Tests/MaxTimeUuid.cs
index 0158512d0..0b09ab5bb 100644
--- a/src/Cassandra.IntegrationTests/CqlFunctions/Tests/MaxTimeUuid.cs
+++ b/src/Cassandra.IntegrationTests/CqlFunctions/Tests/MaxTimeUuid.cs
@@ -23,6 +23,7 @@
 using Cassandra.Mapping;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 #pragma warning disable 612
 
 namespace Cassandra.IntegrationTests.CqlFunctions.Tests
diff --git a/src/Cassandra.IntegrationTests/CqlFunctions/Tests/MinTimeUuid.cs b/src/Cassandra.IntegrationTests/CqlFunctions/Tests/MinTimeUuid.cs
index 7582773ae..a840b1032 100644
--- a/src/Cassandra.IntegrationTests/CqlFunctions/Tests/MinTimeUuid.cs
+++ b/src/Cassandra.IntegrationTests/CqlFunctions/Tests/MinTimeUuid.cs
@@ -23,6 +23,7 @@
 using Cassandra.Mapping;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 #pragma warning disable 612
 
 namespace Cassandra.IntegrationTests.CqlFunctions.Tests
diff --git a/src/Cassandra.IntegrationTests/CqlFunctions/Tests/Token.cs b/src/Cassandra.IntegrationTests/CqlFunctions/Tests/Token.cs
index a9a8e8822..e5ff6f94b 100644
--- a/src/Cassandra.IntegrationTests/CqlFunctions/Tests/Token.cs
+++ b/src/Cassandra.IntegrationTests/CqlFunctions/Tests/Token.cs
@@ -23,6 +23,7 @@
 using Cassandra.Mapping;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 #pragma warning disable 612
 
 namespace Cassandra.IntegrationTests.CqlFunctions.Tests
diff --git a/src/Cassandra.IntegrationTests/DurationTests.cs b/src/Cassandra.IntegrationTests/DurationTests.cs
index 62a4bd05d..1494289fc 100644
--- a/src/Cassandra.IntegrationTests/DurationTests.cs
+++ b/src/Cassandra.IntegrationTests/DurationTests.cs
@@ -20,6 +20,7 @@
 using Cassandra.IntegrationTests.TestBase;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests
 {
diff --git a/src/Cassandra.IntegrationTests/ExecutionProfiles/ExecutionProfileTests.cs b/src/Cassandra.IntegrationTests/ExecutionProfiles/ExecutionProfileTests.cs
index baf540326..4f24f52ac 100644
--- a/src/Cassandra.IntegrationTests/ExecutionProfiles/ExecutionProfileTests.cs
+++ b/src/Cassandra.IntegrationTests/ExecutionProfiles/ExecutionProfileTests.cs
@@ -23,6 +23,7 @@
 using Cassandra.Tests;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.ExecutionProfiles
 {
diff --git a/src/Cassandra.IntegrationTests/ExecutionProfiles/LinqExecutionProfileTests.cs b/src/Cassandra.IntegrationTests/ExecutionProfiles/LinqExecutionProfileTests.cs
index 924b2a9bc..7b379ef21 100644
--- a/src/Cassandra.IntegrationTests/ExecutionProfiles/LinqExecutionProfileTests.cs
+++ b/src/Cassandra.IntegrationTests/ExecutionProfiles/LinqExecutionProfileTests.cs
@@ -28,6 +28,7 @@
 using Cassandra.IntegrationTests.TestClusterManagement.Simulacron;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.ExecutionProfiles
 {
diff --git a/src/Cassandra.IntegrationTests/ExecutionProfiles/MapperExecutionProfileTests.cs b/src/Cassandra.IntegrationTests/ExecutionProfiles/MapperExecutionProfileTests.cs
index 12e0b00c6..9cc1a54e2 100644
--- a/src/Cassandra.IntegrationTests/ExecutionProfiles/MapperExecutionProfileTests.cs
+++ b/src/Cassandra.IntegrationTests/ExecutionProfiles/MapperExecutionProfileTests.cs
@@ -30,6 +30,8 @@
 using Cassandra.Tests.Mapping.Pocos;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.IntegrationTests.ExecutionProfiles
 {
diff --git a/src/Cassandra.IntegrationTests/FoundBugs/FoundBugTests.cs b/src/Cassandra.IntegrationTests/FoundBugs/FoundBugTests.cs
index 022b932d9..814c38b46 100644
--- a/src/Cassandra.IntegrationTests/FoundBugs/FoundBugTests.cs
+++ b/src/Cassandra.IntegrationTests/FoundBugs/FoundBugTests.cs
@@ -22,6 +22,7 @@
 using Cassandra.IntegrationTests.TestClusterManagement;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.FoundBugs
 {
diff --git a/src/Cassandra.IntegrationTests/Linq/CqlOperatorTests/Append.cs b/src/Cassandra.IntegrationTests/Linq/CqlOperatorTests/Append.cs
index 6ed62b1e8..2397c8fb6 100644
--- a/src/Cassandra.IntegrationTests/Linq/CqlOperatorTests/Append.cs
+++ b/src/Cassandra.IntegrationTests/Linq/CqlOperatorTests/Append.cs
@@ -23,6 +23,8 @@
 using Cassandra.IntegrationTests.TestBase;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.IntegrationTests.Linq.CqlOperatorTests
 {
diff --git a/src/Cassandra.IntegrationTests/Linq/CqlOperatorTests/Prepend.cs b/src/Cassandra.IntegrationTests/Linq/CqlOperatorTests/Prepend.cs
index 7cca54af6..101ab6dc9 100644
--- a/src/Cassandra.IntegrationTests/Linq/CqlOperatorTests/Prepend.cs
+++ b/src/Cassandra.IntegrationTests/Linq/CqlOperatorTests/Prepend.cs
@@ -24,6 +24,7 @@
 using Cassandra.IntegrationTests.TestBase;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Linq.CqlOperatorTests
 {
diff --git a/src/Cassandra.IntegrationTests/Linq/CqlOperatorTests/SubstractAssign.cs b/src/Cassandra.IntegrationTests/Linq/CqlOperatorTests/SubstractAssign.cs
index 593300416..c7c2fb555 100644
--- a/src/Cassandra.IntegrationTests/Linq/CqlOperatorTests/SubstractAssign.cs
+++ b/src/Cassandra.IntegrationTests/Linq/CqlOperatorTests/SubstractAssign.cs
@@ -23,6 +23,7 @@
 using Cassandra.IntegrationTests.TestBase;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Linq.CqlOperatorTests
 {
diff --git a/src/Cassandra.IntegrationTests/Linq/LinqMethods/Count.cs b/src/Cassandra.IntegrationTests/Linq/LinqMethods/Count.cs
index f9b95c991..48bb1aa33 100644
--- a/src/Cassandra.IntegrationTests/Linq/LinqMethods/Count.cs
+++ b/src/Cassandra.IntegrationTests/Linq/LinqMethods/Count.cs
@@ -22,6 +22,7 @@
 using Cassandra.Mapping;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Linq.LinqMethods
 {
diff --git a/src/Cassandra.IntegrationTests/Linq/LinqMethods/Counter.cs b/src/Cassandra.IntegrationTests/Linq/LinqMethods/Counter.cs
index 0ce79c7c3..805497c6d 100644
--- a/src/Cassandra.IntegrationTests/Linq/LinqMethods/Counter.cs
+++ b/src/Cassandra.IntegrationTests/Linq/LinqMethods/Counter.cs
@@ -25,6 +25,7 @@
 using Cassandra.Mapping;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 #pragma warning disable 618
 #pragma warning disable 612
diff --git a/src/Cassandra.IntegrationTests/Linq/LinqMethods/Delete.cs b/src/Cassandra.IntegrationTests/Linq/LinqMethods/Delete.cs
index 0d454911f..4f865e3ab 100644
--- a/src/Cassandra.IntegrationTests/Linq/LinqMethods/Delete.cs
+++ b/src/Cassandra.IntegrationTests/Linq/LinqMethods/Delete.cs
@@ -24,6 +24,7 @@
 using Cassandra.Mapping;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Linq.LinqMethods
 {
diff --git a/src/Cassandra.IntegrationTests/Linq/LinqMethods/DeleteIf.cs b/src/Cassandra.IntegrationTests/Linq/LinqMethods/DeleteIf.cs
index 35e6f74d2..cb4d274a8 100644
--- a/src/Cassandra.IntegrationTests/Linq/LinqMethods/DeleteIf.cs
+++ b/src/Cassandra.IntegrationTests/Linq/LinqMethods/DeleteIf.cs
@@ -23,6 +23,7 @@
 using Cassandra.Mapping;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Linq.LinqMethods
 {
diff --git a/src/Cassandra.IntegrationTests/Linq/LinqMethods/First.cs b/src/Cassandra.IntegrationTests/Linq/LinqMethods/First.cs
index aa53079ff..8b4adb5f1 100644
--- a/src/Cassandra.IntegrationTests/Linq/LinqMethods/First.cs
+++ b/src/Cassandra.IntegrationTests/Linq/LinqMethods/First.cs
@@ -26,6 +26,7 @@
 using Cassandra.Mapping;
 using Newtonsoft.Json;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 #pragma warning disable 612
 
diff --git a/src/Cassandra.IntegrationTests/Linq/LinqMethods/FirstOrDefault.cs b/src/Cassandra.IntegrationTests/Linq/LinqMethods/FirstOrDefault.cs
index 6734fc9f5..a2f60b929 100644
--- a/src/Cassandra.IntegrationTests/Linq/LinqMethods/FirstOrDefault.cs
+++ b/src/Cassandra.IntegrationTests/Linq/LinqMethods/FirstOrDefault.cs
@@ -21,6 +21,7 @@
 using Cassandra.IntegrationTests.TestBase;
 using Cassandra.Mapping;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 #pragma warning disable 612
 
 namespace Cassandra.IntegrationTests.Linq.LinqMethods
diff --git a/src/Cassandra.IntegrationTests/Linq/LinqMethods/GroupByTests.cs b/src/Cassandra.IntegrationTests/Linq/LinqMethods/GroupByTests.cs
index 947bec2c6..b75cc552e 100644
--- a/src/Cassandra.IntegrationTests/Linq/LinqMethods/GroupByTests.cs
+++ b/src/Cassandra.IntegrationTests/Linq/LinqMethods/GroupByTests.cs
@@ -23,6 +23,7 @@
 using Cassandra.Tests.Mapping.Pocos;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Linq.LinqMethods
 {
diff --git a/src/Cassandra.IntegrationTests/Linq/LinqMethods/InsertTests.cs b/src/Cassandra.IntegrationTests/Linq/LinqMethods/InsertTests.cs
index e78a44a98..ac59a1896 100644
--- a/src/Cassandra.IntegrationTests/Linq/LinqMethods/InsertTests.cs
+++ b/src/Cassandra.IntegrationTests/Linq/LinqMethods/InsertTests.cs
@@ -28,6 +28,7 @@
 using Cassandra.Tests.Mapping.Pocos;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 #pragma warning disable 612
 
diff --git a/src/Cassandra.IntegrationTests/Linq/LinqMethods/OrderBy.cs b/src/Cassandra.IntegrationTests/Linq/LinqMethods/OrderBy.cs
index be34305dc..ac037c34a 100644
--- a/src/Cassandra.IntegrationTests/Linq/LinqMethods/OrderBy.cs
+++ b/src/Cassandra.IntegrationTests/Linq/LinqMethods/OrderBy.cs
@@ -24,6 +24,7 @@
 using Cassandra.Mapping;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 #pragma warning disable 612
 
diff --git a/src/Cassandra.IntegrationTests/Linq/LinqMethods/Select.cs b/src/Cassandra.IntegrationTests/Linq/LinqMethods/Select.cs
index c09b165ae..6edba641f 100644
--- a/src/Cassandra.IntegrationTests/Linq/LinqMethods/Select.cs
+++ b/src/Cassandra.IntegrationTests/Linq/LinqMethods/Select.cs
@@ -26,6 +26,7 @@
 using Cassandra.Tests.Mapping.Pocos;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 #pragma warning disable 618
 
diff --git a/src/Cassandra.IntegrationTests/Linq/LinqMethods/TableSelectDefault.cs b/src/Cassandra.IntegrationTests/Linq/LinqMethods/TableSelectDefault.cs
index 32e232216..32c77396f 100644
--- a/src/Cassandra.IntegrationTests/Linq/LinqMethods/TableSelectDefault.cs
+++ b/src/Cassandra.IntegrationTests/Linq/LinqMethods/TableSelectDefault.cs
@@ -22,6 +22,7 @@
 using Cassandra.IntegrationTests.TestBase;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Linq.LinqMethods
 {
diff --git a/src/Cassandra.IntegrationTests/Linq/LinqMethods/Take.cs b/src/Cassandra.IntegrationTests/Linq/LinqMethods/Take.cs
index fd0b3b208..4c0da090e 100644
--- a/src/Cassandra.IntegrationTests/Linq/LinqMethods/Take.cs
+++ b/src/Cassandra.IntegrationTests/Linq/LinqMethods/Take.cs
@@ -23,6 +23,7 @@
 using Cassandra.Mapping;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 #pragma warning disable 612
 
diff --git a/src/Cassandra.IntegrationTests/Linq/LinqMethods/Update.cs b/src/Cassandra.IntegrationTests/Linq/LinqMethods/Update.cs
index 3fc8e8d3e..47aa318a3 100644
--- a/src/Cassandra.IntegrationTests/Linq/LinqMethods/Update.cs
+++ b/src/Cassandra.IntegrationTests/Linq/LinqMethods/Update.cs
@@ -21,6 +21,7 @@
 using Cassandra.Mapping;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 #pragma warning disable 612
 
diff --git a/src/Cassandra.IntegrationTests/Linq/LinqMethods/UpdateIfTests.cs b/src/Cassandra.IntegrationTests/Linq/LinqMethods/UpdateIfTests.cs
index 846292223..aedb87f7c 100644
--- a/src/Cassandra.IntegrationTests/Linq/LinqMethods/UpdateIfTests.cs
+++ b/src/Cassandra.IntegrationTests/Linq/LinqMethods/UpdateIfTests.cs
@@ -19,6 +19,7 @@
 using Cassandra.IntegrationTests.TestBase;
 using Cassandra.Mapping;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 #pragma warning disable 612
 
 namespace Cassandra.IntegrationTests.Linq.LinqMethods
diff --git a/src/Cassandra.IntegrationTests/Linq/LinqMethods/Where.cs b/src/Cassandra.IntegrationTests/Linq/LinqMethods/Where.cs
index 4ffe21750..64bb1e223 100644
--- a/src/Cassandra.IntegrationTests/Linq/LinqMethods/Where.cs
+++ b/src/Cassandra.IntegrationTests/Linq/LinqMethods/Where.cs
@@ -27,6 +27,7 @@
 using Cassandra.Tests.Mapping.Pocos;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 #pragma warning disable 618
 #pragma warning disable 612
diff --git a/src/Cassandra.IntegrationTests/Linq/LinqRealClusterTests.cs b/src/Cassandra.IntegrationTests/Linq/LinqRealClusterTests.cs
index 1cf170457..647880ef5 100644
--- a/src/Cassandra.IntegrationTests/Linq/LinqRealClusterTests.cs
+++ b/src/Cassandra.IntegrationTests/Linq/LinqRealClusterTests.cs
@@ -28,6 +28,7 @@
 using Newtonsoft.Json.Linq;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Linq
 {
diff --git a/src/Cassandra.IntegrationTests/Linq/LinqTable/CreateTable.cs b/src/Cassandra.IntegrationTests/Linq/LinqTable/CreateTable.cs
index 0847a69a9..15e43ca2c 100644
--- a/src/Cassandra.IntegrationTests/Linq/LinqTable/CreateTable.cs
+++ b/src/Cassandra.IntegrationTests/Linq/LinqTable/CreateTable.cs
@@ -27,6 +27,7 @@
 using Cassandra.Mapping;
 using Cassandra.Tests.Mapping.Pocos;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 #pragma warning disable 612
 #pragma warning disable 618
 
diff --git a/src/Cassandra.IntegrationTests/Linq/LinqTable/GetTable.cs b/src/Cassandra.IntegrationTests/Linq/LinqTable/GetTable.cs
index bb105fda6..dec508dad 100644
--- a/src/Cassandra.IntegrationTests/Linq/LinqTable/GetTable.cs
+++ b/src/Cassandra.IntegrationTests/Linq/LinqTable/GetTable.cs
@@ -20,6 +20,7 @@
 using Cassandra.IntegrationTests.Linq.Structures;
 using Cassandra.IntegrationTests.SimulacronAPI.Models.Logs;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Linq.LinqTable
 {
diff --git a/src/Cassandra.IntegrationTests/Linq/Structures/AllDataTypesEntityUtil.cs b/src/Cassandra.IntegrationTests/Linq/Structures/AllDataTypesEntityUtil.cs
index 8667e2f8d..3bce2f6bf 100644
--- a/src/Cassandra.IntegrationTests/Linq/Structures/AllDataTypesEntityUtil.cs
+++ b/src/Cassandra.IntegrationTests/Linq/Structures/AllDataTypesEntityUtil.cs
@@ -19,6 +19,7 @@
 using Cassandra.Data.Linq;
 using Cassandra.IntegrationTests.TestBase;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 using NUnit.Framework.Internal;
 
 #pragma warning disable 618
diff --git a/src/Cassandra.IntegrationTests/Linq/Structures/EntityWithAllCollectionTypes.cs b/src/Cassandra.IntegrationTests/Linq/Structures/EntityWithAllCollectionTypes.cs
index c5c32ca8f..022fdc5ef 100644
--- a/src/Cassandra.IntegrationTests/Linq/Structures/EntityWithAllCollectionTypes.cs
+++ b/src/Cassandra.IntegrationTests/Linq/Structures/EntityWithAllCollectionTypes.cs
@@ -20,6 +20,7 @@
 using Cassandra.IntegrationTests.TestBase;
 using Cassandra.Mapping;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Linq.Structures
 {
diff --git a/src/Cassandra.IntegrationTests/Linq/Structures/EntityWithArrayType.cs b/src/Cassandra.IntegrationTests/Linq/Structures/EntityWithArrayType.cs
index 639a7c55f..96d720064 100644
--- a/src/Cassandra.IntegrationTests/Linq/Structures/EntityWithArrayType.cs
+++ b/src/Cassandra.IntegrationTests/Linq/Structures/EntityWithArrayType.cs
@@ -20,6 +20,7 @@
 using Cassandra.IntegrationTests.TestBase;
 using Cassandra.Mapping;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Linq.Structures
 {
diff --git a/src/Cassandra.IntegrationTests/Linq/Structures/EntityWithDictionaryType.cs b/src/Cassandra.IntegrationTests/Linq/Structures/EntityWithDictionaryType.cs
index 29e7371bf..225083d42 100644
--- a/src/Cassandra.IntegrationTests/Linq/Structures/EntityWithDictionaryType.cs
+++ b/src/Cassandra.IntegrationTests/Linq/Structures/EntityWithDictionaryType.cs
@@ -20,6 +20,7 @@
 using Cassandra.IntegrationTests.TestBase;
 using Cassandra.Mapping;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Linq.Structures
 {
diff --git a/src/Cassandra.IntegrationTests/Linq/Structures/EntityWithListType.cs b/src/Cassandra.IntegrationTests/Linq/Structures/EntityWithListType.cs
index 9825ada21..b87539486 100644
--- a/src/Cassandra.IntegrationTests/Linq/Structures/EntityWithListType.cs
+++ b/src/Cassandra.IntegrationTests/Linq/Structures/EntityWithListType.cs
@@ -20,6 +20,8 @@
 using Cassandra.IntegrationTests.TestBase;
 using Cassandra.Mapping;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.IntegrationTests.Linq.Structures
 {
diff --git a/src/Cassandra.IntegrationTests/Linq/Structures/ManyDataTypesEntity.cs b/src/Cassandra.IntegrationTests/Linq/Structures/ManyDataTypesEntity.cs
index 00308163a..78a7daaf2 100644
--- a/src/Cassandra.IntegrationTests/Linq/Structures/ManyDataTypesEntity.cs
+++ b/src/Cassandra.IntegrationTests/Linq/Structures/ManyDataTypesEntity.cs
@@ -21,6 +21,7 @@
 using Cassandra.IntegrationTests.SimulacronAPI;
 using Cassandra.IntegrationTests.TestBase;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 using NUnit.Framework.Internal;
 
 #pragma warning disable 618
diff --git a/src/Cassandra.IntegrationTests/Linq/Structures/Movie.cs b/src/Cassandra.IntegrationTests/Linq/Structures/Movie.cs
index afe2b079e..daef45a38 100644
--- a/src/Cassandra.IntegrationTests/Linq/Structures/Movie.cs
+++ b/src/Cassandra.IntegrationTests/Linq/Structures/Movie.cs
@@ -22,6 +22,7 @@
 using Cassandra.IntegrationTests.SimulacronAPI.PrimeBuilder.Then;
 using Cassandra.IntegrationTests.TestBase;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 using NUnit.Framework.Internal;
 
 #pragma warning disable 618
diff --git a/src/Cassandra.IntegrationTests/Mapping/Structures/Author.cs b/src/Cassandra.IntegrationTests/Mapping/Structures/Author.cs
index 5b03bb807..7683ee97d 100644
--- a/src/Cassandra.IntegrationTests/Mapping/Structures/Author.cs
+++ b/src/Cassandra.IntegrationTests/Mapping/Structures/Author.cs
@@ -18,6 +18,7 @@
 using System.Collections.Generic;
 using Cassandra.Data.Linq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 #pragma warning disable 618
 
 namespace Cassandra.IntegrationTests.Mapping.Structures
diff --git a/src/Cassandra.IntegrationTests/Mapping/Structures/ManyDataTypesPoco.cs b/src/Cassandra.IntegrationTests/Mapping/Structures/ManyDataTypesPoco.cs
index 54d40a30c..de4fb4060 100644
--- a/src/Cassandra.IntegrationTests/Mapping/Structures/ManyDataTypesPoco.cs
+++ b/src/Cassandra.IntegrationTests/Mapping/Structures/ManyDataTypesPoco.cs
@@ -25,6 +25,7 @@
 using Cassandra.Mapping;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 using NUnit.Framework.Internal;
 
 #pragma warning disable 618
diff --git a/src/Cassandra.IntegrationTests/Mapping/Structures/NestedCollectionsPoco.cs b/src/Cassandra.IntegrationTests/Mapping/Structures/NestedCollectionsPoco.cs
index e51aa3019..e6a07f98f 100644
--- a/src/Cassandra.IntegrationTests/Mapping/Structures/NestedCollectionsPoco.cs
+++ b/src/Cassandra.IntegrationTests/Mapping/Structures/NestedCollectionsPoco.cs
@@ -22,6 +22,8 @@
 using Cassandra.IntegrationTests.TestBase;
 using Cassandra.Mapping;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 using NUnit.Framework.Internal;
 
 #pragma warning disable 618
diff --git a/src/Cassandra.IntegrationTests/Mapping/Tests/Attributes.cs b/src/Cassandra.IntegrationTests/Mapping/Tests/Attributes.cs
index b19032583..d1c99a57b 100644
--- a/src/Cassandra.IntegrationTests/Mapping/Tests/Attributes.cs
+++ b/src/Cassandra.IntegrationTests/Mapping/Tests/Attributes.cs
@@ -28,6 +28,8 @@
 using Cassandra.Mapping.Attributes;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using StringAssert = NUnit.Framework.Legacy.StringAssert;
 
 #pragma warning disable 169
 #pragma warning disable 618
diff --git a/src/Cassandra.IntegrationTests/Mapping/Tests/Counter.cs b/src/Cassandra.IntegrationTests/Mapping/Tests/Counter.cs
index fb2cc11ed..11a8c25a7 100644
--- a/src/Cassandra.IntegrationTests/Mapping/Tests/Counter.cs
+++ b/src/Cassandra.IntegrationTests/Mapping/Tests/Counter.cs
@@ -25,6 +25,7 @@
 using Cassandra.Mapping.Attributes;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Mapping.Tests
 {
diff --git a/src/Cassandra.IntegrationTests/Mapping/Tests/CqlClientConfig.cs b/src/Cassandra.IntegrationTests/Mapping/Tests/CqlClientConfig.cs
index 2cf3d846f..6c98b40ff 100644
--- a/src/Cassandra.IntegrationTests/Mapping/Tests/CqlClientConfig.cs
+++ b/src/Cassandra.IntegrationTests/Mapping/Tests/CqlClientConfig.cs
@@ -22,6 +22,7 @@
 using Cassandra.Mapping;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Mapping.Tests
 {
diff --git a/src/Cassandra.IntegrationTests/Mapping/Tests/CqlClientTest.cs b/src/Cassandra.IntegrationTests/Mapping/Tests/CqlClientTest.cs
index 3bec07de3..33744f447 100644
--- a/src/Cassandra.IntegrationTests/Mapping/Tests/CqlClientTest.cs
+++ b/src/Cassandra.IntegrationTests/Mapping/Tests/CqlClientTest.cs
@@ -21,6 +21,7 @@
 using Cassandra.Mapping;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 #pragma warning disable 618
 #pragma warning disable 612
diff --git a/src/Cassandra.IntegrationTests/Mapping/Tests/CreateTable.cs b/src/Cassandra.IntegrationTests/Mapping/Tests/CreateTable.cs
index 9a3396226..e518a0fc5 100644
--- a/src/Cassandra.IntegrationTests/Mapping/Tests/CreateTable.cs
+++ b/src/Cassandra.IntegrationTests/Mapping/Tests/CreateTable.cs
@@ -23,6 +23,7 @@
 using Cassandra.Mapping;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Mapping.Tests
 {
diff --git a/src/Cassandra.IntegrationTests/Mapping/Tests/Delete.cs b/src/Cassandra.IntegrationTests/Mapping/Tests/Delete.cs
index 8f3427f32..efba039bc 100644
--- a/src/Cassandra.IntegrationTests/Mapping/Tests/Delete.cs
+++ b/src/Cassandra.IntegrationTests/Mapping/Tests/Delete.cs
@@ -24,6 +24,7 @@
 using Cassandra.Tests;
 using Cassandra.Tests.Mapping.Pocos;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Mapping.Tests
 {
diff --git a/src/Cassandra.IntegrationTests/Mapping/Tests/Fetch.cs b/src/Cassandra.IntegrationTests/Mapping/Tests/Fetch.cs
index 248da7c0e..fa847baa5 100644
--- a/src/Cassandra.IntegrationTests/Mapping/Tests/Fetch.cs
+++ b/src/Cassandra.IntegrationTests/Mapping/Tests/Fetch.cs
@@ -26,6 +26,8 @@
 using Cassandra.Tests.Mapping.FluentMappings;
 using Cassandra.Tests.Mapping.Pocos;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 using HairColor = Cassandra.Tests.Mapping.Pocos.HairColor;
 
 namespace Cassandra.IntegrationTests.Mapping.Tests
diff --git a/src/Cassandra.IntegrationTests/Mapping/Tests/First.cs b/src/Cassandra.IntegrationTests/Mapping/Tests/First.cs
index 8369b6d13..e1dd1d2fa 100644
--- a/src/Cassandra.IntegrationTests/Mapping/Tests/First.cs
+++ b/src/Cassandra.IntegrationTests/Mapping/Tests/First.cs
@@ -24,6 +24,7 @@
 using Cassandra.Tests;
 using Cassandra.Tests.Mapping.Pocos;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Mapping.Tests
 {
diff --git a/src/Cassandra.IntegrationTests/Mapping/Tests/FluentMapping.cs b/src/Cassandra.IntegrationTests/Mapping/Tests/FluentMapping.cs
index 3f063e32b..df5149127 100644
--- a/src/Cassandra.IntegrationTests/Mapping/Tests/FluentMapping.cs
+++ b/src/Cassandra.IntegrationTests/Mapping/Tests/FluentMapping.cs
@@ -22,6 +22,8 @@
 using Cassandra.Mapping;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using StringAssert = NUnit.Framework.Legacy.StringAssert;
 
 namespace Cassandra.IntegrationTests.Mapping.Tests
 {
diff --git a/src/Cassandra.IntegrationTests/Mapping/Tests/InsertTests.cs b/src/Cassandra.IntegrationTests/Mapping/Tests/InsertTests.cs
index e51ea989f..6db465ca6 100644
--- a/src/Cassandra.IntegrationTests/Mapping/Tests/InsertTests.cs
+++ b/src/Cassandra.IntegrationTests/Mapping/Tests/InsertTests.cs
@@ -27,6 +27,8 @@
 using Cassandra.Tests;
 using Cassandra.Tests.Mapping.Pocos;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using StringAssert = NUnit.Framework.Legacy.StringAssert;
 using HairColor = Cassandra.Tests.Mapping.Pocos.HairColor;
 #pragma warning disable 169
 
diff --git a/src/Cassandra.IntegrationTests/Mapping/Tests/Single.cs b/src/Cassandra.IntegrationTests/Mapping/Tests/Single.cs
index 1870316f0..b547478dc 100644
--- a/src/Cassandra.IntegrationTests/Mapping/Tests/Single.cs
+++ b/src/Cassandra.IntegrationTests/Mapping/Tests/Single.cs
@@ -23,6 +23,7 @@
 using Cassandra.Mapping;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Mapping.Tests
 {
diff --git a/src/Cassandra.IntegrationTests/Mapping/Tests/Update.cs b/src/Cassandra.IntegrationTests/Mapping/Tests/Update.cs
index bd3d11602..79e6f6b9b 100644
--- a/src/Cassandra.IntegrationTests/Mapping/Tests/Update.cs
+++ b/src/Cassandra.IntegrationTests/Mapping/Tests/Update.cs
@@ -24,6 +24,9 @@
 using Cassandra.Tests;
 using Cassandra.Tests.Mapping.Pocos;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using StringAssert = NUnit.Framework.Legacy.StringAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.IntegrationTests.Mapping.Tests
 {
diff --git a/src/Cassandra.IntegrationTests/MetadataTests/TokenMapSchemaChangeMetadataSyncTests.cs b/src/Cassandra.IntegrationTests/MetadataTests/TokenMapSchemaChangeMetadataSyncTests.cs
index 8b9121dcf..001fcaec6 100644
--- a/src/Cassandra.IntegrationTests/MetadataTests/TokenMapSchemaChangeMetadataSyncTests.cs
+++ b/src/Cassandra.IntegrationTests/MetadataTests/TokenMapSchemaChangeMetadataSyncTests.cs
@@ -22,6 +22,7 @@
 using Cassandra.Tests;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.MetadataTests
 {
diff --git a/src/Cassandra.IntegrationTests/MetadataTests/TokenMapSchemaChangeTests.cs b/src/Cassandra.IntegrationTests/MetadataTests/TokenMapSchemaChangeTests.cs
index c390e2587..8a5e3133f 100644
--- a/src/Cassandra.IntegrationTests/MetadataTests/TokenMapSchemaChangeTests.cs
+++ b/src/Cassandra.IntegrationTests/MetadataTests/TokenMapSchemaChangeTests.cs
@@ -21,6 +21,7 @@
 using Cassandra.IntegrationTests.TestClusterManagement;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.MetadataTests
 {
diff --git a/src/Cassandra.IntegrationTests/MetadataTests/TokenMapTopologyChangeTests.cs b/src/Cassandra.IntegrationTests/MetadataTests/TokenMapTopologyChangeTests.cs
index 79fb6b06a..ceaf7cd05 100644
--- a/src/Cassandra.IntegrationTests/MetadataTests/TokenMapTopologyChangeTests.cs
+++ b/src/Cassandra.IntegrationTests/MetadataTests/TokenMapTopologyChangeTests.cs
@@ -24,6 +24,7 @@
 using Cassandra.Tests;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.MetadataTests
 {
diff --git a/src/Cassandra.IntegrationTests/Metrics/MetricsTests.cs b/src/Cassandra.IntegrationTests/Metrics/MetricsTests.cs
index 116a86347..50c34d8a6 100644
--- a/src/Cassandra.IntegrationTests/Metrics/MetricsTests.cs
+++ b/src/Cassandra.IntegrationTests/Metrics/MetricsTests.cs
@@ -26,6 +26,7 @@
 using Cassandra.Tests;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Metrics
 {
diff --git a/src/Cassandra.IntegrationTests/OpenTelemetry/OpenTelemetryTests.cs b/src/Cassandra.IntegrationTests/OpenTelemetry/OpenTelemetryTests.cs
index 4f11e806e..a35f506fd 100644
--- a/src/Cassandra.IntegrationTests/OpenTelemetry/OpenTelemetryTests.cs
+++ b/src/Cassandra.IntegrationTests/OpenTelemetry/OpenTelemetryTests.cs
@@ -30,6 +30,8 @@
 using Cassandra.Tests;
 using Cassandra.Tests.Mapping.Pocos;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 using OpenTelemetry;
 using OpenTelemetry.Trace;
 
diff --git a/src/Cassandra.IntegrationTests/Policies/Tests/ColumnEncryptionPolicyTests.cs b/src/Cassandra.IntegrationTests/Policies/Tests/ColumnEncryptionPolicyTests.cs
index 5938005e2..095685897 100644
--- a/src/Cassandra.IntegrationTests/Policies/Tests/ColumnEncryptionPolicyTests.cs
+++ b/src/Cassandra.IntegrationTests/Policies/Tests/ColumnEncryptionPolicyTests.cs
@@ -21,6 +21,7 @@
 using Cassandra.Serialization;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Policies.Tests
 {
diff --git a/src/Cassandra.IntegrationTests/Policies/Tests/ConsistencyTests.cs b/src/Cassandra.IntegrationTests/Policies/Tests/ConsistencyTests.cs
index d19acfd0a..75bd4cf02 100644
--- a/src/Cassandra.IntegrationTests/Policies/Tests/ConsistencyTests.cs
+++ b/src/Cassandra.IntegrationTests/Policies/Tests/ConsistencyTests.cs
@@ -22,6 +22,7 @@
 using Cassandra.IntegrationTests.TestClusterManagement;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 #pragma warning disable 618
 
 namespace Cassandra.IntegrationTests.Policies.Tests
diff --git a/src/Cassandra.IntegrationTests/Policies/Tests/IdempotenceAwareRetryPolicyTests.cs b/src/Cassandra.IntegrationTests/Policies/Tests/IdempotenceAwareRetryPolicyTests.cs
index 3e2248dc9..7ec3ff784 100644
--- a/src/Cassandra.IntegrationTests/Policies/Tests/IdempotenceAwareRetryPolicyTests.cs
+++ b/src/Cassandra.IntegrationTests/Policies/Tests/IdempotenceAwareRetryPolicyTests.cs
@@ -19,6 +19,7 @@
 using Cassandra.IntegrationTests.TestClusterManagement.Simulacron;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Policies.Tests
 {
diff --git a/src/Cassandra.IntegrationTests/Policies/Tests/LoadBalancingPolicyShortTests.cs b/src/Cassandra.IntegrationTests/Policies/Tests/LoadBalancingPolicyShortTests.cs
index c0fce0374..3fd11d5da 100644
--- a/src/Cassandra.IntegrationTests/Policies/Tests/LoadBalancingPolicyShortTests.cs
+++ b/src/Cassandra.IntegrationTests/Policies/Tests/LoadBalancingPolicyShortTests.cs
@@ -26,6 +26,8 @@
 using Cassandra.Serialization;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.IntegrationTests.Policies.Tests
 {
diff --git a/src/Cassandra.IntegrationTests/Policies/Tests/LoadBalancingPolicyTests.cs b/src/Cassandra.IntegrationTests/Policies/Tests/LoadBalancingPolicyTests.cs
index 5366dfa81..ae1a61092 100644
--- a/src/Cassandra.IntegrationTests/Policies/Tests/LoadBalancingPolicyTests.cs
+++ b/src/Cassandra.IntegrationTests/Policies/Tests/LoadBalancingPolicyTests.cs
@@ -21,6 +21,7 @@
 using Cassandra.IntegrationTests.TestClusterManagement;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Policies.Tests
 {
diff --git a/src/Cassandra.IntegrationTests/Policies/Tests/ReconnectionPolicyTests.cs b/src/Cassandra.IntegrationTests/Policies/Tests/ReconnectionPolicyTests.cs
index 814f60db0..b06d9b5fa 100644
--- a/src/Cassandra.IntegrationTests/Policies/Tests/ReconnectionPolicyTests.cs
+++ b/src/Cassandra.IntegrationTests/Policies/Tests/ReconnectionPolicyTests.cs
@@ -22,6 +22,7 @@
 using Cassandra.IntegrationTests.TestClusterManagement;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Policies.Tests
 {
diff --git a/src/Cassandra.IntegrationTests/Policies/Tests/RetryPolicyShortTests.cs b/src/Cassandra.IntegrationTests/Policies/Tests/RetryPolicyShortTests.cs
index 672672554..d2ac735a8 100644
--- a/src/Cassandra.IntegrationTests/Policies/Tests/RetryPolicyShortTests.cs
+++ b/src/Cassandra.IntegrationTests/Policies/Tests/RetryPolicyShortTests.cs
@@ -28,6 +28,7 @@
 using Newtonsoft.Json;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Policies.Tests
 {
diff --git a/src/Cassandra.IntegrationTests/Policies/Tests/RetryPolicyTests.cs b/src/Cassandra.IntegrationTests/Policies/Tests/RetryPolicyTests.cs
index 41fa19424..edd3c26fb 100644
--- a/src/Cassandra.IntegrationTests/Policies/Tests/RetryPolicyTests.cs
+++ b/src/Cassandra.IntegrationTests/Policies/Tests/RetryPolicyTests.cs
@@ -21,6 +21,7 @@
 using Cassandra.IntegrationTests.TestClusterManagement;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 #pragma warning disable 618
 
 namespace Cassandra.IntegrationTests.Policies.Tests
diff --git a/src/Cassandra.IntegrationTests/Policies/Tests/TokenAwareTransientReplicationTests.cs b/src/Cassandra.IntegrationTests/Policies/Tests/TokenAwareTransientReplicationTests.cs
index fca264c9b..a006ccc2c 100644
--- a/src/Cassandra.IntegrationTests/Policies/Tests/TokenAwareTransientReplicationTests.cs
+++ b/src/Cassandra.IntegrationTests/Policies/Tests/TokenAwareTransientReplicationTests.cs
@@ -21,6 +21,7 @@
 using Cassandra.IntegrationTests.TestClusterManagement;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Policies.Tests
 {
diff --git a/src/Cassandra.IntegrationTests/Policies/Util/PolicyTestTools.cs b/src/Cassandra.IntegrationTests/Policies/Util/PolicyTestTools.cs
index bfbe9f430..52d964854 100644
--- a/src/Cassandra.IntegrationTests/Policies/Util/PolicyTestTools.cs
+++ b/src/Cassandra.IntegrationTests/Policies/Util/PolicyTestTools.cs
@@ -24,6 +24,7 @@
 using Cassandra.IntegrationTests.TestClusterManagement;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.Policies.Util
 {
diff --git a/src/Cassandra.IntegrationTests/ScyllaLwtTests.cs b/src/Cassandra.IntegrationTests/ScyllaLwtTests.cs
index 0528015b1..4eae1549a 100644
--- a/src/Cassandra.IntegrationTests/ScyllaLwtTests.cs
+++ b/src/Cassandra.IntegrationTests/ScyllaLwtTests.cs
@@ -5,6 +5,7 @@
 using Cassandra.IntegrationTests.TestBase;
 using Cassandra.IntegrationTests.TestClusterManagement;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests
 {
diff --git a/src/Cassandra.IntegrationTests/ScyllaTabletTests.cs b/src/Cassandra.IntegrationTests/ScyllaTabletTests.cs
index 4edd35c2c..446b6745a 100644
--- a/src/Cassandra.IntegrationTests/ScyllaTabletTests.cs
+++ b/src/Cassandra.IntegrationTests/ScyllaTabletTests.cs
@@ -5,6 +5,7 @@
 using Cassandra.IntegrationTests.TestBase;
 using Cassandra.IntegrationTests.TestClusterManagement;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests
 {
diff --git a/src/Cassandra.IntegrationTests/ShardAwareOptionsTests.cs b/src/Cassandra.IntegrationTests/ShardAwareOptionsTests.cs
index 281898e16..b64d04d13 100644
--- a/src/Cassandra.IntegrationTests/ShardAwareOptionsTests.cs
+++ b/src/Cassandra.IntegrationTests/ShardAwareOptionsTests.cs
@@ -3,6 +3,7 @@
 using Cassandra.IntegrationTests.TestClusterManagement;
 using Cassandra.SessionManagement;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 using System.Linq;
 
 namespace Cassandra.IntegrationTests
diff --git a/src/Cassandra.IntegrationTests/ShardAwarenessTests.cs b/src/Cassandra.IntegrationTests/ShardAwarenessTests.cs
index 459b9301e..e46503594 100644
--- a/src/Cassandra.IntegrationTests/ShardAwarenessTests.cs
+++ b/src/Cassandra.IntegrationTests/ShardAwarenessTests.cs
@@ -7,6 +7,7 @@
 using Cassandra.IntegrationTests.TestClusterManagement;
 using Cassandra.SessionManagement;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests
 {
diff --git a/src/Cassandra.IntegrationTests/SimulacronTest.cs b/src/Cassandra.IntegrationTests/SimulacronTest.cs
index 1e1318f47..7458fd481 100644
--- a/src/Cassandra.IntegrationTests/SimulacronTest.cs
+++ b/src/Cassandra.IntegrationTests/SimulacronTest.cs
@@ -25,6 +25,7 @@
 using Cassandra.SessionManagement;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests
 {
diff --git a/src/Cassandra.IntegrationTests/TestBase/QueryTools.cs b/src/Cassandra.IntegrationTests/TestBase/QueryTools.cs
index c5e3e6d7b..e9c4c6c40 100644
--- a/src/Cassandra.IntegrationTests/TestBase/QueryTools.cs
+++ b/src/Cassandra.IntegrationTests/TestBase/QueryTools.cs
@@ -19,6 +19,7 @@
 using System.Linq;
 using System.Net;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.TestBase
 {
diff --git a/src/Cassandra.IntegrationTests/TestBase/TestUtils.cs b/src/Cassandra.IntegrationTests/TestBase/TestUtils.cs
index 424ff41b1..567ca94e6 100644
--- a/src/Cassandra.IntegrationTests/TestBase/TestUtils.cs
+++ b/src/Cassandra.IntegrationTests/TestBase/TestUtils.cs
@@ -27,6 +27,7 @@
 using Cassandra.IntegrationTests.TestClusterManagement;
 using Cassandra.Tests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.IntegrationTests.TestBase
 {
diff --git a/src/Cassandra.Tests/AbstractResponseTest.cs b/src/Cassandra.Tests/AbstractResponseTest.cs
index ea00d59ad..95655d5fa 100644
--- a/src/Cassandra.Tests/AbstractResponseTest.cs
+++ b/src/Cassandra.Tests/AbstractResponseTest.cs
@@ -19,6 +19,7 @@
 using Cassandra.Responses;
 using Cassandra.Serialization;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/AddressTranslatorTests.cs b/src/Cassandra.Tests/AddressTranslatorTests.cs
index b1cdbc8ed..13c649ce3 100644
--- a/src/Cassandra.Tests/AddressTranslatorTests.cs
+++ b/src/Cassandra.Tests/AddressTranslatorTests.cs
@@ -18,6 +18,7 @@
 using System.Net;
 using Cassandra.Tasks;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/ApiTests.cs b/src/Cassandra.Tests/ApiTests.cs
index 9e72678e4..821bc3329 100644
--- a/src/Cassandra.Tests/ApiTests.cs
+++ b/src/Cassandra.Tests/ApiTests.cs
@@ -18,6 +18,8 @@
 using System.Linq;
 using System.Reflection;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/AppMetricsExtension/HistogramTests.cs b/src/Cassandra.Tests/AppMetricsExtension/HistogramTests.cs
index 657da065f..9229ab890 100644
--- a/src/Cassandra.Tests/AppMetricsExtension/HistogramTests.cs
+++ b/src/Cassandra.Tests/AppMetricsExtension/HistogramTests.cs
@@ -23,6 +23,7 @@
 using Cassandra.AppMetrics.Implementations;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.AppMetricsExtension
 {
diff --git a/src/Cassandra.Tests/BuilderTests.cs b/src/Cassandra.Tests/BuilderTests.cs
index 46936c142..4315b6e9f 100644
--- a/src/Cassandra.Tests/BuilderTests.cs
+++ b/src/Cassandra.Tests/BuilderTests.cs
@@ -19,6 +19,8 @@
 using System.Net;
 using Cassandra.Connections;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/Cassandra.Tests.csproj b/src/Cassandra.Tests/Cassandra.Tests.csproj
index bf8ee2c23..4cc3c088d 100644
--- a/src/Cassandra.Tests/Cassandra.Tests.csproj
+++ b/src/Cassandra.Tests/Cassandra.Tests.csproj
@@ -31,7 +31,7 @@
     <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageReference Include="Moq" Version="4.7.99" />
-    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit" Version="4.4.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
     <PackageReference Include="NunitXml.TestLogger" Version="6.1.0" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
diff --git a/src/Cassandra.Tests/ClusterTests.cs b/src/Cassandra.Tests/ClusterTests.cs
index 493dfa6ad..d7381fa4b 100644
--- a/src/Cassandra.Tests/ClusterTests.cs
+++ b/src/Cassandra.Tests/ClusterTests.cs
@@ -26,6 +26,7 @@
 
 using Moq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/CollectionTests.cs b/src/Cassandra.Tests/CollectionTests.cs
index c8dbe0a3b..d4bc40d7f 100644
--- a/src/Cassandra.Tests/CollectionTests.cs
+++ b/src/Cassandra.Tests/CollectionTests.cs
@@ -19,6 +19,8 @@
 using System.Linq;
 using Cassandra.Collections;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/ConnectionTests.cs b/src/Cassandra.Tests/ConnectionTests.cs
index a6c0963e4..262a4c1f2 100644
--- a/src/Cassandra.Tests/ConnectionTests.cs
+++ b/src/Cassandra.Tests/ConnectionTests.cs
@@ -28,6 +28,8 @@
 using Cassandra.Serialization;
 using Moq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs b/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs
index 02fb8c691..0401ba70f 100644
--- a/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs
+++ b/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs
@@ -29,6 +29,8 @@
 using Cassandra.Tests.MetadataHelpers.TestHelpers;
 using Moq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.Tests.Connections.Control
 {
diff --git a/src/Cassandra.Tests/Connections/Control/HostnameContactPointTests.cs b/src/Cassandra.Tests/Connections/Control/HostnameContactPointTests.cs
index ff3cbc974..c06eedd34 100644
--- a/src/Cassandra.Tests/Connections/Control/HostnameContactPointTests.cs
+++ b/src/Cassandra.Tests/Connections/Control/HostnameContactPointTests.cs
@@ -21,6 +21,7 @@
 using Cassandra.Connections;
 using Moq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.Connections.Control
 {
diff --git a/src/Cassandra.Tests/Connections/Control/ResolvedContactPointTests.cs b/src/Cassandra.Tests/Connections/Control/ResolvedContactPointTests.cs
index a167c9813..b1f45adab 100644
--- a/src/Cassandra.Tests/Connections/Control/ResolvedContactPointTests.cs
+++ b/src/Cassandra.Tests/Connections/Control/ResolvedContactPointTests.cs
@@ -20,6 +20,7 @@
 using Cassandra.Connections;
 using Cassandra.Connections.Control;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.Connections.Control
 {
diff --git a/src/Cassandra.Tests/Connections/Control/TopologyRefresherTests.cs b/src/Cassandra.Tests/Connections/Control/TopologyRefresherTests.cs
index 4563bc969..0bbdefcd4 100644
--- a/src/Cassandra.Tests/Connections/Control/TopologyRefresherTests.cs
+++ b/src/Cassandra.Tests/Connections/Control/TopologyRefresherTests.cs
@@ -26,6 +26,7 @@
 using Cassandra.Tests.Connections.TestHelpers;
 using Moq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.Connections.Control
 {
diff --git a/src/Cassandra.Tests/Connections/EndPointResolverTests.cs b/src/Cassandra.Tests/Connections/EndPointResolverTests.cs
index a545ac137..55fdff3ba 100644
--- a/src/Cassandra.Tests/Connections/EndPointResolverTests.cs
+++ b/src/Cassandra.Tests/Connections/EndPointResolverTests.cs
@@ -20,6 +20,7 @@
 using Cassandra.Connections;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.Connections
 {
diff --git a/src/Cassandra.Tests/Connections/HostConnectionPoolTests.cs b/src/Cassandra.Tests/Connections/HostConnectionPoolTests.cs
index e24cd370a..2d6c69697 100644
--- a/src/Cassandra.Tests/Connections/HostConnectionPoolTests.cs
+++ b/src/Cassandra.Tests/Connections/HostConnectionPoolTests.cs
@@ -27,6 +27,7 @@
 using Cassandra.Tests.Connections.TestHelpers;
 using Moq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.Connections
 {
diff --git a/src/Cassandra.Tests/Connections/SniContactPointAndResolverTests.cs b/src/Cassandra.Tests/Connections/SniContactPointAndResolverTests.cs
index e3ad7d8c9..a44b599e7 100644
--- a/src/Cassandra.Tests/Connections/SniContactPointAndResolverTests.cs
+++ b/src/Cassandra.Tests/Connections/SniContactPointAndResolverTests.cs
@@ -26,6 +26,8 @@
 using Cassandra.Helpers;
 using Moq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.Tests.Connections
 {
diff --git a/src/Cassandra.Tests/CqlCommandTest.cs b/src/Cassandra.Tests/CqlCommandTest.cs
index d5b6c5a87..c3079e62e 100644
--- a/src/Cassandra.Tests/CqlCommandTest.cs
+++ b/src/Cassandra.Tests/CqlCommandTest.cs
@@ -18,6 +18,7 @@
 using System.Data;
 using Cassandra.Data;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/CqlParameterCollectionTest.cs b/src/Cassandra.Tests/CqlParameterCollectionTest.cs
index 515a7eb28..657f06fe4 100644
--- a/src/Cassandra.Tests/CqlParameterCollectionTest.cs
+++ b/src/Cassandra.Tests/CqlParameterCollectionTest.cs
@@ -16,6 +16,7 @@
 
 using Cassandra.Data;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/CqlParameterTest.cs b/src/Cassandra.Tests/CqlParameterTest.cs
index 9088e596c..127cf193a 100644
--- a/src/Cassandra.Tests/CqlParameterTest.cs
+++ b/src/Cassandra.Tests/CqlParameterTest.cs
@@ -18,6 +18,7 @@
 using System.Data;
 using Cassandra.Data;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/CustomTypeSerializerTests.cs b/src/Cassandra.Tests/CustomTypeSerializerTests.cs
index 3e7feab5f..4f7d85656 100644
--- a/src/Cassandra.Tests/CustomTypeSerializerTests.cs
+++ b/src/Cassandra.Tests/CustomTypeSerializerTests.cs
@@ -19,6 +19,8 @@
 using Cassandra.Serialization;
 using Cassandra.Tests.Extensions.Serializers;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/DataTypeParserTests.cs b/src/Cassandra.Tests/DataTypeParserTests.cs
index aeeac479a..f3ba5f30a 100644
--- a/src/Cassandra.Tests/DataTypeParserTests.cs
+++ b/src/Cassandra.Tests/DataTypeParserTests.cs
@@ -20,6 +20,7 @@
 using System.Threading.Tasks;
 using Cassandra.Serialization;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/DurationTests.cs b/src/Cassandra.Tests/DurationTests.cs
index 41f0cea84..8eaba6603 100644
--- a/src/Cassandra.Tests/DurationTests.cs
+++ b/src/Cassandra.Tests/DurationTests.cs
@@ -18,6 +18,7 @@
 using System.Linq;
 using Cassandra.Serialization;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/EndianBitConverterTests.cs b/src/Cassandra.Tests/EndianBitConverterTests.cs
index fb02d663f..b6d03f5c1 100644
--- a/src/Cassandra.Tests/EndianBitConverterTests.cs
+++ b/src/Cassandra.Tests/EndianBitConverterTests.cs
@@ -16,6 +16,8 @@
 using System;
 using System.Linq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/ExceptionsUnitTest.cs b/src/Cassandra.Tests/ExceptionsUnitTest.cs
index 2eabe2ec7..1b03e1774 100644
--- a/src/Cassandra.Tests/ExceptionsUnitTest.cs
+++ b/src/Cassandra.Tests/ExceptionsUnitTest.cs
@@ -18,6 +18,8 @@
 using System.Collections.Generic;
 using System.Net;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using StringAssert = NUnit.Framework.Legacy.StringAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/ExecutionProfiles/ClusterTests.cs b/src/Cassandra.Tests/ExecutionProfiles/ClusterTests.cs
index 238a956c2..10ebc152a 100644
--- a/src/Cassandra.Tests/ExecutionProfiles/ClusterTests.cs
+++ b/src/Cassandra.Tests/ExecutionProfiles/ClusterTests.cs
@@ -21,6 +21,7 @@
 using Cassandra.Tests.Connections.TestHelpers;
 using Moq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.ExecutionProfiles
 {
diff --git a/src/Cassandra.Tests/ExecutionProfiles/ConfigurationTests.cs b/src/Cassandra.Tests/ExecutionProfiles/ConfigurationTests.cs
index 85badacec..060139bed 100644
--- a/src/Cassandra.Tests/ExecutionProfiles/ConfigurationTests.cs
+++ b/src/Cassandra.Tests/ExecutionProfiles/ConfigurationTests.cs
@@ -15,6 +15,7 @@
 //
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.ExecutionProfiles
 {
diff --git a/src/Cassandra.Tests/ExecutionProfiles/ExecutionProfileBuilderTests.cs b/src/Cassandra.Tests/ExecutionProfiles/ExecutionProfileBuilderTests.cs
index c22b67717..752841e5b 100644
--- a/src/Cassandra.Tests/ExecutionProfiles/ExecutionProfileBuilderTests.cs
+++ b/src/Cassandra.Tests/ExecutionProfiles/ExecutionProfileBuilderTests.cs
@@ -16,6 +16,7 @@
 
 using Cassandra.ExecutionProfiles;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.ExecutionProfiles
 {
diff --git a/src/Cassandra.Tests/ExecutionProfiles/RequestHandlerTests.cs b/src/Cassandra.Tests/ExecutionProfiles/RequestHandlerTests.cs
index 252eb597e..546e6be5b 100644
--- a/src/Cassandra.Tests/ExecutionProfiles/RequestHandlerTests.cs
+++ b/src/Cassandra.Tests/ExecutionProfiles/RequestHandlerTests.cs
@@ -35,6 +35,7 @@
 using Moq;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.ExecutionProfiles
 {
diff --git a/src/Cassandra.Tests/FrameParserTests.cs b/src/Cassandra.Tests/FrameParserTests.cs
index c6742efcf..0b84c7155 100644
--- a/src/Cassandra.Tests/FrameParserTests.cs
+++ b/src/Cassandra.Tests/FrameParserTests.cs
@@ -24,6 +24,7 @@
 using Cassandra.Serialization;
 using Moq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/HostConnectionPoolTests.cs b/src/Cassandra.Tests/HostConnectionPoolTests.cs
index 4f20d4c20..e470f14b4 100644
--- a/src/Cassandra.Tests/HostConnectionPoolTests.cs
+++ b/src/Cassandra.Tests/HostConnectionPoolTests.cs
@@ -35,6 +35,8 @@
 using Moq;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 // ReSharper disable AccessToModifiedClosure
 
diff --git a/src/Cassandra.Tests/HostTests.cs b/src/Cassandra.Tests/HostTests.cs
index e0168def0..2e45e2d64 100644
--- a/src/Cassandra.Tests/HostTests.cs
+++ b/src/Cassandra.Tests/HostTests.cs
@@ -19,6 +19,7 @@
 using System.Net;
 using System.Threading;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/IOUnitTests.cs b/src/Cassandra.Tests/IOUnitTests.cs
index ca2a04485..26c2227d9 100644
--- a/src/Cassandra.Tests/IOUnitTests.cs
+++ b/src/Cassandra.Tests/IOUnitTests.cs
@@ -17,6 +17,8 @@
 using System;
 using System.IO;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 using System.Linq;
 using System.Net;
 using System.Threading;
diff --git a/src/Cassandra.Tests/KeyspaceMetadataTests.cs b/src/Cassandra.Tests/KeyspaceMetadataTests.cs
index 468920e89..497f526c8 100644
--- a/src/Cassandra.Tests/KeyspaceMetadataTests.cs
+++ b/src/Cassandra.Tests/KeyspaceMetadataTests.cs
@@ -18,6 +18,7 @@
 using System.Collections.Generic;
 using Cassandra.MetadataHelpers;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/LocalDateTests.cs b/src/Cassandra.Tests/LocalDateTests.cs
index 18d491242..6cb63a577 100644
--- a/src/Cassandra.Tests/LocalDateTests.cs
+++ b/src/Cassandra.Tests/LocalDateTests.cs
@@ -17,6 +17,7 @@
 using System;
 using System.Linq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/LocalTimeTests.cs b/src/Cassandra.Tests/LocalTimeTests.cs
index ed6dc61d3..67dc8fd3f 100644
--- a/src/Cassandra.Tests/LocalTimeTests.cs
+++ b/src/Cassandra.Tests/LocalTimeTests.cs
@@ -18,6 +18,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 // ReSharper disable ObjectCreationAsStatement
 
 namespace Cassandra.Tests
diff --git a/src/Cassandra.Tests/LoggingTests.cs b/src/Cassandra.Tests/LoggingTests.cs
index 13c174f39..0ff43da3b 100644
--- a/src/Cassandra.Tests/LoggingTests.cs
+++ b/src/Cassandra.Tests/LoggingTests.cs
@@ -20,6 +20,8 @@
 using System.Linq;
 using System.Threading;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using StringAssert = NUnit.Framework.Legacy.StringAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/Mapping/AttributeBasedTypeDefinitionTests.cs b/src/Cassandra.Tests/Mapping/AttributeBasedTypeDefinitionTests.cs
index 3f57bd610..d58d143e5 100644
--- a/src/Cassandra.Tests/Mapping/AttributeBasedTypeDefinitionTests.cs
+++ b/src/Cassandra.Tests/Mapping/AttributeBasedTypeDefinitionTests.cs
@@ -19,6 +19,8 @@
 using Cassandra.Mapping.Attributes;
 using Cassandra.Tests.Mapping.Pocos;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.Tests.Mapping
 {
diff --git a/src/Cassandra.Tests/Mapping/BatchTests.cs b/src/Cassandra.Tests/Mapping/BatchTests.cs
index e64e16194..fd697d0a1 100644
--- a/src/Cassandra.Tests/Mapping/BatchTests.cs
+++ b/src/Cassandra.Tests/Mapping/BatchTests.cs
@@ -23,6 +23,7 @@
 using Moq;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.Mapping
 {
diff --git a/src/Cassandra.Tests/Mapping/CqlGeneratorTests.cs b/src/Cassandra.Tests/Mapping/CqlGeneratorTests.cs
index 0e7ef2ae7..03f45710d 100644
--- a/src/Cassandra.Tests/Mapping/CqlGeneratorTests.cs
+++ b/src/Cassandra.Tests/Mapping/CqlGeneratorTests.cs
@@ -21,6 +21,8 @@
 using Cassandra.Mapping.Utils;
 using Cassandra.Tests.Mapping.Pocos;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.Tests.Mapping
 {
diff --git a/src/Cassandra.Tests/Mapping/DeleteTests.cs b/src/Cassandra.Tests/Mapping/DeleteTests.cs
index 5cb0c1545..48785e45a 100644
--- a/src/Cassandra.Tests/Mapping/DeleteTests.cs
+++ b/src/Cassandra.Tests/Mapping/DeleteTests.cs
@@ -21,6 +21,8 @@
 using Cassandra.Tests.Mapping.TestData;
 using Moq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.Tests.Mapping
 {
diff --git a/src/Cassandra.Tests/Mapping/ExecuteTests.cs b/src/Cassandra.Tests/Mapping/ExecuteTests.cs
index 8bdee6ae0..c1dcdc6e5 100644
--- a/src/Cassandra.Tests/Mapping/ExecuteTests.cs
+++ b/src/Cassandra.Tests/Mapping/ExecuteTests.cs
@@ -21,6 +21,7 @@
 using Moq;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.Mapping
 {
diff --git a/src/Cassandra.Tests/Mapping/FetchTests.cs b/src/Cassandra.Tests/Mapping/FetchTests.cs
index ed6239b90..3f57ed8ef 100644
--- a/src/Cassandra.Tests/Mapping/FetchTests.cs
+++ b/src/Cassandra.Tests/Mapping/FetchTests.cs
@@ -25,6 +25,9 @@
 using Cassandra.Tests.Mapping.TestData;
 using Moq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using StringAssert = NUnit.Framework.Legacy.StringAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.Tests.Mapping
 {
diff --git a/src/Cassandra.Tests/Mapping/FirstTests.cs b/src/Cassandra.Tests/Mapping/FirstTests.cs
index c4413ef74..6fa1928da 100644
--- a/src/Cassandra.Tests/Mapping/FirstTests.cs
+++ b/src/Cassandra.Tests/Mapping/FirstTests.cs
@@ -20,6 +20,7 @@
 using Cassandra.Tests.Mapping.Pocos;
 using Cassandra.Tests.Mapping.TestData;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.Mapping
 {
diff --git a/src/Cassandra.Tests/Mapping/InsertTests.cs b/src/Cassandra.Tests/Mapping/InsertTests.cs
index ece738cc1..ce6656a79 100644
--- a/src/Cassandra.Tests/Mapping/InsertTests.cs
+++ b/src/Cassandra.Tests/Mapping/InsertTests.cs
@@ -24,6 +24,9 @@
 using Moq;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
+using StringAssert = NUnit.Framework.Legacy.StringAssert;
 
 namespace Cassandra.Tests.Mapping
 {
diff --git a/src/Cassandra.Tests/Mapping/Linq/LinqBatchStatementUnitTests.cs b/src/Cassandra.Tests/Mapping/Linq/LinqBatchStatementUnitTests.cs
index 2576956fe..3cb736b30 100644
--- a/src/Cassandra.Tests/Mapping/Linq/LinqBatchStatementUnitTests.cs
+++ b/src/Cassandra.Tests/Mapping/Linq/LinqBatchStatementUnitTests.cs
@@ -20,6 +20,7 @@
 using Cassandra.Mapping;
 using Cassandra.Tests.Mapping.Pocos;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.Mapping.Linq
 {
diff --git a/src/Cassandra.Tests/Mapping/Linq/LinqCreateTableUnitTests.cs b/src/Cassandra.Tests/Mapping/Linq/LinqCreateTableUnitTests.cs
index b6ef0a797..5cf6a4674 100644
--- a/src/Cassandra.Tests/Mapping/Linq/LinqCreateTableUnitTests.cs
+++ b/src/Cassandra.Tests/Mapping/Linq/LinqCreateTableUnitTests.cs
@@ -23,6 +23,7 @@
 using Cassandra.Tests.Mapping.Pocos;
 using Moq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.Mapping.Linq
 {
diff --git a/src/Cassandra.Tests/Mapping/Linq/LinqEntryPointsTests.cs b/src/Cassandra.Tests/Mapping/Linq/LinqEntryPointsTests.cs
index 8c1c09f1f..283171dfa 100644
--- a/src/Cassandra.Tests/Mapping/Linq/LinqEntryPointsTests.cs
+++ b/src/Cassandra.Tests/Mapping/Linq/LinqEntryPointsTests.cs
@@ -21,6 +21,7 @@
 using Cassandra.Tests.Mapping.Pocos;
 using Moq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.Mapping.Linq
 {
diff --git a/src/Cassandra.Tests/Mapping/Linq/LinqExecutionProfileTests.cs b/src/Cassandra.Tests/Mapping/Linq/LinqExecutionProfileTests.cs
index 95375732b..9c697ec34 100644
--- a/src/Cassandra.Tests/Mapping/Linq/LinqExecutionProfileTests.cs
+++ b/src/Cassandra.Tests/Mapping/Linq/LinqExecutionProfileTests.cs
@@ -22,6 +22,7 @@
 using Cassandra.Tests.Mapping.Pocos;
 using Moq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.Mapping.Linq
 {
diff --git a/src/Cassandra.Tests/Mapping/Linq/LinqMappingUnitTests.cs b/src/Cassandra.Tests/Mapping/Linq/LinqMappingUnitTests.cs
index c3a88d51f..770f17c3c 100644
--- a/src/Cassandra.Tests/Mapping/Linq/LinqMappingUnitTests.cs
+++ b/src/Cassandra.Tests/Mapping/Linq/LinqMappingUnitTests.cs
@@ -27,6 +27,8 @@
 using Moq;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.Tests.Mapping.Linq
 {
diff --git a/src/Cassandra.Tests/Mapping/Linq/LinqToCqlDeleteTests.cs b/src/Cassandra.Tests/Mapping/Linq/LinqToCqlDeleteTests.cs
index 1a76db133..f48c58ea3 100644
--- a/src/Cassandra.Tests/Mapping/Linq/LinqToCqlDeleteTests.cs
+++ b/src/Cassandra.Tests/Mapping/Linq/LinqToCqlDeleteTests.cs
@@ -18,6 +18,8 @@
 using Cassandra.Mapping;
 using Cassandra.Tests.Mapping.Pocos;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.Tests.Mapping.Linq
 {
diff --git a/src/Cassandra.Tests/Mapping/Linq/LinqToCqlFunctionTests.cs b/src/Cassandra.Tests/Mapping/Linq/LinqToCqlFunctionTests.cs
index 8aa640ccb..cc15cb4c6 100644
--- a/src/Cassandra.Tests/Mapping/Linq/LinqToCqlFunctionTests.cs
+++ b/src/Cassandra.Tests/Mapping/Linq/LinqToCqlFunctionTests.cs
@@ -20,6 +20,8 @@
 using Cassandra.Mapping;
 using Cassandra.Tests.Mapping.Pocos;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.Tests.Mapping.Linq
 {
diff --git a/src/Cassandra.Tests/Mapping/Linq/LinqToCqlInsertUnitTests.cs b/src/Cassandra.Tests/Mapping/Linq/LinqToCqlInsertUnitTests.cs
index d09f76996..832c729ab 100644
--- a/src/Cassandra.Tests/Mapping/Linq/LinqToCqlInsertUnitTests.cs
+++ b/src/Cassandra.Tests/Mapping/Linq/LinqToCqlInsertUnitTests.cs
@@ -19,6 +19,8 @@
 using Cassandra.Mapping;
 using Cassandra.Tests.Mapping.Pocos;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using StringAssert = NUnit.Framework.Legacy.StringAssert;
 
 namespace Cassandra.Tests.Mapping.Linq
 {
diff --git a/src/Cassandra.Tests/Mapping/Linq/LinqToCqlSelectUnitTests.cs b/src/Cassandra.Tests/Mapping/Linq/LinqToCqlSelectUnitTests.cs
index 1c0f62576..1ff72e0bb 100644
--- a/src/Cassandra.Tests/Mapping/Linq/LinqToCqlSelectUnitTests.cs
+++ b/src/Cassandra.Tests/Mapping/Linq/LinqToCqlSelectUnitTests.cs
@@ -23,6 +23,9 @@
 using Cassandra.Tests.Mapping.Pocos;
 using Cassandra.Tests.Mapping.TestData;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using StringAssert = NUnit.Framework.Legacy.StringAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.Tests.Mapping.Linq
 {
diff --git a/src/Cassandra.Tests/Mapping/Linq/LinqToCqlUnitTests.cs b/src/Cassandra.Tests/Mapping/Linq/LinqToCqlUnitTests.cs
index a4c156dbc..380ebc334 100644
--- a/src/Cassandra.Tests/Mapping/Linq/LinqToCqlUnitTests.cs
+++ b/src/Cassandra.Tests/Mapping/Linq/LinqToCqlUnitTests.cs
@@ -27,6 +27,8 @@
 using Cassandra.Tests.Mapping.Pocos;
 using Moq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using StringAssert = NUnit.Framework.Legacy.StringAssert;
 using Cassandra.Tasks;
 
 #pragma warning disable 618
diff --git a/src/Cassandra.Tests/Mapping/Linq/LinqToCqlUpdateUnitTests.cs b/src/Cassandra.Tests/Mapping/Linq/LinqToCqlUpdateUnitTests.cs
index 8be370b3f..a477b8d58 100644
--- a/src/Cassandra.Tests/Mapping/Linq/LinqToCqlUpdateUnitTests.cs
+++ b/src/Cassandra.Tests/Mapping/Linq/LinqToCqlUpdateUnitTests.cs
@@ -20,6 +20,8 @@
 using Cassandra.Mapping;
 using Cassandra.Tests.Mapping.Pocos;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.Tests.Mapping.Linq
 {
diff --git a/src/Cassandra.Tests/Mapping/LinqAttributeBasedTypeDefinitionTests.cs b/src/Cassandra.Tests/Mapping/LinqAttributeBasedTypeDefinitionTests.cs
index 3919aace6..eb3956741 100644
--- a/src/Cassandra.Tests/Mapping/LinqAttributeBasedTypeDefinitionTests.cs
+++ b/src/Cassandra.Tests/Mapping/LinqAttributeBasedTypeDefinitionTests.cs
@@ -16,7 +16,9 @@
 
 using System;
 using Cassandra.Data.Linq;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using SortOrder = Cassandra.Mapping.SortOrder;
 
 #pragma warning disable 612
diff --git a/src/Cassandra.Tests/Mapping/MapperExecutionProfileTests.cs b/src/Cassandra.Tests/Mapping/MapperExecutionProfileTests.cs
index dc15c962f..87d801b34 100644
--- a/src/Cassandra.Tests/Mapping/MapperExecutionProfileTests.cs
+++ b/src/Cassandra.Tests/Mapping/MapperExecutionProfileTests.cs
@@ -23,6 +23,8 @@
 using Cassandra.Tests.Mapping.TestData;
 using Moq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.Tests.Mapping
 {
diff --git a/src/Cassandra.Tests/Mapping/MappingConfigurationTests.cs b/src/Cassandra.Tests/Mapping/MappingConfigurationTests.cs
index 9744cf150..41d8efff6 100644
--- a/src/Cassandra.Tests/Mapping/MappingConfigurationTests.cs
+++ b/src/Cassandra.Tests/Mapping/MappingConfigurationTests.cs
@@ -19,6 +19,7 @@
 using Cassandra.Tests.Mapping.FluentMappings;
 using Cassandra.Tests.Mapping.Pocos;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.Mapping
 {
diff --git a/src/Cassandra.Tests/Mapping/MappingTestBase.cs b/src/Cassandra.Tests/Mapping/MappingTestBase.cs
index 7910f5586..1f5b62464 100644
--- a/src/Cassandra.Tests/Mapping/MappingTestBase.cs
+++ b/src/Cassandra.Tests/Mapping/MappingTestBase.cs
@@ -24,6 +24,7 @@
 using Cassandra.Tests.Mapping.Pocos;
 using Moq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.Mapping
 {
diff --git a/src/Cassandra.Tests/Mapping/Pocos/VectorEntity.cs b/src/Cassandra.Tests/Mapping/Pocos/VectorEntity.cs
index 8c2671156..b64a0f8f4 100644
--- a/src/Cassandra.Tests/Mapping/Pocos/VectorEntity.cs
+++ b/src/Cassandra.Tests/Mapping/Pocos/VectorEntity.cs
@@ -17,6 +17,8 @@
 using Cassandra.Mapping.Attributes;
 using System;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.Tests.Mapping.Pocos
 {
diff --git a/src/Cassandra.Tests/Mapping/StatementFactoryTests.cs b/src/Cassandra.Tests/Mapping/StatementFactoryTests.cs
index 0d989c53c..7fe05ef07 100644
--- a/src/Cassandra.Tests/Mapping/StatementFactoryTests.cs
+++ b/src/Cassandra.Tests/Mapping/StatementFactoryTests.cs
@@ -26,6 +26,7 @@
 using Cassandra.Tasks;
 using Moq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.Mapping
 {
diff --git a/src/Cassandra.Tests/Mapping/TypeConverterTests.cs b/src/Cassandra.Tests/Mapping/TypeConverterTests.cs
index 110ffde66..16403b2b1 100644
--- a/src/Cassandra.Tests/Mapping/TypeConverterTests.cs
+++ b/src/Cassandra.Tests/Mapping/TypeConverterTests.cs
@@ -21,6 +21,8 @@
 using Cassandra.Mapping.TypeConversion;
 using Cassandra.Tests.TestAttributes;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.Tests.Mapping
 {
diff --git a/src/Cassandra.Tests/Mapping/UpdateTests.cs b/src/Cassandra.Tests/Mapping/UpdateTests.cs
index 153d551f2..dd65adb69 100644
--- a/src/Cassandra.Tests/Mapping/UpdateTests.cs
+++ b/src/Cassandra.Tests/Mapping/UpdateTests.cs
@@ -23,6 +23,7 @@
 using Cassandra.Tests.Mapping.TestData;
 using Moq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.Mapping
 {
diff --git a/src/Cassandra.Tests/Mapping/Utils/CqlIdentifierHelperTests.cs b/src/Cassandra.Tests/Mapping/Utils/CqlIdentifierHelperTests.cs
index 202a8008f..08cc7d945 100644
--- a/src/Cassandra.Tests/Mapping/Utils/CqlIdentifierHelperTests.cs
+++ b/src/Cassandra.Tests/Mapping/Utils/CqlIdentifierHelperTests.cs
@@ -18,6 +18,7 @@
 using Cassandra.Mapping.Utils;
 using Moq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.Mapping.Utils
 {
diff --git a/src/Cassandra.Tests/MetadataHelpers/EverywhereStrategyTests.cs b/src/Cassandra.Tests/MetadataHelpers/EverywhereStrategyTests.cs
index 10217651b..d125dd43d 100644
--- a/src/Cassandra.Tests/MetadataHelpers/EverywhereStrategyTests.cs
+++ b/src/Cassandra.Tests/MetadataHelpers/EverywhereStrategyTests.cs
@@ -17,6 +17,7 @@
 using Cassandra.MetadataHelpers;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.MetadataHelpers
 {
diff --git a/src/Cassandra.Tests/MetadataHelpers/LocalStrategyTests.cs b/src/Cassandra.Tests/MetadataHelpers/LocalStrategyTests.cs
index f514b768f..ac9a789d1 100644
--- a/src/Cassandra.Tests/MetadataHelpers/LocalStrategyTests.cs
+++ b/src/Cassandra.Tests/MetadataHelpers/LocalStrategyTests.cs
@@ -18,6 +18,7 @@
 using Cassandra.MetadataHelpers;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.MetadataHelpers
 {
diff --git a/src/Cassandra.Tests/MetadataHelpers/NetworkTopologyStrategyTests.cs b/src/Cassandra.Tests/MetadataHelpers/NetworkTopologyStrategyTests.cs
index ac6e576cc..74662db94 100644
--- a/src/Cassandra.Tests/MetadataHelpers/NetworkTopologyStrategyTests.cs
+++ b/src/Cassandra.Tests/MetadataHelpers/NetworkTopologyStrategyTests.cs
@@ -17,6 +17,7 @@
 using System.Collections.Generic;
 using Cassandra.MetadataHelpers;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.MetadataHelpers
 {
diff --git a/src/Cassandra.Tests/MetadataHelpers/ReplicationFactorTests.cs b/src/Cassandra.Tests/MetadataHelpers/ReplicationFactorTests.cs
index 9eb327ec4..2459bca32 100644
--- a/src/Cassandra.Tests/MetadataHelpers/ReplicationFactorTests.cs
+++ b/src/Cassandra.Tests/MetadataHelpers/ReplicationFactorTests.cs
@@ -15,6 +15,7 @@
 
 using Cassandra.MetadataHelpers;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.MetadataHelpers
 {
diff --git a/src/Cassandra.Tests/MetadataHelpers/SimpleStrategyTests.cs b/src/Cassandra.Tests/MetadataHelpers/SimpleStrategyTests.cs
index 1291f6d21..fdff03b64 100644
--- a/src/Cassandra.Tests/MetadataHelpers/SimpleStrategyTests.cs
+++ b/src/Cassandra.Tests/MetadataHelpers/SimpleStrategyTests.cs
@@ -17,6 +17,7 @@
 using Cassandra.MetadataHelpers;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.MetadataHelpers
 {
diff --git a/src/Cassandra.Tests/MetadataTests/ProtocolEventDebouncerTests.cs b/src/Cassandra.Tests/MetadataTests/ProtocolEventDebouncerTests.cs
index 94a2a3ed8..5044f820e 100644
--- a/src/Cassandra.Tests/MetadataTests/ProtocolEventDebouncerTests.cs
+++ b/src/Cassandra.Tests/MetadataTests/ProtocolEventDebouncerTests.cs
@@ -26,6 +26,7 @@
 using Moq;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.MetadataTests
 {
diff --git a/src/Cassandra.Tests/MetadataTests/TaskBasedTimerTests.cs b/src/Cassandra.Tests/MetadataTests/TaskBasedTimerTests.cs
index e4095685e..1c01c3556 100644
--- a/src/Cassandra.Tests/MetadataTests/TaskBasedTimerTests.cs
+++ b/src/Cassandra.Tests/MetadataTests/TaskBasedTimerTests.cs
@@ -21,6 +21,7 @@
 using System.Threading.Tasks;
 using Cassandra.ProtocolEvents;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.MetadataTests
 {
diff --git a/src/Cassandra.Tests/Metrics/MetricsTests.cs b/src/Cassandra.Tests/Metrics/MetricsTests.cs
index 6a835d6d1..a38ba28ef 100644
--- a/src/Cassandra.Tests/Metrics/MetricsTests.cs
+++ b/src/Cassandra.Tests/Metrics/MetricsTests.cs
@@ -16,6 +16,7 @@
 
 using Cassandra.Metrics;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.Metrics
 {
diff --git a/src/Cassandra.Tests/ObsoletedMemberTests.cs b/src/Cassandra.Tests/ObsoletedMemberTests.cs
index ebe2efa34..1fe77b3ff 100644
--- a/src/Cassandra.Tests/ObsoletedMemberTests.cs
+++ b/src/Cassandra.Tests/ObsoletedMemberTests.cs
@@ -17,6 +17,7 @@
 using System;
 using System.Linq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 using System.Reflection;
 #pragma warning disable 618
 
diff --git a/src/Cassandra.Tests/OpenTelemetryTests.cs b/src/Cassandra.Tests/OpenTelemetryTests.cs
index 7359e745a..54064aab4 100644
--- a/src/Cassandra.Tests/OpenTelemetryTests.cs
+++ b/src/Cassandra.Tests/OpenTelemetryTests.cs
@@ -20,6 +20,7 @@
 using System.Threading.Tasks;
 using Cassandra.OpenTelemetry;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/OutputErrorTests.cs b/src/Cassandra.Tests/OutputErrorTests.cs
index 91c58184b..c2b61eda7 100644
--- a/src/Cassandra.Tests/OutputErrorTests.cs
+++ b/src/Cassandra.Tests/OutputErrorTests.cs
@@ -15,6 +15,7 @@
 //
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/Policies/DefaultLoadBalancingTests.cs b/src/Cassandra.Tests/Policies/DefaultLoadBalancingTests.cs
index b6ce89c9f..659bde13b 100644
--- a/src/Cassandra.Tests/Policies/DefaultLoadBalancingTests.cs
+++ b/src/Cassandra.Tests/Policies/DefaultLoadBalancingTests.cs
@@ -16,6 +16,8 @@
 using System.Linq;
 using System.Net;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.Tests.Policies
 {
diff --git a/src/Cassandra.Tests/PoliciesUnitTests.cs b/src/Cassandra.Tests/PoliciesUnitTests.cs
index 0f1b03b07..378b164d9 100644
--- a/src/Cassandra.Tests/PoliciesUnitTests.cs
+++ b/src/Cassandra.Tests/PoliciesUnitTests.cs
@@ -19,6 +19,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 using Moq;
 using System.Threading.Tasks;
 using System.Threading;
diff --git a/src/Cassandra.Tests/PreparedStatementTests.cs b/src/Cassandra.Tests/PreparedStatementTests.cs
index 786561e64..cdb42ff07 100644
--- a/src/Cassandra.Tests/PreparedStatementTests.cs
+++ b/src/Cassandra.Tests/PreparedStatementTests.cs
@@ -15,6 +15,7 @@
 //
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/ProtocolTests.cs b/src/Cassandra.Tests/ProtocolTests.cs
index 999a70c8a..5d16d52f2 100644
--- a/src/Cassandra.Tests/ProtocolTests.cs
+++ b/src/Cassandra.Tests/ProtocolTests.cs
@@ -16,6 +16,7 @@
 
 using System.Linq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/RequestExecutionTests.cs b/src/Cassandra.Tests/RequestExecutionTests.cs
index 64d83f582..974312e26 100644
--- a/src/Cassandra.Tests/RequestExecutionTests.cs
+++ b/src/Cassandra.Tests/RequestExecutionTests.cs
@@ -27,6 +27,7 @@
 using Cassandra.SessionManagement;
 using Moq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/RequestHandlerMockTests.cs b/src/Cassandra.Tests/RequestHandlerMockTests.cs
index 03c5e5190..c1e831793 100644
--- a/src/Cassandra.Tests/RequestHandlerMockTests.cs
+++ b/src/Cassandra.Tests/RequestHandlerMockTests.cs
@@ -29,6 +29,7 @@
 using Moq;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/RequestHandlerTests.cs b/src/Cassandra.Tests/RequestHandlerTests.cs
index dcc84cd0e..89d45fbde 100644
--- a/src/Cassandra.Tests/RequestHandlerTests.cs
+++ b/src/Cassandra.Tests/RequestHandlerTests.cs
@@ -24,6 +24,8 @@
 using Cassandra.Serialization;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 using PrepareFlags = Cassandra.Requests.InternalPrepareRequest.PrepareFlags;
 using QueryFlags = Cassandra.QueryProtocolOptions.QueryFlags;
diff --git a/src/Cassandra.Tests/Requests/PrepareHandlerTests.cs b/src/Cassandra.Tests/Requests/PrepareHandlerTests.cs
index b480845b1..b7652093e 100644
--- a/src/Cassandra.Tests/Requests/PrepareHandlerTests.cs
+++ b/src/Cassandra.Tests/Requests/PrepareHandlerTests.cs
@@ -31,6 +31,7 @@
 using Moq;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.Requests
 {
diff --git a/src/Cassandra.Tests/Requests/StartupOptionsFactoryTests.cs b/src/Cassandra.Tests/Requests/StartupOptionsFactoryTests.cs
index a73d80f44..5eb7cb65c 100644
--- a/src/Cassandra.Tests/Requests/StartupOptionsFactoryTests.cs
+++ b/src/Cassandra.Tests/Requests/StartupOptionsFactoryTests.cs
@@ -19,6 +19,7 @@
 using Cassandra.Helpers;
 using Cassandra.Requests;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests.Requests
 {
diff --git a/src/Cassandra.Tests/ResponseFrameTest.cs b/src/Cassandra.Tests/ResponseFrameTest.cs
index 2ab6decbb..6e3d081b4 100644
--- a/src/Cassandra.Tests/ResponseFrameTest.cs
+++ b/src/Cassandra.Tests/ResponseFrameTest.cs
@@ -18,6 +18,7 @@
 using System.IO;
 using Cassandra.Serialization;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/RowSetUnitTests.cs b/src/Cassandra.Tests/RowSetUnitTests.cs
index 585b38121..2d4264e27 100644
--- a/src/Cassandra.Tests/RowSetUnitTests.cs
+++ b/src/Cassandra.Tests/RowSetUnitTests.cs
@@ -15,6 +15,9 @@
 //
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
+using StringAssert = NUnit.Framework.Legacy.StringAssert;
 using System;
 using System.Collections;
 using System.Collections.Concurrent;
diff --git a/src/Cassandra.Tests/SchemaParserTests.cs b/src/Cassandra.Tests/SchemaParserTests.cs
index 64bb9be82..f5c06f7b1 100644
--- a/src/Cassandra.Tests/SchemaParserTests.cs
+++ b/src/Cassandra.Tests/SchemaParserTests.cs
@@ -23,6 +23,9 @@
 using Cassandra.Tasks;
 using Moq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
+using StringAssert = NUnit.Framework.Legacy.StringAssert;
 using SortOrder = Cassandra.DataCollectionMetadata.SortOrder;
 
 namespace Cassandra.Tests
diff --git a/src/Cassandra.Tests/SerializerTests.cs b/src/Cassandra.Tests/SerializerTests.cs
index edb79224c..fc43072d1 100644
--- a/src/Cassandra.Tests/SerializerTests.cs
+++ b/src/Cassandra.Tests/SerializerTests.cs
@@ -16,6 +16,9 @@
 
 using System.Collections;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
+using StringAssert = NUnit.Framework.Legacy.StringAssert;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/Cassandra.Tests/SessionTests.cs b/src/Cassandra.Tests/SessionTests.cs
index 0fc8519fd..0a4cec91f 100644
--- a/src/Cassandra.Tests/SessionTests.cs
+++ b/src/Cassandra.Tests/SessionTests.cs
@@ -22,6 +22,7 @@
 using Cassandra.Tests.Connections.TestHelpers;
 using Moq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/StatementTests.cs b/src/Cassandra.Tests/StatementTests.cs
index a94eaee70..5c1aa7639 100644
--- a/src/Cassandra.Tests/StatementTests.cs
+++ b/src/Cassandra.Tests/StatementTests.cs
@@ -23,6 +23,8 @@
 using Cassandra.Tests.ExecutionProfiles;
 using Moq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 #pragma warning disable 618
 
 namespace Cassandra.Tests
diff --git a/src/Cassandra.Tests/TabletMapTests.cs b/src/Cassandra.Tests/TabletMapTests.cs
index b4903ad17..d03501df0 100644
--- a/src/Cassandra.Tests/TabletMapTests.cs
+++ b/src/Cassandra.Tests/TabletMapTests.cs
@@ -4,6 +4,7 @@
 using Cassandra.Tests.TestHelpers;
 using Moq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/TargetTests.cs b/src/Cassandra.Tests/TargetTests.cs
index 9c19da2e5..12f899125 100644
--- a/src/Cassandra.Tests/TargetTests.cs
+++ b/src/Cassandra.Tests/TargetTests.cs
@@ -17,6 +17,7 @@
 using System.Reflection;
 using System.Runtime.Versioning;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/TaskTests.cs b/src/Cassandra.Tests/TaskTests.cs
index 0160a28e0..242d596a1 100644
--- a/src/Cassandra.Tests/TaskTests.cs
+++ b/src/Cassandra.Tests/TaskTests.cs
@@ -24,6 +24,7 @@
 using System.Threading.Tasks;
 using Cassandra.Tasks;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests
 {
@@ -191,8 +192,7 @@ public void ConfigureAwait_Used_For_Every_Awaited_Task()
                 var match = regex.Match(source);
                 if (match.Success)
                 {
-                    Assert.Fail("Awaited Task without ConfigureAwait() call in file {0}: {1}",
-                                fileInfo.FullName, match.Value);
+                    Assert.Fail($"Awaited Task without ConfigureAwait() call in file {fileInfo.FullName}: {match.Value}");
                 }
             }
         }
diff --git a/src/Cassandra.Tests/TestHelper.cs b/src/Cassandra.Tests/TestHelper.cs
index f3a92a226..eac37cf0b 100644
--- a/src/Cassandra.Tests/TestHelper.cs
+++ b/src/Cassandra.Tests/TestHelper.cs
@@ -29,6 +29,8 @@
 using Moq;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 using NUnit.Framework.Internal;
 using IgnoreAttribute = Cassandra.Mapping.Attributes.IgnoreAttribute;
 
diff --git a/src/Cassandra.Tests/TimeUuidTests.cs b/src/Cassandra.Tests/TimeUuidTests.cs
index 2cc3cbb79..7784f3ff6 100644
--- a/src/Cassandra.Tests/TimeUuidTests.cs
+++ b/src/Cassandra.Tests/TimeUuidTests.cs
@@ -20,6 +20,8 @@
 using System.Linq;
 using System.Threading.Tasks;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/TimeoutTests.cs b/src/Cassandra.Tests/TimeoutTests.cs
index e15baa851..bd750846f 100644
--- a/src/Cassandra.Tests/TimeoutTests.cs
+++ b/src/Cassandra.Tests/TimeoutTests.cs
@@ -21,6 +21,8 @@
 using System.Threading;
 using Cassandra.Tasks;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 using Bucket = Cassandra.Tasks.HashedWheelTimer.Bucket;
 using TimeoutItem = Cassandra.Tasks.HashedWheelTimer.TimeoutItem;
 
diff --git a/src/Cassandra.Tests/TimestampTests.cs b/src/Cassandra.Tests/TimestampTests.cs
index 591ff276b..c4a126e33 100644
--- a/src/Cassandra.Tests/TimestampTests.cs
+++ b/src/Cassandra.Tests/TimestampTests.cs
@@ -22,6 +22,7 @@
 using Cassandra.Tests.TestAttributes;
 
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/TokenTests.cs b/src/Cassandra.Tests/TokenTests.cs
index 5f0d58ee1..94caf4a17 100644
--- a/src/Cassandra.Tests/TokenTests.cs
+++ b/src/Cassandra.Tests/TokenTests.cs
@@ -29,6 +29,8 @@
 using Cassandra.Tests.MetadataHelpers.TestHelpers;
 using Moq;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.Tests
 {
diff --git a/src/Cassandra.Tests/UtilsTests.cs b/src/Cassandra.Tests/UtilsTests.cs
index 987374b9d..faab7ac2c 100644
--- a/src/Cassandra.Tests/UtilsTests.cs
+++ b/src/Cassandra.Tests/UtilsTests.cs
@@ -19,6 +19,8 @@
 using System.Linq;
 using Cassandra.Collections;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
+using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
 
 namespace Cassandra.Tests
 {