diff --git a/src/Samples/Tests/Tests/Control/SpaContentPlaceHolderTests.cs b/src/Samples/Tests/Tests/Control/SpaContentPlaceHolderTests.cs
index 403ff284d4..c795b92f4d 100644
--- a/src/Samples/Tests/Tests/Control/SpaContentPlaceHolderTests.cs
+++ b/src/Samples/Tests/Tests/Control/SpaContentPlaceHolderTests.cs
@@ -209,7 +209,7 @@ void CheckOnlyOneSpaRouteLink(IBrowserWrapper browser)
                 browser.NavigateToUrl(SamplesRouteUrls.ControlSamples_SpaContentPlaceHolder_HistoryApi_MultiSpaDefault);
 
                 var defaultUrl = browser.CurrentUrl;
-                var baseUrl = browser.CurrentUrl.Substring(0, browser.CurrentUrlPath.LastIndexOf('/'));
+                var baseUrl = defaultUrl.Substring(0, defaultUrl.LastIndexOf('/'));
                 var routeLinks = browser.FindElements("a");
 
                 routeLinks.First().Click();
diff --git a/src/Samples/Tests/Tests/DotVVM.Samples.Tests.csproj b/src/Samples/Tests/Tests/DotVVM.Samples.Tests.csproj
index 3f1ad03e6e..93e0b67833 100644
--- a/src/Samples/Tests/Tests/DotVVM.Samples.Tests.csproj
+++ b/src/Samples/Tests/Tests/DotVVM.Samples.Tests.csproj
@@ -9,12 +9,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
-    <PackageReference Include="Selenium.Support" Version="4.11.0" />
-    <PackageReference Include="Selenium.WebDriver" Version="4.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="Selenium.Support" Version="4.21.0" />
+    <PackageReference Include="Selenium.WebDriver" Version="4.21.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
     <PackageReference Include="System.ValueTuple" Version="4.4.0" />
-    <PackageReference Include="xunit" Version="2.8.0" />
+    <PackageReference Include="xunit" Version="2.8.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -22,9 +22,9 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(LocalSeleniumUtilsPath)' == ''">
-    <PackageReference Include="Riganti.Selenium.DotVVM" Version="3.0.0-preview15-final" />
-    <PackageReference Include="Riganti.Selenium.AssertApi" Version="3.0.0-preview15-final" />
-    <PackageReference Include="Riganti.Selenium.xUnitIntegration" Version="3.0.0-preview15-final" />
+    <PackageReference Include="Riganti.Selenium.DotVVM" Version="3.0.0-preview19-final" />
+    <PackageReference Include="Riganti.Selenium.AssertApi" Version="3.0.0-preview19-final" />
+    <PackageReference Include="Riganti.Selenium.xUnitIntegration" Version="3.0.0-preview19-final" />
   </ItemGroup>
   <ItemGroup Condition="'$(LocalSeleniumUtilsPath)' != ''">
     <ProjectReference Include="$(LocalSeleniumUtilsPath)\src\Core\Riganti.Selenium.AssertApi\Riganti.Selenium.AssertApi.csproj" />
diff --git a/src/Samples/Tests/Tests/Feature/PostbackConcurrencyTests.cs b/src/Samples/Tests/Tests/Feature/PostbackConcurrencyTests.cs
index d7f2d84662..f5c19cba27 100644
--- a/src/Samples/Tests/Tests/Feature/PostbackConcurrencyTests.cs
+++ b/src/Samples/Tests/Tests/Feature/PostbackConcurrencyTests.cs
@@ -264,9 +264,9 @@ public void Feature_PostbackConcurrency_RedirectPostbackQueueSpa_PostbackFromPre
                 while (!browser.CurrentUrl.Contains("?time"))
                 {
                     attempt++;
-                    if (attempt > 50)
+                    if (attempt > 100) // the site blocks for about 7 seconds before the URL changes
                     {
-                        Assert.Fail("The redirect didn't happen.");
+                        Assert.Fail($"The redirect didn't happen, current URL: {browser.CurrentUrl}");
                     }
 
                     Thread.Sleep(100);