diff --git a/src/Cassandra.IntegrationTests/Cassandra.IntegrationTests.csproj b/src/Cassandra.IntegrationTests/Cassandra.IntegrationTests.csproj
index da119bc7d..76d5dbb8f 100644
--- a/src/Cassandra.IntegrationTests/Cassandra.IntegrationTests.csproj
+++ b/src/Cassandra.IntegrationTests/Cassandra.IntegrationTests.csproj
@@ -61,7 +61,7 @@
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <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="Moq" Version="4.20.72" />
     <PackageReference Include="NUnit" Version="4.4.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
     <PackageReference Include="NunitXml.TestLogger" Version="6.1.0" />
diff --git a/src/Cassandra.Tests/Cassandra.Tests.csproj b/src/Cassandra.Tests/Cassandra.Tests.csproj
index 4cc3c088d..c0cc70ff9 100644
--- a/src/Cassandra.Tests/Cassandra.Tests.csproj
+++ b/src/Cassandra.Tests/Cassandra.Tests.csproj
@@ -30,7 +30,7 @@
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <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="Moq" Version="4.20.72" />
     <PackageReference Include="NUnit" Version="4.4.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
     <PackageReference Include="NunitXml.TestLogger" Version="6.1.0" />
diff --git a/src/Cassandra.Tests/Mapping/BatchTests.cs b/src/Cassandra.Tests/Mapping/BatchTests.cs
index fd697d0a1..1abf03d4a 100644
--- a/src/Cassandra.Tests/Mapping/BatchTests.cs
+++ b/src/Cassandra.Tests/Mapping/BatchTests.cs
@@ -48,12 +48,12 @@ private IMapper GetMapper(Func<Task<RowSet>> getRowSetFunc, Action<BatchStatemen
             sessionMock
                 .Setup(s => s.ExecuteAsync(It.IsAny<BatchStatement>()))
                 .Returns(getRowSetFunc)
-                .Callback(statementCallback)
+                .Callback<IStatement>(stmt => statementCallback((BatchStatement)stmt))
                 .Verifiable();
             sessionMock
                 .Setup(s => s.ExecuteAsync(It.IsAny<BatchStatement>(), It.IsAny<string>()))
                 .Returns(getRowSetFunc)
-                .Callback<BatchStatement, string>((bs, profile) => statementCallback(bs))
+                .Callback<IStatement, string>((stmt, profile) => statementCallback((BatchStatement)stmt))
                 .Verifiable();
             sessionMock
                 .Setup(s => s.PrepareAsync(It.IsAny<string>()))
@@ -77,7 +77,7 @@ private MapperAndSessionTuple GetMapperAndSession(Func<Task<RowSet>> getRowSetFu
             sessionMock
                 .Setup(s => s.ExecuteAsync(It.IsAny<BatchStatement>()))
                 .Returns(getRowSetFunc)
-                .Callback(statementCallback)
+                .Callback<IStatement>(stmt => statementCallback((BatchStatement)stmt))
                 .Verifiable();
             sessionMock
                 .Setup(s => s.ExecuteAsync(It.IsAny<IStatement>(), It.IsAny<string>()))
diff --git a/src/Cassandra.Tests/Mapping/DeleteTests.cs b/src/Cassandra.Tests/Mapping/DeleteTests.cs
index 48785e45a..8861110a2 100644
--- a/src/Cassandra.Tests/Mapping/DeleteTests.cs
+++ b/src/Cassandra.Tests/Mapping/DeleteTests.cs
@@ -97,7 +97,7 @@ public void Insert_SetTimestamp_Test()
             sessionMock
                 .Setup(s => s.ExecuteAsync(It.IsAny<BoundStatement>()))
                 .Returns(() => TestHelper.DelayedTask(RowSet.Empty()))
-                .Callback<BoundStatement>(stmt => statement = stmt)
+                .Callback<IStatement>(stmt => statement = (BoundStatement)stmt)
                 .Verifiable();
             sessionMock
                 .Setup(s => s.PrepareAsync(It.IsAny<string>()))
@@ -106,7 +106,7 @@ public void Insert_SetTimestamp_Test()
             sessionMock
                 .Setup(s => s.ExecuteAsync(It.IsAny<BoundStatement>(), It.IsAny<string>()))
                 .Returns(() => TestHelper.DelayedTask(RowSet.Empty()))
-                .Callback<BoundStatement, string>((stmt, profile) => statement = stmt)
+                .Callback<IStatement, string>((stmt, profile) => statement = (BoundStatement)stmt)
                 .Verifiable();
             sessionMock
                 .Setup(s => s.PrepareAsync(It.IsAny<string>()))
diff --git a/src/Cassandra.Tests/Mapping/InsertTests.cs b/src/Cassandra.Tests/Mapping/InsertTests.cs
index ce6656a79..53da130ec 100644
--- a/src/Cassandra.Tests/Mapping/InsertTests.cs
+++ b/src/Cassandra.Tests/Mapping/InsertTests.cs
@@ -199,10 +199,11 @@ public void Insert_Without_Nulls()
             sessionMock
                 .Setup(s => s.ExecuteAsync(It.IsAny<BoundStatement>(), It.IsAny<string>()))
                 .Returns(TaskHelper.ToTask(new RowSet()))
-                .Callback<BoundStatement, string>((stmt, profile) =>
+                .Callback<IStatement, string>((stmt, profile) =>
                 {
-                    query = stmt.PreparedStatement.Cql;
-                    parameters = stmt.QueryValues;
+                    var boundStmt = (BoundStatement)stmt;
+                    query = boundStmt.PreparedStatement.Cql;
+                    parameters = boundStmt.QueryValues;
                 })
                 .Verifiable();
             sessionMock
@@ -268,7 +269,7 @@ public void InsertIfNotExists_Poco_AppliedInfo_True_Test()
             sessionMock
                 .Setup(s => s.ExecuteAsync(It.IsAny<BoundStatement>(), It.IsAny<string>()))
                 .Returns(TestHelper.DelayedTask(TestDataHelper.CreateMultipleValuesRowSet(new[] { "[applied]" }, new[] { true })))
-                .Callback<BoundStatement, string>((b, profile) => query = b.PreparedStatement.Cql)
+                .Callback<IStatement, string>((stmt, profile) => query = ((BoundStatement)stmt).PreparedStatement.Cql)
                 .Verifiable();
             sessionMock
                 .Setup(s => s.PrepareAsync(It.IsAny<string>()))
@@ -299,7 +300,7 @@ public void InsertIfNotExists_Poco_AppliedInfo_False_Test()
             sessionMock
                 .Setup(s => s.ExecuteAsync(It.IsAny<BoundStatement>(), It.IsAny<string>()))
                 .Returns(TestHelper.DelayedTask(TestDataHelper.CreateMultipleValuesRowSet(new[] { "[applied]", "userid", "name" }, new object[] { false, newUser.Id, "existing-name" })))
-                .Callback<BoundStatement, string>((b, profile) => query = b.PreparedStatement.Cql)
+                .Callback<IStatement, string>((stmt, profile) => query = ((BoundStatement)stmt).PreparedStatement.Cql)
                 .Verifiable();
             sessionMock
                 .Setup(s => s.PrepareAsync(It.IsAny<string>()))
@@ -364,7 +365,7 @@ public void Insert_SetTimestamp_Test()
             sessionMock
                 .Setup(s => s.ExecuteAsync(It.IsAny<BoundStatement>(), It.IsAny<string>()))
                 .Returns(TaskHelper.ToTask(new RowSet()))
-                .Callback<BoundStatement, string>((stmt, profile) => statement = stmt)
+                .Callback<IStatement, string>((stmt, profile) => statement = (BoundStatement)stmt)
                 .Verifiable();
             sessionMock
                 .Setup(s => s.PrepareAsync(It.IsAny<string>()))
diff --git a/src/Cassandra.Tests/Mapping/MappingTestBase.cs b/src/Cassandra.Tests/Mapping/MappingTestBase.cs
index 1f5b62464..be77d1fb3 100644
--- a/src/Cassandra.Tests/Mapping/MappingTestBase.cs
+++ b/src/Cassandra.Tests/Mapping/MappingTestBase.cs
@@ -67,12 +67,12 @@ protected MapperAndSessionTuple GetMappingClientAndSession(Func<Task<RowSet>> ge
             sessionMock
                 .Setup(s => s.ExecuteAsync(It.IsAny<BoundStatement>()))
                 .Returns(getRowSetFunc)
-                .Callback<BoundStatement>(s => queryCallback(s.PreparedStatement.Cql, s.QueryValues))
+                .Callback<IStatement>(stmt => { var s = (BoundStatement)stmt; queryCallback(s.PreparedStatement.Cql, s.QueryValues); })
                 .Verifiable();
             sessionMock
                 .Setup(s => s.ExecuteAsync(It.IsAny<BoundStatement>(), It.IsAny<string>()))
                 .Returns(getRowSetFunc)
-                .Callback<BoundStatement, string>((s, profile) => queryCallback(s.PreparedStatement.Cql, s.QueryValues))
+                .Callback<IStatement, string>((stmt, profile) => { var s = (BoundStatement)stmt; queryCallback(s.PreparedStatement.Cql, s.QueryValues); })
                 .Verifiable();
             sessionMock
                 .Setup(s => s.PrepareAsync(It.IsAny<string>()))
@@ -117,7 +117,7 @@ protected ISession GetSession<TStatement>(RowSet rs, Action<TStatement> callback
             sessionMock
                 .Setup(s => s.ExecuteAsync(It.IsAny<IStatement>()))
                 .Returns(() => TaskHelper.ToTask(rs))
-                .Callback(callback)
+                .Callback<IStatement>(stmt => callback((TStatement)stmt))
                 .Verifiable();
             sessionMock
                 .Setup(s => s.ExecuteAsync(It.IsAny<IStatement>(), It.IsAny<string>()))
diff --git a/src/Cassandra.Tests/Mapping/UpdateTests.cs b/src/Cassandra.Tests/Mapping/UpdateTests.cs
index dd65adb69..782f3eab7 100644
--- a/src/Cassandra.Tests/Mapping/UpdateTests.cs
+++ b/src/Cassandra.Tests/Mapping/UpdateTests.cs
@@ -211,8 +211,9 @@ public void UpdateIf_AppliedInfo_True_Test()
             sessionMock
                 .Setup(s => s.ExecuteAsync(It.IsAny<BoundStatement>()))
                 .Returns(TestHelper.DelayedTask(TestDataHelper.CreateMultipleValuesRowSet(new[] { "[applied]" }, new[] { true })))
-                .Callback<BoundStatement>(b =>
+                .Callback<IStatement>(stmt =>
                 {
+                    var b = (BoundStatement)stmt;
                     parameters = b.QueryValues;
                     query = b.PreparedStatement.Cql;
                 })
@@ -246,8 +247,9 @@ public void UpdateIf_AppliedInfo_False_Test()
             sessionMock
                 .Setup(s => s.ExecuteAsync(It.IsAny<BoundStatement>()))
                 .Returns(TestHelper.DelayedTask(TestDataHelper.CreateMultipleValuesRowSet(new[] { "[applied]", "id", "artist" }, new object[] { false, id, "Jimmy Page" })))
-                .Callback<BoundStatement>(b =>
+                .Callback<IStatement>(stmt =>
                 {
+                    var b = (BoundStatement)stmt;
                     parameters = b.QueryValues;
                     query = b.PreparedStatement.Cql;
                 })
@@ -278,12 +280,12 @@ public void Update_SetTimestamp_Test()
             sessionMock
                 .Setup(s => s.ExecuteAsync(It.IsAny<BoundStatement>(), It.IsAny<string>()))
                 .Returns(() => TestHelper.DelayedTask(RowSet.Empty()))
-                .Callback<BoundStatement, string>((stmt, profile) => statement = stmt)
+                .Callback<IStatement, string>((stmt, profile) => statement = (BoundStatement)stmt)
                 .Verifiable();
             sessionMock
                 .Setup(s => s.ExecuteAsync(It.IsAny<BoundStatement>()))
                 .Returns(() => TestHelper.DelayedTask(RowSet.Empty()))
-                .Callback<BoundStatement>(stmt => statement = stmt)
+                .Callback<IStatement>(stmt => statement = (BoundStatement)stmt)
                 .Verifiable();
             sessionMock
                 .Setup(s => s.PrepareAsync(It.IsAny<string>()))