diff --git a/test/Cli.FunctionalTests/Cli.FunctionalTests.csproj b/test/Cli.FunctionalTests/Cli.FunctionalTests.csproj
index b2227fad1e..4632b9769c 100644
--- a/test/Cli.FunctionalTests/Cli.FunctionalTests.csproj
+++ b/test/Cli.FunctionalTests/Cli.FunctionalTests.csproj
@@ -10,11 +10,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="NuGet.Versioning" Version="4.7.0" />
-    <PackageReference Include="NUnit" Version="3.10.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
+    <PackageReference Include="NUnit" Version="3.11.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
   </ItemGroup>
 
 </Project>
diff --git a/test/Cli.FunctionalTests/Util/DotNetUtil.cs b/test/Cli.FunctionalTests/Util/DotNetUtil.cs
index 5c6d2f51c8..3131e3fcbb 100644
--- a/test/Cli.FunctionalTests/Util/DotNetUtil.cs
+++ b/test/Cli.FunctionalTests/Util/DotNetUtil.cs
@@ -64,8 +64,8 @@ namespace Cli.FunctionalTests.Util
             var runtimeVersionString = Regex.Match(info, runtimeVersionPattern, RegexOptions.RightToLeft).Groups[1].Value;
             var runtimeVersion = SemanticVersion.Parse(runtimeVersionString);
 
-            // Supported version range is [2.1.300,2.2.100] (inclusive)
-            if (sdkVersion >= new SemanticVersion(2, 1, 300) && sdkVersion <= new SemanticVersion(2, 2, 100))
+            // Supported version range is [2.1.300,2.2.210] (inclusive)
+            if (sdkVersion >= new SemanticVersion(2, 1, 300) && sdkVersion <= new SemanticVersion(2, 2, 210))
             {
                 return (sdkVersion, runtimeVersion);
             }
diff --git a/test/Cli.FunctionalTests/run-tests.ps1 b/test/Cli.FunctionalTests/run-tests.ps1
index d59a4feb33..c41bf6c192 100644
--- a/test/Cli.FunctionalTests/run-tests.ps1
+++ b/test/Cli.FunctionalTests/run-tests.ps1
@@ -164,7 +164,7 @@ try {
     [string[]] $filterArgs = @()
 
     if ($TestRuntimeIdentifier) {
-        $filterArgs += '--filter',"rid: $TestRuntimeIdentifier"
+        $filterArgs += '--filter',"Name~rid: $TestRuntimeIdentifier"
     }
 
     Invoke-Block { & $dotnet test `