diff --git a/html/semantics/popovers/popover-focus-2.tentative.html b/html/semantics/popovers/popover-focus-2.tentative.html
index e0effbd866c4f5..569b633886cf6a 100644
--- a/html/semantics/popovers/popover-focus-2.tentative.html
+++ b/html/semantics/popovers/popover-focus-2.tentative.html
@@ -90,6 +90,22 @@
 }, "Popover focus navigation");
 </script>
 
+<button id=circular0 popovertoggletarget=popover4>Invoker</button>
+<div id=popover4 popover>
+  <button id=circular1 autofocus popoverhidetarget=popover4></button>
+  <button id=circular2 popovershowtarget=popover4></button>
+  <button id=circular3 popovertoggletarget=popover4></button>
+</div>
+<button id=circular4>after</button>
+<script>
+promise_test(async t => {
+  circular0.focus();
+  await sendEnter(); // Activate the invoker
+  await verifyFocusOrder([circular0, circular1, circular2, circular3, circular4]);
+  popover4.hidePopover();
+}, "Circular reference tab navigation");
+</script>
+
 <div id=deleted>
   <button popovershowtarget=deleted1>Show popover</button>
   <div popover id=deleted1>
diff --git a/html/semantics/popovers/popover-light-dismiss.tentative.html b/html/semantics/popovers/popover-light-dismiss.tentative.html
index 83573c86f06f83..3c48bd9274e88e 100644
--- a/html/semantics/popovers/popover-light-dismiss.tentative.html
+++ b/html/semantics/popovers/popover-light-dismiss.tentative.html
@@ -392,8 +392,9 @@
     <div popover id=convoluted_p4><p>Popover 4</p></div>
   </div>
 </div>
-<div popover id=convoluted_p2>Popover 2
+<div popover id=convoluted_p2 anchor=convoluted_p2>Popover 2 (self-anchor-linked)
   <button popovertoggletarget=convoluted_p3>Open Popover 3</button>
+  <button popovershowtarget=convoluted_p2>Self-linked invoker</button>
 </div>
 <div popover id=convoluted_p3 anchor=convoluted_anchor>Popover 3
   <button popovertoggletarget=convoluted_p4>Open Popover 4</button>