diff --git a/third_party/blink/web_tests/external/wpt/html/dom/render-blocking/render-blocked-apis-by-preload-link.tentative.html b/third_party/blink/web_tests/external/wpt/html/dom/render-blocking/render-blocked-apis-by-preload-link.tentative.html
index f7167835d8f6a0..07827371be7cac 100644
--- a/third_party/blink/web_tests/external/wpt/html/dom/render-blocking/render-blocked-apis-by-preload-link.tentative.html
+++ b/third_party/blink/web_tests/external/wpt/html/dom/render-blocking/render-blocked-apis-by-preload-link.tentative.html
@@ -51,10 +51,18 @@
       });
     }
 
-    autofocusTest = rejectIfEventsFired(
-        preloadObserver.load,
-        iframe.contentDocument.getElementById('autofocus-target'),
-        'focus');
+    // The autofocus target must be created and inserted after subframe DCL so
+    // that we can add the event listener here before the subframe flushes
+    // autofocus candidates.
+    function createAutofocusTest(document) {
+      const target = document.createElement('textarea');
+      target.autofocus = 'autofocus';
+      const test = rejectIfEventsFired(preloadObserver.load, target, 'focus');
+      document.body.appendChild(target);
+      return test;
+    }
+    autofocusTest = createAutofocusTest(iframe.contentDocument);
+
     scrollTest = rejectIfEventsFired(
         preloadObserver.load,
         iframe.contentDocument.getElementById('scroll-target'),
@@ -115,6 +123,7 @@
     () => intersectionObserverTest,
     'Should not run the update intersection observers step when render-blocked');
 promise_test(async () => {
+  await iframe.contentDocument.fonts.ready;
   const target = iframe.contentDocument.getElementById('target');
   assert_equals(target.offsetHeight, 20);
   assert_equals(target.offsetWidth, 220);
diff --git a/third_party/blink/web_tests/external/wpt/html/dom/render-blocking/support/subframe-render-blocking-preload.html b/third_party/blink/web_tests/external/wpt/html/dom/render-blocking/support/subframe-render-blocking-preload.html
index 80d88408b38a39..31734b9bbc733d 100644
--- a/third_party/blink/web_tests/external/wpt/html/dom/render-blocking/support/subframe-render-blocking-preload.html
+++ b/third_party/blink/web_tests/external/wpt/html/dom/render-blocking/support/subframe-render-blocking-preload.html
@@ -11,8 +11,6 @@
 </style>
 <span id="target" style="font: 20px/1 custom-font">Lorem ipsum</span>
 
-<textarea id="autofocus-target" autofocus></textarea>
-
 <div id="scroll-target" style="height: 100px; overflow: scroll">
   <div style="height: 200px"></div>
 </div>
@@ -25,6 +23,12 @@
 </style>
 <div id="animation-target" style="height: 50px; animation: anim 100ms"></div>
 
+<!-- We will use a script-inserted element to verify if the browser flushes
+  -- autofocus candidates. If we insert the element here via markup, it may
+  -- be focused before the subframe DOMContentLoaded event, giving the parent
+  -- frame no opportunity to add a 'focus' event handler.
+-->
+
 <!-- We should also verify that the context lost steps for canvas are not run,
   -- but there's currently no way to reliably trigger a context lost in WPT.
   -- See https://github.com/web-platform-tests/wpt/issues/30039
diff --git a/third_party/blink/web_tests/external/wpt/html/dom/render-blocking/support/test-render-blocking.js b/third_party/blink/web_tests/external/wpt/html/dom/render-blocking/support/test-render-blocking.js
index c92564d60a39b8..7fa2462046b02d 100644
--- a/third_party/blink/web_tests/external/wpt/html/dom/render-blocking/support/test-render-blocking.js
+++ b/third_party/blink/web_tests/external/wpt/html/dom/render-blocking/support/test-render-blocking.js
@@ -5,12 +5,12 @@ class LoadObserver {
   constructor(target) {
     this.finishTime = null;
     this.load = new Promise((resolve, reject) => {
-      if (target instanceof EventTarget) {
-        target.onload = ev => {
+      if (target.addEventListener) {
+        target.addEventListener('load', ev => {
           this.finishTime = ev.timeStamp;
           resolve(ev);
-        };
-        target.onerror = reject;
+        });
+        target.addEventListener('error', reject);
       } else if (typeof target === 'string') {
         const observer = new PerformanceObserver(() => {
           if (numberOfResourceTimingEntries(target)) {