diff --git a/test/Lombiq.OSOCE.Tests.UI/BehaviorWalkthroughsTests.htmlvalidate.json b/test/Lombiq.OSOCE.Tests.UI/BehaviorWalkthroughsTests.htmlvalidate.json
index 479850ca1..188b90bbd 100644
--- a/test/Lombiq.OSOCE.Tests.UI/BehaviorWalkthroughsTests.htmlvalidate.json
+++ b/test/Lombiq.OSOCE.Tests.UI/BehaviorWalkthroughsTests.htmlvalidate.json
@@ -1,21 +1,12 @@
 {
   "extends": [
-    "html-validate:recommended"
+    "./default.htmlvalidate.json"
   ],
 
   "rules": {
-    "attribute-boolean-style": "off",
     "element-required-attributes": "off",
-    "no-trailing-whitespace": "off",
-    "no-inline-style": "off",
-    "no-implicit-button-type": "off",
-    "wcag/h30": "off",
-    "wcag/h32": "off",
-    "wcag/h36": "off",
-    "wcag/h37": "off",
-    "wcag/h67": "off",
-    "wcag/h71": "off"
+    "no-implicit-button-type": "off"
   },
 
-  "root":  true
+  "root": true
 }
diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorWalkthroughsTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorWalkthroughsTests.cs
index c96d80ea4..41456c7e0 100644
--- a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorWalkthroughsTests.cs
+++ b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorWalkthroughsTests.cs
@@ -4,7 +4,6 @@
 using OpenQA.Selenium;
 using Shouldly;
 using System;
-using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Xunit;
@@ -27,10 +26,8 @@ public Task WalkthroughsShouldWorkCorrectly() =>
             changeConfiguration: configuration =>
             {
                 // Could be removed if https://github.com/shepherd-pro/shepherd/issues/2555 is fixed.
-                configuration.HtmlValidationConfiguration.HtmlValidationOptions =
-                    configuration.HtmlValidationConfiguration.HtmlValidationOptions
-                        .CloneWith(validationOptions => validationOptions.ConfigPath =
-                            Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "BehaviorWalkthroughsTests.htmlvalidate.json"));
+                configuration.HtmlValidationConfiguration
+                    .WithRelativeConfigPath("BehaviorWalkthroughsTests.htmlvalidate.json");
 
                 // Once the linked issues are fixed, the custom browser log assertion can be removed completely.
                 configuration.AssertBrowserLog = logEntries => logEntries.ShouldNotContain(
diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/UITestingToolboxTests/TimeoutTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/UITestingToolboxTests/TimeoutTests.cs
new file mode 100644
index 000000000..f9a4ec603
--- /dev/null
+++ b/test/Lombiq.OSOCE.Tests.UI/Tests/UITestingToolboxTests/TimeoutTests.cs
@@ -0,0 +1,18 @@
+using Lombiq.Tests.UI.Tests.UI.TestCases;
+using System.Threading.Tasks;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Lombiq.OSOCE.Tests.UI.Tests.UITestingToolboxTests;
+
+public class TimeoutTests : UITestBase
+{
+    public TimeoutTests(ITestOutputHelper testOutputHelper)
+        : base(testOutputHelper)
+    {
+    }
+
+    [Fact]
+    public Task TestRunTimeoutShouldThrowAsync() =>
+        TimeoutTestCases.TestRunTimeoutShouldThrowAsync(ExecuteTestAfterSetupAsync);
+}
diff --git a/test/Lombiq.UITestingToolbox b/test/Lombiq.UITestingToolbox
index 361ab7e48..499864e4b 160000
--- a/test/Lombiq.UITestingToolbox
+++ b/test/Lombiq.UITestingToolbox
@@ -1 +1 @@
-Subproject commit 361ab7e48c70a7c3ef67e3ea14080ace8aadc1fc
+Subproject commit 499864e4b5dfbec05f1dbfa5476a08e8aa193a4b