diff --git a/build/dependencies.props b/build/dependencies.props
index dab082f9..d7041c6b 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -7,7 +7,7 @@
     <CryptoHelperVersion>2.0.0</CryptoHelperVersion>
     <JetBrainsVersion>10.3.0</JetBrainsVersion>
     <NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
-    <MoqVersion>4.6.38-alpha</MoqVersion>
+    <MoqVersion>4.7.8</MoqVersion>
     <RuntimeFrameworkVersion>1.0.0</RuntimeFrameworkVersion>
     <TestSdkVersion>15.0.0</TestSdkVersion>
     <XunitVersion>2.2.0</XunitVersion>
diff --git a/test/OpenIddict.Tests/OpenIddictProviderTests.Authentication.cs b/test/OpenIddict.Tests/OpenIddictProviderTests.Authentication.cs
index 3422b12a..c6c39607 100644
--- a/test/OpenIddict.Tests/OpenIddictProviderTests.Authentication.cs
+++ b/test/OpenIddict.Tests/OpenIddictProviderTests.Authentication.cs
@@ -314,7 +314,7 @@ namespace OpenIddict.Tests
             var manager = CreateApplicationManager(instance =>
             {
                 instance.Setup(mock => mock.FindByClientIdAsync("Fabrikam", It.IsAny<CancellationToken>()))
-                    .ReturnsAsync(null);
+                    .ReturnsAsync(value: null);
             });
 
             var server = CreateAuthorizationServer(builder =>
diff --git a/test/OpenIddict.Tests/OpenIddictProviderTests.Exchange.cs b/test/OpenIddict.Tests/OpenIddictProviderTests.Exchange.cs
index b36feaee..14c9e1b6 100644
--- a/test/OpenIddict.Tests/OpenIddictProviderTests.Exchange.cs
+++ b/test/OpenIddict.Tests/OpenIddictProviderTests.Exchange.cs
@@ -168,7 +168,7 @@ namespace OpenIddict.Tests
             var manager = CreateApplicationManager(instance =>
             {
                 instance.Setup(mock => mock.FindByClientIdAsync("Fabrikam", It.IsAny<CancellationToken>()))
-                    .ReturnsAsync(null);
+                    .ReturnsAsync(value: null);
             });
 
             var server = CreateAuthorizationServer(builder =>
@@ -478,7 +478,7 @@ namespace OpenIddict.Tests
             var manager = CreateTokenManager(instance =>
             {
                 instance.Setup(mock => mock.FindByIdAsync("3E228451-1555-46F7-A471-951EFBA23A56", It.IsAny<CancellationToken>()))
-                    .ReturnsAsync(null);
+                    .ReturnsAsync(value: null);
             });
 
             var server = CreateAuthorizationServer(builder =>
@@ -537,7 +537,7 @@ namespace OpenIddict.Tests
             var manager = CreateTokenManager(instance =>
             {
                 instance.Setup(mock => mock.FindByIdAsync("60FFF7EA-F98E-437B-937E-5073CC313103", It.IsAny<CancellationToken>()))
-                    .ReturnsAsync(null);
+                    .ReturnsAsync(value: null);
             });
 
             var server = CreateAuthorizationServer(builder =>
diff --git a/test/OpenIddict.Tests/OpenIddictProviderTests.Introspection.cs b/test/OpenIddict.Tests/OpenIddictProviderTests.Introspection.cs
index 65f50457..428f0a13 100644
--- a/test/OpenIddict.Tests/OpenIddictProviderTests.Introspection.cs
+++ b/test/OpenIddict.Tests/OpenIddictProviderTests.Introspection.cs
@@ -69,7 +69,7 @@ namespace OpenIddict.Tests
             var manager = CreateApplicationManager(instance =>
             {
                 instance.Setup(mock => mock.FindByClientIdAsync("Fabrikam", It.IsAny<CancellationToken>()))
-                    .ReturnsAsync(null);
+                    .ReturnsAsync(value: null);
             });
 
             var server = CreateAuthorizationServer(builder =>
@@ -364,7 +364,7 @@ namespace OpenIddict.Tests
             var manager = CreateTokenManager(instance =>
             {
                 instance.Setup(mock => mock.FindByIdAsync("3E228451-1555-46F7-A471-951EFBA23A56", It.IsAny<CancellationToken>()))
-                    .ReturnsAsync(null);
+                    .ReturnsAsync(value: null);
             });
 
             var server = CreateAuthorizationServer(builder =>
@@ -428,7 +428,7 @@ namespace OpenIddict.Tests
             var manager = CreateTokenManager(instance =>
             {
                 instance.Setup(mock => mock.FindByIdAsync("3E228451-1555-46F7-A471-951EFBA23A56", It.IsAny<CancellationToken>()))
-                    .ReturnsAsync(null);
+                    .ReturnsAsync(value: null);
             });
 
             var server = CreateAuthorizationServer(builder =>
diff --git a/test/OpenIddict.Tests/OpenIddictProviderTests.Revocation.cs b/test/OpenIddict.Tests/OpenIddictProviderTests.Revocation.cs
index 9d41bfb5..67aec60d 100644
--- a/test/OpenIddict.Tests/OpenIddictProviderTests.Revocation.cs
+++ b/test/OpenIddict.Tests/OpenIddictProviderTests.Revocation.cs
@@ -72,7 +72,7 @@ namespace OpenIddict.Tests
             var manager = CreateApplicationManager(instance =>
             {
                 instance.Setup(mock => mock.FindByClientIdAsync("Fabrikam", It.IsAny<CancellationToken>()))
-                    .ReturnsAsync(null);
+                    .ReturnsAsync(value: null);
             });
 
             var server = CreateAuthorizationServer(builder =>
@@ -319,7 +319,7 @@ namespace OpenIddict.Tests
             var manager = CreateTokenManager(instance =>
             {
                 instance.Setup(mock => mock.FindByIdAsync("3E228451-1555-46F7-A471-951EFBA23A56", It.IsAny<CancellationToken>()))
-                    .ReturnsAsync(null);
+                    .ReturnsAsync(value: null);
             });
 
             var server = CreateAuthorizationServer(builder =>
diff --git a/test/OpenIddict.Tests/OpenIddictProviderTests.Session.cs b/test/OpenIddict.Tests/OpenIddictProviderTests.Session.cs
index f216c09a..e13b94fb 100644
--- a/test/OpenIddict.Tests/OpenIddictProviderTests.Session.cs
+++ b/test/OpenIddict.Tests/OpenIddictProviderTests.Session.cs
@@ -65,7 +65,7 @@ namespace OpenIddict.Tests
             var manager = CreateApplicationManager(instance =>
             {
                 instance.Setup(mock => mock.FindByLogoutRedirectUri("http://www.fabrikam.com/path", It.IsAny<CancellationToken>()))
-                    .ReturnsAsync(null);
+                    .ReturnsAsync(value: null);
             });
 
             var server = CreateAuthorizationServer(builder =>
@@ -166,7 +166,7 @@ namespace OpenIddict.Tests
                 builder.Services.AddSingleton(CreateApplicationManager(instance =>
                 {
                     instance.Setup(mock => mock.FindByLogoutRedirectUri("http://www.fabrikam.com/path", It.IsAny<CancellationToken>()))
-                        .ReturnsAsync(null);
+                        .ReturnsAsync(value: null);
                 }));
 
                 builder.EnableAuthorizationEndpoint("/logout-status-code-middleware");