diff --git a/components/script/dom/html/htmlelement.rs b/components/script/dom/html/htmlelement.rs
index 67cee0543e2..90196897106 100644
--- a/components/script/dom/html/htmlelement.rs
+++ b/components/script/dom/html/htmlelement.rs
@@ -462,7 +462,7 @@ impl HTMLElementMethods<crate::DomTypeHolder> for HTMLElement {
 
     /// <https://drafts.csswg.org/cssom-view/#dom-htmlelement-offsetparent>
     fn GetOffsetParent(&self) -> Option<DomRoot<Element>> {
-        if self.is_body_element() || self.is::<HTMLHtmlElement>() {
+        if self.is::<HTMLBodyElement>() || self.upcast::<Element>().is_root() {
             return None;
         }
 
diff --git a/tests/wpt/meta/MANIFEST.json b/tests/wpt/meta/MANIFEST.json
index 6416fd04c6d..e65ff27179f 100644
--- a/tests/wpt/meta/MANIFEST.json
+++ b/tests/wpt/meta/MANIFEST.json
@@ -631326,6 +631326,13 @@
        {}
       ]
      ],
+     "offsetParent-body-and-html.html": [
+      "ed83b317088c01e6ff23025b12f20a0144f897ed",
+      [
+       null,
+       {}
+      ]
+     ],
      "offsetParent-fixed.html": [
       "a2c4255a77729066fedc1ba21101cb123a396380",
       [
diff --git a/tests/wpt/tests/css/cssom-view/offsetParent-body-and-html.html b/tests/wpt/tests/css/cssom-view/offsetParent-body-and-html.html
new file mode 100644
index 00000000000..ed83b317088
--- /dev/null
+++ b/tests/wpt/tests/css/cssom-view/offsetParent-body-and-html.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSSOM View: offsetParent</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/cssom-view-1/#dom-htmlelement-offsetparent">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/12834">
+<meta name="assert" content="Checks offsetParent on <body> and <html> elements.">
+<style>html, body { position: relative }</style>
+
+<body>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+const root = document.documentElement;
+const other_html = document.createElement("html");
+const other_body_1 = document.createElement("body");
+const other_body_2 = document.createElement("body");
+const other_body_3 = document.createElement("body");
+other_body_2.append(other_body_3);
+other_html.append(other_body_2);
+root.append(other_html, other_body_1);
+
+test(() => {
+  assert_equals(root.offsetParent, null);
+}, "The offsetParent of the root element is null");
+
+test(() => {
+  assert_equals(other_html.offsetParent, root);
+}, "The offsetParent of a <html> element which is not the root is computed normally");
+
+test(() => {
+  assert_equals(document.body.offsetParent, null);
+}, "The offsetParent of 'the body element' is null");
+
+test(() => {
+  assert_equals(other_body_1.offsetParent, null);
+}, "The offsetParent of a <body> element which has a previous <body> sibling is also null");
+
+test(() => {
+  assert_equals(other_body_2.offsetParent, null);
+}, "The offsetParent of a <body> element which is a child of a non-root <html> is also null");
+
+test(() => {
+  assert_equals(other_body_3.offsetParent, null);
+}, "The offsetParent of a <body> element which is a child of a non-<html> is also null");
+</script>
+</body>
