diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 765287ea29e..2653ba15068 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -15831,10 +15831,6 @@
         "path": "cssom-view/negativeMargins.html",
         "url": "/cssom-view/negativeMargins.html"
       },
-      {
-        "path": "cssom-view/offsetPropertiesInline.html",
-        "url": "/cssom-view/offsetPropertiesInline.html"
-      },
       {
         "path": "cssom-view/scrolling-no-browsing-context.html",
         "url": "/cssom-view/scrolling-no-browsing-context.html"
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 794a743fe62..bf4c3cf275e 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -6722,6 +6722,12 @@
             "url": "/_mozilla/css/meta_viewport_resize.html"
           }
         ],
+        "css/offset_properties_inline.html": [
+          {
+            "path": "css/offset_properties_inline.html",
+            "url": "/_mozilla/css/offset_properties_inline.html"
+          }
+        ],
         "css/test_variable_legal_values.html": [
           {
             "path": "css/test_variable_legal_values.html",
diff --git a/tests/wpt/mozilla/tests/css/offset_properties_inline.html b/tests/wpt/mozilla/tests/css/offset_properties_inline.html
new file mode 100644
index 00000000000..cb88fa3a246
--- /dev/null
+++ b/tests/wpt/mozilla/tests/css/offset_properties_inline.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>cssom-view - offsetParent, offsetTop, offsetLeft, offsetWidth, and offsetHeight on inline elements</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  #real-offset-parent {
+    font: 10px/1 Ahem;
+    margin: 0;
+    border: none;
+    padding: 0;
+  }
+  #real-offset-parent, #decoy-offset-parent {
+    position: relative;
+  }
+</style>
+<body>
+<div id="real-offset-parent">
+  <span id="inline-1">ABC</span>
+  <span id="inline-2">ABC<br />ABC</span>
+  <span id="inline-3">ABC</span>
+</div>
+<div id="decoy-offset-parent">
+  <!--
+    Servo used to simply return the last valid offsetParent in the
+    document for inline nodes. This was often coincidentally the
+    correct result in contrived test cases such as this one. This
+    element is here to catch such bad behavior in the unlikely event
+    that it ever arises again.
+  -->
+</div>
+<script>
+  var realOffsetParent = document.getElementById('real-offset-parent');
+  var inline1 = document.getElementById('inline-1');
+  var inline2 = document.getElementById('inline-2');
+  var inline3 = document.getElementById('inline-3');
+
+  test(function() {
+    assert_equals(inline1.offsetParent, realOffsetParent,
+      "offsetParent of #inline-1 should be #real-offset-parent.");
+    assert_equals(inline2.offsetParent, realOffsetParent,
+      "offsetParent of #inline-2 should be #real-offset-parent.");
+    assert_equals(inline3.offsetParent, realOffsetParent,
+      "offsetParent of #inline-3 should be #real-offset-parent.");
+  }, "offsetParent");
+
+  test(function() {
+    assert_equals(inline1.offsetTop, 0,
+      "offsetTop of #inline-1 should be 0.");
+    assert_equals(inline2.offsetTop, 0,
+      "offsetTop of #inline-2 should be 0.");
+    assert_equals(inline3.offsetTop, 10,
+      "offsetTop of #inline-3 should be 10.");
+  }, "offsetTop");
+
+  test(function() {
+    assert_equals(inline1.offsetLeft, 0,
+      "offsetLeft of #inline-1 should be 0.");
+    assert_equals(inline2.offsetLeft, 40,
+      "offsetLeft of #inline-2 should be 40.");
+    assert_equals(inline3.offsetLeft, 40,
+      "offsetLeft of #inline-3 should be 40.");
+  }, "offsetLeft");
+
+  test(function() {
+    assert_equals(inline1.offsetWidth, 30,
+      "offsetWidth of #inline-1 should be 30.");
+    assert_equals(inline2.offsetWidth, 70,
+      "offsetWidth of #inline-2 should be 70.");
+    assert_equals(inline3.offsetWidth, 30,
+      "offsetWidth of #inline-3 should be 30.");
+  }, "offsetWidth");
+
+  test(function() {
+    assert_equals(inline1.offsetHeight, 10,
+      "offsetHeight of #inline-1 should be 10.");
+    assert_equals(inline2.offsetHeight, 20,
+      "offsetHeight of #inline-2 should be 20.");
+    assert_equals(inline3.offsetHeight, 10,
+      "offsetHeight of #inline-3 should be 10.");
+  }, "offsetHeight");
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/cssom-view/offsetPropertiesInline.html b/tests/wpt/web-platform-tests/cssom-view/offsetPropertiesInline.html
deleted file mode 100644
index e234e574987..00000000000
--- a/tests/wpt/web-platform-tests/cssom-view/offsetPropertiesInline.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>cssom-view - offsetParent, offsetTop, offsetLeft, offsetWidth, and offsetHeight on inline elements</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<style>
-  #real-offset-parent {
-    font: 10px/1 Ahem;
-    margin: 0;
-    border: none;
-    padding: 0;
-  }
-  #real-offset-parent, #decoy-offset-parent {
-    position: relative;
-  }
-</style>
-<body>
-<div id="real-offset-parent">
-  <span id="inline-1">ABC</span>
-  <span id="inline-2">ABC<br />ABC</span>
-  <span id="inline-3">ABC</span>
-</div>
-<div id="decoy-offset-parent"></div>
-<script>
-  setup({ explicit_done: true });
-  window.onload = function() {
-    var realOffsetParent = document.getElementById('real-offset-parent');
-    var inline1 = document.getElementById('inline-1');
-    var inline2 = document.getElementById('inline-2');
-    var inline3 = document.getElementById('inline-3');
-
-    test(function() {
-      assert_equals(inline1.offsetParent, realOffsetParent,
-        "offsetParent of #inline-1 should be #real-offset-parent.");
-      assert_equals(inline2.offsetParent, realOffsetParent,
-        "offsetParent of #inline-2 should be #real-offset-parent.");
-      assert_equals(inline3.offsetParent, realOffsetParent,
-        "offsetParent of #inline-3 should be #real-offset-parent.");
-    }, "offsetParent");
-
-    test(function() {
-      assert_equals(inline1.offsetTop, 0,
-        "offsetTop of #inline-1 should be 0.");
-      assert_equals(inline2.offsetTop, 0,
-        "offsetTop of #inline-2 should be 0.");
-      assert_equals(inline3.offsetTop, 10,
-        "offsetTop of #inline-3 should be 10.");
-    }, "offsetTop");
-
-    test(function() {
-      assert_equals(inline1.offsetLeft, 0,
-        "offsetLeft of #inline-1 should be 0.");
-      assert_equals(inline2.offsetLeft, 40,
-        "offsetLeft of #inline-2 should be 40.");
-      assert_equals(inline3.offsetLeft, 40,
-        "offsetLeft of #inline-3 should be 40.");
-    }, "offsetLeft");
-
-    test(function() {
-      assert_equals(inline1.offsetWidth, 30,
-        "offsetWidth of #inline-1 should be 30.");
-      assert_equals(inline2.offsetWidth, 70,
-        "offsetWidth of #inline-2 should be 70.");
-      assert_equals(inline3.offsetWidth, 30,
-        "offsetWidth of #inline-3 should be 30.");
-    }, "offsetWidth");
-
-    test(function() {
-      assert_equals(inline1.offsetHeight, 10,
-        "offsetHeight of #inline-1 should be 10.");
-      assert_equals(inline2.offsetHeight, 20,
-        "offsetHeight of #inline-2 should be 20.");
-      assert_equals(inline3.offsetHeight, 10,
-        "offsetHeight of #inline-3 should be 10.");
-    }, "offsetHeight");
-
-    done();
-  };
-</script>
-</body>
