From 2085091c6775b94c4b523eba051c38a22daa307b Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Mon, 9 Sep 2019 12:10:21 -0400
Subject: [PATCH] Remove new wpt lint violations.

---
 tests/wpt/mozilla/meta/MANIFEST.json          | 104 +++++++++---------
 .../tests/css/abs_float_pref_width.html       |   1 +
 .../css/background_image_position_a.html      |   1 +
 .../tests/css/border_inline_split.html        |   1 +
 .../tests/css/border_inline_split_ref.html    |   1 +
 .../position-sticky-inline-ref.html           |   1 +
 .../position-sticky-inline.html               |   1 +
 .../position-sticky-nested-inline-ref.html    |   1 +
 .../position-sticky-nested-inline.html        |   1 +
 .../position-sticky-writing-modes-ref.html    |   1 +
 .../position-sticky-writing-modes.html        |   1 +
 ...dth_overrides_child_intrinsic_width_a.html |   1 +
 .../tests/css/float_intrinsic_width_a.html    |   1 +
 .../css/float_right_intrinsic_width_a.html    |   1 +
 .../wpt/mozilla/tests/css/float_table_a.html  |   1 +
 .../tests/css/img_block_display_a.html        |   1 +
 .../tests/css/inline_block_baseline_a.html    |   1 +
 .../css/inline_block_explicit_height_a.html   |   2 +-
 .../mozilla/tests/css/inline_block_img_a.html |   1 +
 .../tests/css/inline_block_margin_a.html      |   1 +
 .../tests/css/inline_block_with_margin_a.html |   1 +
 .../tests/css/inline_element_border_a.html    |   1 +
 .../mozilla/tests/css/line_break_nowrap.html  |   1 +
 .../tests/css/line_break_nowrap_ref.html      |   1 +
 .../line_breaking_whitespace_collapse_a.html  |   2 +-
 ...line_breaking_whitespace_collapse_ref.html |   2 +-
 .../wpt/mozilla/tests/css/line_height_a.html  |   1 +
 .../css/line_height_float_placement_a.html    |   2 +-
 .../css/line_height_float_placement_ref.html  |   2 +-
 .../mozilla/tests/css/line_height_ref.html    |   1 +
 .../tests/css/list_style_image_sizing_a.html  |   2 +-
 .../css/list_style_image_sizing_ref.html      |   2 +-
 .../tests/css/offset_properties_inline.html   |   1 +
 .../tests/css/per_glyph_font_fallback_a.html  |   1 +
 .../css/per_glyph_font_fallback_ref.html      |   1 +
 .../mozilla/tests/css/position_fixed_a.html   |   1 +
 .../mozilla/tests/css/position_fixed_b.html   |   1 +
 .../mozilla/tests/css/table_padding_a.html    |   1 +
 .../tests/css/text_align_complex_a.html       |   2 +-
 .../tests/css/text_align_complex_ref.html     |   2 +-
 .../tests/css/text_overflow_reflow.html       |   1 +
 .../tests/css/text_overflow_reflow_ref.html   |   1 +
 .../tests/css/white-space-mixed-002.htm       |   1 +
 .../tests/css/white-space-pre-line-ref.htm    |   1 +
 .../tests/css/white-space-pre-line.htm        |   1 +
 .../tests/css/white-space-pre-wrap-ref.htm    |   1 +
 .../tests/css/white-space-pre-wrap.htm        |   1 +
 .../display-block-baselines-1-ref.html        |   5 +-
 .../display-block-baselines-1.html            |   5 +-
 tests/wpt/mozilla/tests/lint.whitelist        |   6 +-
 .../mozilla/client-top-left-height-width.html |   1 +
 .../tests/mozilla/getBoundingClientRect.html  |   1 +
 .../mozilla/mime_sniffing_font_context.html   |   1 +
 53 files changed, 108 insertions(+), 70 deletions(-)

diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 8afa233be11..f1a55ead047 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -13447,7 +13447,7 @@
    "support"
   ],
   "css/abs_float_pref_width.html": [
-   "4d5c2f971a5ec46dddfcff254b4b433b89d6e5c1",
+   "6091dc5ad57aba55ec9568f82a348e50b160e631",
    "reftest"
   ],
   "css/abs_rel_explicit_height.html": [
@@ -13711,7 +13711,7 @@
    "reftest"
   ],
   "css/background_image_position_a.html": [
-   "f3ff1cc329bd824c4cebe655bd68989c9b9909ca",
+   "080fdc9a0f42f0ab391ce846048e4d4e111cc444",
    "reftest"
   ],
   "css/background_image_position_ref.html": [
@@ -14055,11 +14055,11 @@
    "support"
   ],
   "css/border_inline_split.html": [
-   "4cf2aaacc112946d203106d2aa9a4b029fcfc06b",
+   "95bd669bdb4104a239ad47d2bfcf01f05f724fd8",
    "reftest"
   ],
   "css/border_inline_split_ref.html": [
-   "658b7f533b6494e49fb3ecc9cd61415db303cfcb",
+   "8a85ef944366e18b3eaabf952c5416a6f22d0df4",
    "support"
   ],
   "css/border_radius_asymmetric_sizes_a.html": [
@@ -14475,11 +14475,11 @@
    "reftest"
   ],
   "css/css-position-3/position-sticky-inline-ref.html": [
-   "11e2909f47b3b785652f509215876fd5e3f36c1e",
+   "1e467bdd71171a175ca22c56882ff178ee77e6a9",
    "support"
   ],
   "css/css-position-3/position-sticky-inline.html": [
-   "cc8694d42363278eaec0704a7130ca1c8a6d7433",
+   "6e6ea9ef91ed17820dc1e272820c4288e02cfae4",
    "reftest"
   ],
   "css/css-position-3/position-sticky-input-box-gets-focused-after-scroll.html": [
@@ -14511,11 +14511,11 @@
    "reftest"
   ],
   "css/css-position-3/position-sticky-nested-inline-ref.html": [
-   "694a3cc84037a546f33c5bf33761c798de4e6b56",
+   "914ff82d73f73de667497cc85487e1ca0aa94616",
    "support"
   ],
   "css/css-position-3/position-sticky-nested-inline.html": [
-   "f44c0e69b59f87b23f4f995926218a60df73c620",
+   "d31bf6617cbf358b4983120ba1265abbf65f788f",
    "reftest"
   ],
   "css/css-position-3/position-sticky-nested-left-ref.html": [
@@ -14655,11 +14655,11 @@
    "reftest"
   ],
   "css/css-position-3/position-sticky-writing-modes-ref.html": [
-   "8b171fa5583d4d1344a79c11b62701dafdcdba17",
+   "e79c639b43ab65d125e399b13366df15f952412b",
    "support"
   ],
   "css/css-position-3/position-sticky-writing-modes.html": [
-   "7f10ff5daf3c17890b8d23088a36b3f7a0447b0f",
+   "9672d093a8f2d4b5500063b4ed1d7f591017cb3c",
    "reftest"
   ],
   "css/css/ahem.css": [
@@ -14807,7 +14807,7 @@
    "support"
   ],
   "css/fixed_width_overrides_child_intrinsic_width_a.html": [
-   "f12c3e9e65aa8201ff0a1e7933d0f9caf81a904f",
+   "ec2a05b49a0929b58a34a9378366b5236a14661d",
    "reftest"
   ],
   "css/fixed_width_overrides_child_intrinsic_width_ref.html": [
@@ -14895,7 +14895,7 @@
    "support"
   ],
   "css/float_intrinsic_width_a.html": [
-   "0b95a45374033a79aa62691553726c13ac54d7d8",
+   "7c77a2b7c0960581b725a5d09cc8662ec936adff",
    "reftest"
   ],
   "css/float_intrinsic_width_ref.html": [
@@ -14923,7 +14923,7 @@
    "testharness"
   ],
   "css/float_right_intrinsic_width_a.html": [
-   "ee47bd9244b165505e7d7adb2cba899b939e0aa3",
+   "79a3e1933e01b49da982d509d5669407c0138f6e",
    "reftest"
   ],
   "css/float_right_intrinsic_width_ref.html": [
@@ -14939,7 +14939,7 @@
    "support"
   ],
   "css/float_table_a.html": [
-   "c4b4a76e4c4daae158a85d1fc2825231de38839a",
+   "2bd4390cbaa7e26274488bc3857f2a9b33f25aba",
    "reftest"
   ],
   "css/float_table_ref.html": [
@@ -15343,7 +15343,7 @@
    "support"
   ],
   "css/img_block_display_a.html": [
-   "5e3071ac1e047a5ab3376a45bd21dd7fde61b7fc",
+   "bae7e2ac8c446d42671f3c591bab0375054543f2",
    "reftest"
   ],
   "css/img_block_display_ref.html": [
@@ -15535,7 +15535,7 @@
    "support"
   ],
   "css/inline_block_baseline_a.html": [
-   "ff80d2fccb87be6a8e4759f2716d3d7b076b1dcd",
+   "734579c126b4d6e4039dd0ecc8bde9ad0eb814db",
    "reftest"
   ],
   "css/inline_block_baseline_ref.html": [
@@ -15575,7 +15575,7 @@
    "support"
   ],
   "css/inline_block_explicit_height_a.html": [
-   "59c40d14231c66e4649019666b3632fdeffe8c5c",
+   "6e94487b8c1c183be35b9e0b002cc8da6a73550c",
    "reftest"
   ],
   "css/inline_block_explicit_height_ref.html": [
@@ -15591,7 +15591,7 @@
    "support"
   ],
   "css/inline_block_img_a.html": [
-   "3fe84cf7ae68ca4b1790c522fb228db636a2bbd5",
+   "cf344c180fca21a60235eab7ee7d307376f1e7b0",
    "reftest"
   ],
   "css/inline_block_img_ref.html": [
@@ -15599,7 +15599,7 @@
    "support"
   ],
   "css/inline_block_margin_a.html": [
-   "290721e1ffd2d61dff749adb7217c42331c9f07f",
+   "5d4f9a18d28504c0e95552d67c1f8e3e9bbf9b31",
    "reftest"
   ],
   "css/inline_block_margin_auto_a.html": [
@@ -15699,7 +15699,7 @@
    "support"
   ],
   "css/inline_block_with_margin_a.html": [
-   "6c20a6cad78409f5ddb1cb388b168e9d33c784ad",
+   "970616b7bd3e20929d247c99eb93555c658475d1",
    "reftest"
   ],
   "css/inline_block_with_margin_ref.html": [
@@ -15715,7 +15715,7 @@
    "support"
   ],
   "css/inline_element_border_a.html": [
-   "e0dbb62983b6f37da91a6086133b9cc453647c81",
+   "ba2f00917b15484e9c596cc5f7ec442e0c1619f9",
    "reftest"
   ],
   "css/inline_element_border_ref.html": [
@@ -16059,35 +16059,35 @@
    "support"
   ],
   "css/line_break_nowrap.html": [
-   "3eb3fdeb652f174817c352219e3e36c34e36703b",
+   "7e20e3d6ec8f2f0a13a7457623e64e065ccd95a9",
    "reftest"
   ],
   "css/line_break_nowrap_ref.html": [
-   "aac581da1dfbfe5e747de3d9b1051fffa541fefe",
+   "94993e6693f676e9df9dd1dd9efb28c5e4c26887",
    "support"
   ],
   "css/line_breaking_whitespace_collapse_a.html": [
-   "38e9f70d088796dfc3ff881386ef08a666fb2781",
+   "07448d97ee0b8b776e18e38654ef1fff81d0a6b2",
    "reftest"
   ],
   "css/line_breaking_whitespace_collapse_ref.html": [
-   "c36c0b4068d09169459ceef97d029cbe36dca310",
+   "6f70c2e94b017ca492bd54aec0efe6fc584e4ae7",
    "support"
   ],
   "css/line_height_a.html": [
-   "c995e2c1dd0f9a8806953e395511df35c428fd80",
+   "aff1ae25e06fd79de96a71b4830dba7461a1259d",
    "reftest"
   ],
   "css/line_height_float_placement_a.html": [
-   "bbf8b5b93eb2d2a4df0abdbb7a5c6aba5f2ea053",
+   "a773ea48179b11d9c21a5dbb86a9c67eec401053",
    "reftest"
   ],
   "css/line_height_float_placement_ref.html": [
-   "89a0c78b28ec65d60f5d3f1da7a10fa09dc3439e",
+   "3093a4cf0cfcaeb8f1906868bcb9bcead1b84d0b",
    "support"
   ],
   "css/line_height_ref.html": [
-   "deaabe11d2bec4eb681716fdef28bed3cec7aa1e",
+   "7d12dfcad27f3072d62ad2293fc340619a987319",
    "support"
   ],
   "css/linear_gradients_corners_a.html": [
@@ -16195,11 +16195,11 @@
    "support"
   ],
   "css/list_style_image_sizing_a.html": [
-   "b47401c033368a1247bdbbd1679dfcebd325a81e",
+   "b9edef664ca6cfe6efa59e166b8944e459e12da0",
    "reftest"
   ],
   "css/list_style_image_sizing_ref.html": [
-   "a4af95bd1ccc94604cbaab6feca7376fc5daf323",
+   "fa406baead6fcdd217cc891c0a02afb5b149656c",
    "support"
   ],
   "css/list_style_position_a.html": [
@@ -16503,7 +16503,7 @@
    "support"
   ],
   "css/offset_properties_inline.html": [
-   "9b93cde7fc09e34687e263896828b46e50003919",
+   "44eaa4490fc515f203c3062476121f94b4337d78",
    "testharness"
   ],
   "css/ol_japanese_iroha_a.html": [
@@ -16719,11 +16719,11 @@
    "support"
   ],
   "css/per_glyph_font_fallback_a.html": [
-   "a6f768682293964a730b3cb6bd2e19764b3f75fb",
+   "ec3c513dcbb2a31d1a2d6cf13a61278e171bb3bf",
    "reftest"
   ],
   "css/per_glyph_font_fallback_ref.html": [
-   "7e0c56a3a3ab6402ce9c5e43f15e4e8f2eacc766",
+   "738631a384dc5df61bcafeebb7c0902ced305269",
    "support"
   ],
   "css/percent_height.html": [
@@ -16879,11 +16879,11 @@
    "support"
   ],
   "css/position_fixed_a.html": [
-   "708fc8bcf8e188df9e09b66e0db32ef8064ad90f",
+   "22878f4c38959f16cfe549d7998f2e5c5147c13c",
    "reftest"
   ],
   "css/position_fixed_b.html": [
-   "5d40c68109cfb0f28fa88cc315450e0a508bf880",
+   "4340cb69b4340396c58e4bb28d1b1f9aa8dbb2b8",
    "support"
   ],
   "css/position_fixed_background_color_a.html": [
@@ -17463,7 +17463,7 @@
    "support"
   ],
   "css/table_padding_a.html": [
-   "6c2feb220580c7f3fd7096b7e75be49bca2edb4e",
+   "ab57c9581fb199d711b681491e93e986d745f2ec",
    "reftest"
   ],
   "css/table_padding_ref.html": [
@@ -17603,11 +17603,11 @@
    "testharness"
   ],
   "css/text_align_complex_a.html": [
-   "2d81dc278b3a347bdc1d24ca83ef4fb3b1af37d6",
+   "b31226691ef9e56be4e77cc4b5708efaf5b71d0c",
    "reftest"
   ],
   "css/text_align_complex_ref.html": [
-   "d7a244de5a8884e4e32c3d12c40e38815c791b9f",
+   "66d9d05bcf74c55f9330467c0fcb5ba25e0c00c2",
    "support"
   ],
   "css/text_align_justify_a.html": [
@@ -17715,11 +17715,11 @@
    "support"
   ],
   "css/text_overflow_reflow.html": [
-   "958e2826fa4c1a5e5e785faa582ac4bb2ea2840e",
+   "cea19c91318fbde554f7f1be78b319cf6020a3a2",
    "reftest"
   ],
   "css/text_overflow_reflow_ref.html": [
-   "3997908406b32e94a863e56935cbc89f240ffe07",
+   "a1043ba4095323ba9549ed5aec8578e7730e2849",
    "support"
   ],
   "css/text_overflow_string.html": [
@@ -18067,7 +18067,7 @@
    "support"
   ],
   "css/white-space-mixed-002.htm": [
-   "c8399602a7d5dfd3ebb7883033ac76b05fd4d6f4",
+   "70fd5baf403e2f78572abb49cd4f37ab51fa2dc5",
    "reftest"
   ],
   "css/white-space-pre-line-long-line.html": [
@@ -18075,11 +18075,11 @@
    "testharness"
   ],
   "css/white-space-pre-line-ref.htm": [
-   "631c37056b507874270f9f3c9479fb0a3b38c5b9",
+   "aa9f5905d7e8be2db9286e1839fda9bbbd08789e",
    "support"
   ],
   "css/white-space-pre-line.htm": [
-   "ed1cdb31a097d127ef568d9c1118f2ca3724d363",
+   "c73c34a390fdd49e3d7b905ddf5c904051a72112",
    "reftest"
   ],
   "css/white-space-pre-wrap-long-line.html": [
@@ -18087,11 +18087,11 @@
    "testharness"
   ],
   "css/white-space-pre-wrap-ref.htm": [
-   "f6bda4e0ee8defc790c5137ccfd8801af5cc9126",
+   "7bbca51e692ccc72055f36934f04d92bd2a6f4c6",
    "support"
   ],
   "css/white-space-pre-wrap.htm": [
-   "ab6bc399c14abd1bfb831ebdcaeaf2e2f55dad19",
+   "077d0fd0d988e73423e54fc81a571379d2f92b06",
    "reftest"
   ],
   "css/white_space_intrinsic_sizes_a.html": [
@@ -18319,11 +18319,11 @@
    "support"
   ],
   "gfx-rs-gecko/display-block-baselines-1-ref.html": [
-   "aeac413c0d35d9a3f2ae418ba6e36cafa67f72b8",
+   "3fd3566190c482d8e2a2372558ed60496ad93477",
    "support"
   ],
   "gfx-rs-gecko/display-block-baselines-1.html": [
-   "0051525c907bf975323c92b6c2f4d50f45041337",
+   "cb599315d26a5527ec414cf37479954c9616a8f4",
    "reftest"
   ],
   "gfx-rs-gecko/downscale-2f.html": [
@@ -18399,7 +18399,7 @@
    "support"
   ],
   "lint.whitelist": [
-   "4e9dcc5ddf894bc85224a634349663b832dd8c24",
+   "314a9e5b44443be1a4e28dd3c5047a5082a7ccab",
    "support"
   ],
   "mozilla/2x2.png": [
@@ -18515,7 +18515,7 @@
    "support"
   ],
   "mozilla/client-top-left-height-width.html": [
-   "a1fade32ab93c5df3e74f6a13bacc29713f6241c",
+   "efa80c330053d7850b180b583adead004303f3b5",
    "testharness"
   ],
   "mozilla/codegen_unions.html": [
@@ -18791,7 +18791,7 @@
    "reftest"
   ],
   "mozilla/getBoundingClientRect.html": [
-   "a8e92d836330126f6ccc4a13354368e223d260da",
+   "447c782db3582529a29fe7db200f32d7490421c4",
    "testharness"
   ],
   "mozilla/getComputedStyle.html": [
@@ -19023,7 +19023,7 @@
    "testharness"
   ],
   "mozilla/mime_sniffing_font_context.html": [
-   "3d8a4d170595ee7bd8926581eefd179a20d131a8",
+   "57c18f558ff9a71ef97088779e79fa3a74057d77",
    "testharness"
   ],
   "mozilla/mql_borrow.html": [
diff --git a/tests/wpt/mozilla/tests/css/abs_float_pref_width.html b/tests/wpt/mozilla/tests/css/abs_float_pref_width.html
index 4d5c2f971a5..6091dc5ad57 100644
--- a/tests/wpt/mozilla/tests/css/abs_float_pref_width.html
+++ b/tests/wpt/mozilla/tests/css/abs_float_pref_width.html
@@ -2,6 +2,7 @@
 <html>
     <head>
     <link rel=match href="abs_float_pref_width-ref.html">
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
     <style type="text/css">
         body {
             margin: 0;
diff --git a/tests/wpt/mozilla/tests/css/background_image_position_a.html b/tests/wpt/mozilla/tests/css/background_image_position_a.html
index f3ff1cc329b..080fdc9a0f4 100644
--- a/tests/wpt/mozilla/tests/css/background_image_position_a.html
+++ b/tests/wpt/mozilla/tests/css/background_image_position_a.html
@@ -2,6 +2,7 @@
 <html>
     <head>
         <link rel=match href=background_image_position_ref.html>
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
         <style type="text/css">
             body {
                 font-family: 'ahem';
diff --git a/tests/wpt/mozilla/tests/css/border_inline_split.html b/tests/wpt/mozilla/tests/css/border_inline_split.html
index 4cf2aaacc11..95bd669bdb4 100644
--- a/tests/wpt/mozilla/tests/css/border_inline_split.html
+++ b/tests/wpt/mozilla/tests/css/border_inline_split.html
@@ -1,6 +1,7 @@
 <!doctype html>
 <html><head>
 <link rel=match href=border_inline_split_ref.html>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <meta content="ahem dom" name="flags">
 <style>
     div {
diff --git a/tests/wpt/mozilla/tests/css/border_inline_split_ref.html b/tests/wpt/mozilla/tests/css/border_inline_split_ref.html
index 658b7f533b6..8a85ef94436 100644
--- a/tests/wpt/mozilla/tests/css/border_inline_split_ref.html
+++ b/tests/wpt/mozilla/tests/css/border_inline_split_ref.html
@@ -1,6 +1,7 @@
 <!doctype html>
 <html><head>
 <meta content="ahem dom" name="flags">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
     span {
         font: 20px/1 Ahem;
diff --git a/tests/wpt/mozilla/tests/css/css-position-3/position-sticky-inline-ref.html b/tests/wpt/mozilla/tests/css/css-position-3/position-sticky-inline-ref.html
index 11e2909f47b..1e467bdd711 100644
--- a/tests/wpt/mozilla/tests/css/css-position-3/position-sticky-inline-ref.html
+++ b/tests/wpt/mozilla/tests/css/css-position-3/position-sticky-inline-ref.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <title>Reference for position:sticky should work for inline elements</title>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 
 <style>
 .group {
diff --git a/tests/wpt/mozilla/tests/css/css-position-3/position-sticky-inline.html b/tests/wpt/mozilla/tests/css/css-position-3/position-sticky-inline.html
index cc8694d4236..6e6ea9ef91e 100644
--- a/tests/wpt/mozilla/tests/css/css-position-3/position-sticky-inline.html
+++ b/tests/wpt/mozilla/tests/css/css-position-3/position-sticky-inline.html
@@ -2,6 +2,7 @@
 <title>position:sticky should work for inline elements</title>
 <link rel="match" href="position-sticky-inline-ref.html" />
 <link rel="help" href="https://www.w3.org/TR/css-position-3/#sticky-pos" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <meta name="assert" content="This test checks that position:sticky works for inline elements" />
 
 <style>
diff --git a/tests/wpt/mozilla/tests/css/css-position-3/position-sticky-nested-inline-ref.html b/tests/wpt/mozilla/tests/css/css-position-3/position-sticky-nested-inline-ref.html
index 694a3cc8403..914ff82d73f 100644
--- a/tests/wpt/mozilla/tests/css/css-position-3/position-sticky-nested-inline-ref.html
+++ b/tests/wpt/mozilla/tests/css/css-position-3/position-sticky-nested-inline-ref.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <title>Reference for nested inline position:sticky elements should render correctly</title>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 
 <style>
 .group {
diff --git a/tests/wpt/mozilla/tests/css/css-position-3/position-sticky-nested-inline.html b/tests/wpt/mozilla/tests/css/css-position-3/position-sticky-nested-inline.html
index f44c0e69b59..d31bf6617cb 100644
--- a/tests/wpt/mozilla/tests/css/css-position-3/position-sticky-nested-inline.html
+++ b/tests/wpt/mozilla/tests/css/css-position-3/position-sticky-nested-inline.html
@@ -2,6 +2,7 @@
 <title>Nested inline position:sticky elements should render correctly</title>
 <link rel="match" href="position-sticky-nested-inline-ref.html" />
 <link rel="help" href="https://www.w3.org/TR/css-position-3/#sticky-pos" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <meta name="assert" content="This test checks that nested inline position:sticky elements render correctly" />
 
 <style>
diff --git a/tests/wpt/mozilla/tests/css/css-position-3/position-sticky-writing-modes-ref.html b/tests/wpt/mozilla/tests/css/css-position-3/position-sticky-writing-modes-ref.html
index 8b171fa5583..e79c639b43a 100644
--- a/tests/wpt/mozilla/tests/css/css-position-3/position-sticky-writing-modes-ref.html
+++ b/tests/wpt/mozilla/tests/css/css-position-3/position-sticky-writing-modes-ref.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <title>Reference for position:sticky constraints are independent of writing mode</title>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 
 <style>
 .group {
diff --git a/tests/wpt/mozilla/tests/css/css-position-3/position-sticky-writing-modes.html b/tests/wpt/mozilla/tests/css/css-position-3/position-sticky-writing-modes.html
index 7f10ff5daf3..9672d093a8f 100644
--- a/tests/wpt/mozilla/tests/css/css-position-3/position-sticky-writing-modes.html
+++ b/tests/wpt/mozilla/tests/css/css-position-3/position-sticky-writing-modes.html
@@ -2,6 +2,7 @@
 <title>position:sticky constraints are independent of writing mode</title>
 <link rel="match" href="position-sticky-writing-modes-ref.html" />
 <link rel="help" href="https://www.w3.org/TR/css-position-3/#sticky-pos" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <meta name="assert" content="This test checks that position:sticky constraints are independent of the writing mode" />
 
 <style>
diff --git a/tests/wpt/mozilla/tests/css/fixed_width_overrides_child_intrinsic_width_a.html b/tests/wpt/mozilla/tests/css/fixed_width_overrides_child_intrinsic_width_a.html
index f12c3e9e65a..ec2a05b49a0 100644
--- a/tests/wpt/mozilla/tests/css/fixed_width_overrides_child_intrinsic_width_a.html
+++ b/tests/wpt/mozilla/tests/css/fixed_width_overrides_child_intrinsic_width_a.html
@@ -2,6 +2,7 @@
 <html>
     <head>
         <link rel=match href=fixed_width_overrides_child_intrinsic_width_ref.html>
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
         <style type="text/css">
             body {
                 font-family: 'ahem';
diff --git a/tests/wpt/mozilla/tests/css/float_intrinsic_width_a.html b/tests/wpt/mozilla/tests/css/float_intrinsic_width_a.html
index 0b95a453740..7c77a2b7c09 100644
--- a/tests/wpt/mozilla/tests/css/float_intrinsic_width_a.html
+++ b/tests/wpt/mozilla/tests/css/float_intrinsic_width_a.html
@@ -2,6 +2,7 @@
 <html>
     <head>
         <link rel='match' href='float_intrinsic_width_ref.html'>
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
         <style type="text/css">
             body {
                 font-family: 'ahem';
diff --git a/tests/wpt/mozilla/tests/css/float_right_intrinsic_width_a.html b/tests/wpt/mozilla/tests/css/float_right_intrinsic_width_a.html
index ee47bd9244b..79a3e1933e0 100644
--- a/tests/wpt/mozilla/tests/css/float_right_intrinsic_width_a.html
+++ b/tests/wpt/mozilla/tests/css/float_right_intrinsic_width_a.html
@@ -2,6 +2,7 @@
 <html>
     <head>
         <link rel='match' href='float_right_intrinsic_width_ref.html'>
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             .fr {
                 float: right;
diff --git a/tests/wpt/mozilla/tests/css/float_table_a.html b/tests/wpt/mozilla/tests/css/float_table_a.html
index c4b4a76e4c4..2bd4390cbaa 100644
--- a/tests/wpt/mozilla/tests/css/float_table_a.html
+++ b/tests/wpt/mozilla/tests/css/float_table_a.html
@@ -4,6 +4,7 @@
         <link rel='match' href='float_table_ref.html'>
         <meta http-equiv="content-type" content="text/html; charset=UTF-8">
         <meta charset="UTF-8">
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
         <style type="text/css">
             body {
                 margin: 0;
diff --git a/tests/wpt/mozilla/tests/css/img_block_display_a.html b/tests/wpt/mozilla/tests/css/img_block_display_a.html
index 5e3071ac1e0..bae7e2ac8c4 100644
--- a/tests/wpt/mozilla/tests/css/img_block_display_a.html
+++ b/tests/wpt/mozilla/tests/css/img_block_display_a.html
@@ -2,6 +2,7 @@
 <html>
     <head>
         <link rel='match' href='img_block_display_ref.html'>
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             body {
                 margin: 0;
diff --git a/tests/wpt/mozilla/tests/css/inline_block_baseline_a.html b/tests/wpt/mozilla/tests/css/inline_block_baseline_a.html
index ff80d2fccb8..734579c126b 100644
--- a/tests/wpt/mozilla/tests/css/inline_block_baseline_a.html
+++ b/tests/wpt/mozilla/tests/css/inline_block_baseline_a.html
@@ -2,6 +2,7 @@
 <html>
     <head>
         <link rel='match' href='inline_block_baseline_ref.html'>
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
         <style type="text/css">
             body {
                 font-family: 'ahem';
diff --git a/tests/wpt/mozilla/tests/css/inline_block_explicit_height_a.html b/tests/wpt/mozilla/tests/css/inline_block_explicit_height_a.html
index 59c40d14231..6e94487b8c1 100644
--- a/tests/wpt/mozilla/tests/css/inline_block_explicit_height_a.html
+++ b/tests/wpt/mozilla/tests/css/inline_block_explicit_height_a.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <link rel="match" href="inline_block_explicit_height_ref.html">
-<link rel="stylesheet" type="text/css" href="css/ahem.css">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style>
 body, html {
     margin: 0;
diff --git a/tests/wpt/mozilla/tests/css/inline_block_img_a.html b/tests/wpt/mozilla/tests/css/inline_block_img_a.html
index 3fe84cf7ae6..cf344c180fc 100644
--- a/tests/wpt/mozilla/tests/css/inline_block_img_a.html
+++ b/tests/wpt/mozilla/tests/css/inline_block_img_a.html
@@ -2,6 +2,7 @@
 <html>
     <head>
         <link rel='match' href='inline_block_img_ref.html'>
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style>
             body {
                 margin: 0;
diff --git a/tests/wpt/mozilla/tests/css/inline_block_margin_a.html b/tests/wpt/mozilla/tests/css/inline_block_margin_a.html
index 290721e1ffd..5d4f9a18d28 100644
--- a/tests/wpt/mozilla/tests/css/inline_block_margin_a.html
+++ b/tests/wpt/mozilla/tests/css/inline_block_margin_a.html
@@ -2,6 +2,7 @@
 <html>
     <head>
         <link rel='match' href='inline_block_margin_ref.html'>
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
         <style type="text/css">
             body {
                 font-family: 'ahem';
diff --git a/tests/wpt/mozilla/tests/css/inline_block_with_margin_a.html b/tests/wpt/mozilla/tests/css/inline_block_with_margin_a.html
index 6c20a6cad78..970616b7bd3 100644
--- a/tests/wpt/mozilla/tests/css/inline_block_with_margin_a.html
+++ b/tests/wpt/mozilla/tests/css/inline_block_with_margin_a.html
@@ -2,6 +2,7 @@
 <html>
     <head>
         <link rel='match' href='inline_block_with_margin_ref.html'>
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
         <style type="text/css">
             body {
                 margin: 0;
diff --git a/tests/wpt/mozilla/tests/css/inline_element_border_a.html b/tests/wpt/mozilla/tests/css/inline_element_border_a.html
index e0dbb62983b..ba2f00917b1 100644
--- a/tests/wpt/mozilla/tests/css/inline_element_border_a.html
+++ b/tests/wpt/mozilla/tests/css/inline_element_border_a.html
@@ -2,6 +2,7 @@
 <html>
     <head>
         <link rel='match' href='inline_element_border_ref.html'>
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
         <style type="text/css">
         .large-border {
             border-left: 100px solid red;
diff --git a/tests/wpt/mozilla/tests/css/line_break_nowrap.html b/tests/wpt/mozilla/tests/css/line_break_nowrap.html
index 3eb3fdeb652..7e20e3d6ec8 100644
--- a/tests/wpt/mozilla/tests/css/line_break_nowrap.html
+++ b/tests/wpt/mozilla/tests/css/line_break_nowrap.html
@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <title>nowrap line-breaking test</title>
     <link rel="match" href="line_break_nowrap_ref.html">
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
     <style>
       body {
         font-family: 'ahem';
diff --git a/tests/wpt/mozilla/tests/css/line_break_nowrap_ref.html b/tests/wpt/mozilla/tests/css/line_break_nowrap_ref.html
index aac581da1df..94993e6693f 100644
--- a/tests/wpt/mozilla/tests/css/line_break_nowrap_ref.html
+++ b/tests/wpt/mozilla/tests/css/line_break_nowrap_ref.html
@@ -3,6 +3,7 @@
   <head>
     <meta charset="utf-8">
     <title>nowrap line-breaking reference</title>
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
     <style>
       body { font-family: 'ahem'; }
     </style>
diff --git a/tests/wpt/mozilla/tests/css/line_breaking_whitespace_collapse_a.html b/tests/wpt/mozilla/tests/css/line_breaking_whitespace_collapse_a.html
index 38e9f70d088..07448d97ee0 100644
--- a/tests/wpt/mozilla/tests/css/line_breaking_whitespace_collapse_a.html
+++ b/tests/wpt/mozilla/tests/css/line_breaking_whitespace_collapse_a.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <link rel='match' href='line_breaking_whitespace_collapse_ref.html'>
-<link rel="stylesheet" type="text/css" href="css/ahem.css">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style>
 p {
     font-size: 10px;
diff --git a/tests/wpt/mozilla/tests/css/line_breaking_whitespace_collapse_ref.html b/tests/wpt/mozilla/tests/css/line_breaking_whitespace_collapse_ref.html
index c36c0b4068d..6f70c2e94b0 100644
--- a/tests/wpt/mozilla/tests/css/line_breaking_whitespace_collapse_ref.html
+++ b/tests/wpt/mozilla/tests/css/line_breaking_whitespace_collapse_ref.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<link rel="stylesheet" type="text/css" href="css/ahem.css">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style>
 p {
     font-size: 10px;
diff --git a/tests/wpt/mozilla/tests/css/line_height_a.html b/tests/wpt/mozilla/tests/css/line_height_a.html
index c995e2c1dd0..aff1ae25e06 100644
--- a/tests/wpt/mozilla/tests/css/line_height_a.html
+++ b/tests/wpt/mozilla/tests/css/line_height_a.html
@@ -2,6 +2,7 @@
 <html>
     <head>
         <link rel=match href=line_height_ref.html>
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
         <style>
             body {
                 margin: 0;
diff --git a/tests/wpt/mozilla/tests/css/line_height_float_placement_a.html b/tests/wpt/mozilla/tests/css/line_height_float_placement_a.html
index bbf8b5b93eb..a773ea48179 100644
--- a/tests/wpt/mozilla/tests/css/line_height_float_placement_a.html
+++ b/tests/wpt/mozilla/tests/css/line_height_float_placement_a.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <link rel='match' href='line_height_float_placement_ref.html'>
-<link rel="stylesheet" type="text/css" href="css/ahem.css">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style>
 * {
     margin: 0;
diff --git a/tests/wpt/mozilla/tests/css/line_height_float_placement_ref.html b/tests/wpt/mozilla/tests/css/line_height_float_placement_ref.html
index 89a0c78b28e..3093a4cf0cf 100644
--- a/tests/wpt/mozilla/tests/css/line_height_float_placement_ref.html
+++ b/tests/wpt/mozilla/tests/css/line_height_float_placement_ref.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<link rel="stylesheet" type="text/css" href="css/ahem.css">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style>
 * {
     margin: 0;
diff --git a/tests/wpt/mozilla/tests/css/line_height_ref.html b/tests/wpt/mozilla/tests/css/line_height_ref.html
index deaabe11d2b..7d12dfcad27 100644
--- a/tests/wpt/mozilla/tests/css/line_height_ref.html
+++ b/tests/wpt/mozilla/tests/css/line_height_ref.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style>
             body {
                 margin: 0;
diff --git a/tests/wpt/mozilla/tests/css/list_style_image_sizing_a.html b/tests/wpt/mozilla/tests/css/list_style_image_sizing_a.html
index b47401c0333..b9edef664ca 100644
--- a/tests/wpt/mozilla/tests/css/list_style_image_sizing_a.html
+++ b/tests/wpt/mozilla/tests/css/list_style_image_sizing_a.html
@@ -6,7 +6,7 @@
     Tests that the list style image doesn't get stretched vertically. It should be completely
     covered up by the black absolutely-positioned div.
 -->
-<link rel="stylesheet" type="text/css" href="css/ahem.css">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style>
 * {
     margin: 0;
diff --git a/tests/wpt/mozilla/tests/css/list_style_image_sizing_ref.html b/tests/wpt/mozilla/tests/css/list_style_image_sizing_ref.html
index a4af95bd1cc..fa406baead6 100644
--- a/tests/wpt/mozilla/tests/css/list_style_image_sizing_ref.html
+++ b/tests/wpt/mozilla/tests/css/list_style_image_sizing_ref.html
@@ -5,7 +5,7 @@
     Tests that the list style image doesn't get stretched vertically. It should be completely
     covered up by the black absolutely-positioned div.
 -->
-<link rel="stylesheet" type="text/css" href="css/ahem.css">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 * {
     margin: 0;
diff --git a/tests/wpt/mozilla/tests/css/offset_properties_inline.html b/tests/wpt/mozilla/tests/css/offset_properties_inline.html
index 9b93cde7fc0..44eaa4490fc 100644
--- a/tests/wpt/mozilla/tests/css/offset_properties_inline.html
+++ b/tests/wpt/mozilla/tests/css/offset_properties_inline.html
@@ -3,6 +3,7 @@
 <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>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
   #real-offset-parent {
     font: 10px/1 Ahem;
diff --git a/tests/wpt/mozilla/tests/css/per_glyph_font_fallback_a.html b/tests/wpt/mozilla/tests/css/per_glyph_font_fallback_a.html
index a6f76868229..ec3c513dcbb 100644
--- a/tests/wpt/mozilla/tests/css/per_glyph_font_fallback_a.html
+++ b/tests/wpt/mozilla/tests/css/per_glyph_font_fallback_a.html
@@ -2,6 +2,7 @@
 <html>
 <head>
 <link rel='match' href='per_glyph_font_fallback_ref.html'>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <!-- Tests that font fallback occurs on a per-glyph basis. -->
 <style>
 body {
diff --git a/tests/wpt/mozilla/tests/css/per_glyph_font_fallback_ref.html b/tests/wpt/mozilla/tests/css/per_glyph_font_fallback_ref.html
index 7e0c56a3a3a..738631a384d 100644
--- a/tests/wpt/mozilla/tests/css/per_glyph_font_fallback_ref.html
+++ b/tests/wpt/mozilla/tests/css/per_glyph_font_fallback_ref.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <!-- Tests that font fallback occurs on a per-glyph basis. -->
 <style>
 body {
diff --git a/tests/wpt/mozilla/tests/css/position_fixed_a.html b/tests/wpt/mozilla/tests/css/position_fixed_a.html
index 708fc8bcf8e..22878f4c389 100644
--- a/tests/wpt/mozilla/tests/css/position_fixed_a.html
+++ b/tests/wpt/mozilla/tests/css/position_fixed_a.html
@@ -1,6 +1,7 @@
 <html>
   <head>
     <link rel=match href=position_fixed_b.html>
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
     <style>
     body, html {
         margin: 0;
diff --git a/tests/wpt/mozilla/tests/css/position_fixed_b.html b/tests/wpt/mozilla/tests/css/position_fixed_b.html
index 5d40c68109c..4340cb69b43 100644
--- a/tests/wpt/mozilla/tests/css/position_fixed_b.html
+++ b/tests/wpt/mozilla/tests/css/position_fixed_b.html
@@ -1,5 +1,6 @@
 <html>
   <head>
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
     <style>
     body, html {
         margin: 0;
diff --git a/tests/wpt/mozilla/tests/css/table_padding_a.html b/tests/wpt/mozilla/tests/css/table_padding_a.html
index 6c2feb22058..ab57c9581fb 100644
--- a/tests/wpt/mozilla/tests/css/table_padding_a.html
+++ b/tests/wpt/mozilla/tests/css/table_padding_a.html
@@ -2,6 +2,7 @@
 <html>
     <head>
         <link rel='match' href='table_padding_ref.html'>
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
         <style type="text/css">
             body {
                 margin: 0;
diff --git a/tests/wpt/mozilla/tests/css/text_align_complex_a.html b/tests/wpt/mozilla/tests/css/text_align_complex_a.html
index 2d81dc278b3..b31226691ef 100644
--- a/tests/wpt/mozilla/tests/css/text_align_complex_a.html
+++ b/tests/wpt/mozilla/tests/css/text_align_complex_a.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <link rel='match' href='text_align_complex_ref.html'>
-<link rel="stylesheet" type="text/css" href="css/ahem.css">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style>
 
     * { margin: 0px !important; padding: 0px !important; }
diff --git a/tests/wpt/mozilla/tests/css/text_align_complex_ref.html b/tests/wpt/mozilla/tests/css/text_align_complex_ref.html
index d7a244de5a8..66d9d05bcf7 100644
--- a/tests/wpt/mozilla/tests/css/text_align_complex_ref.html
+++ b/tests/wpt/mozilla/tests/css/text_align_complex_ref.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<link rel="stylesheet" type="text/css" href="css/ahem.css">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style>
 
     * { margin: 0px !important; padding: 0px !important; }
diff --git a/tests/wpt/mozilla/tests/css/text_overflow_reflow.html b/tests/wpt/mozilla/tests/css/text_overflow_reflow.html
index 958e2826fa4..cea19c91318 100644
--- a/tests/wpt/mozilla/tests/css/text_overflow_reflow.html
+++ b/tests/wpt/mozilla/tests/css/text_overflow_reflow.html
@@ -4,6 +4,7 @@
 <title>Text overflow should disappear when the container becomes large enough</title>
 <meta name="description" content="This test is targetted at bug #14952 in Servo's incremental reflow engine.">
 <link rel="match" href="text_overflow_reflow_ref.html">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>html{font-family:Ahem}</style>
 <div id=goat style="width:5em"><p style="text-overflow:ellipsis;overflow:hidden">XXXXXXXXXX</p></div>
 <script>
diff --git a/tests/wpt/mozilla/tests/css/text_overflow_reflow_ref.html b/tests/wpt/mozilla/tests/css/text_overflow_reflow_ref.html
index 3997908406b..a1043ba4095 100644
--- a/tests/wpt/mozilla/tests/css/text_overflow_reflow_ref.html
+++ b/tests/wpt/mozilla/tests/css/text_overflow_reflow_ref.html
@@ -1,5 +1,6 @@
 <!doctype html>
 <meta charset="utf-8">
 <title>Text overflow should disappear when the container becomes large enough</title>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style>html{font-family:Ahem}</style>
 <div style="width:20em"><p style="text-overflow:ellipsis;overflow:hidden">XXXXXXXXXX</p></div>
diff --git a/tests/wpt/mozilla/tests/css/white-space-mixed-002.htm b/tests/wpt/mozilla/tests/css/white-space-mixed-002.htm
index c8399602a7d..70fd5baf403 100644
--- a/tests/wpt/mozilla/tests/css/white-space-mixed-002.htm
+++ b/tests/wpt/mozilla/tests/css/white-space-mixed-002.htm
@@ -10,6 +10,7 @@
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/mixed/002.html" type="text/html">
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model">
   <link rel="match" href="white-space-mixed-002-ref.htm">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 
   <meta name="flags" content="ahem">
 
diff --git a/tests/wpt/mozilla/tests/css/white-space-pre-line-ref.htm b/tests/wpt/mozilla/tests/css/white-space-pre-line-ref.htm
index 631c37056b5..aa9f5905d7e 100644
--- a/tests/wpt/mozilla/tests/css/white-space-pre-line-ref.htm
+++ b/tests/wpt/mozilla/tests/css/white-space-pre-line-ref.htm
@@ -2,6 +2,7 @@
 <html>
   <head>
     <title>whitespace pre-line basic functionality test</title>
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
     <style>
       div { white-space: normal; font: 1.25em/1 Ahem; width: 6em }
     </style>
diff --git a/tests/wpt/mozilla/tests/css/white-space-pre-line.htm b/tests/wpt/mozilla/tests/css/white-space-pre-line.htm
index ed1cdb31a09..c73c34a390f 100644
--- a/tests/wpt/mozilla/tests/css/white-space-pre-line.htm
+++ b/tests/wpt/mozilla/tests/css/white-space-pre-line.htm
@@ -3,6 +3,7 @@
   <head>
     <title>whitespace pre-line basic functionality test</title>
     <link rel=match href=white-space-pre-line-ref.htm>
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
     <style>
       div { white-space: pre-line; font: 1.25em/1 Ahem; width: 6em }
     </style>
diff --git a/tests/wpt/mozilla/tests/css/white-space-pre-wrap-ref.htm b/tests/wpt/mozilla/tests/css/white-space-pre-wrap-ref.htm
index f6bda4e0ee8..7bbca51e692 100644
--- a/tests/wpt/mozilla/tests/css/white-space-pre-wrap-ref.htm
+++ b/tests/wpt/mozilla/tests/css/white-space-pre-wrap-ref.htm
@@ -2,6 +2,7 @@
 <html>
   <head>
     <title>whitespace pre-wrap basic functionality test</title>
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
     <style>
       div { white-space: normal; font: 1.25em/1 Ahem; width: 6em }
     </style>
diff --git a/tests/wpt/mozilla/tests/css/white-space-pre-wrap.htm b/tests/wpt/mozilla/tests/css/white-space-pre-wrap.htm
index ab6bc399c14..077d0fd0d98 100644
--- a/tests/wpt/mozilla/tests/css/white-space-pre-wrap.htm
+++ b/tests/wpt/mozilla/tests/css/white-space-pre-wrap.htm
@@ -3,6 +3,7 @@
   <head>
     <title>whitespace pre-wrap basic functionality test</title>
     <link rel=match href=white-space-pre-wrap-ref.htm>
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
     <style>
       div { white-space: pre-wrap; font: 1.25em/1 Ahem; width: 6em }
     </style>
diff --git a/tests/wpt/mozilla/tests/gfx-rs-gecko/display-block-baselines-1-ref.html b/tests/wpt/mozilla/tests/gfx-rs-gecko/display-block-baselines-1-ref.html
index aeac413c0d3..3fd3566190c 100644
--- a/tests/wpt/mozilla/tests/gfx-rs-gecko/display-block-baselines-1-ref.html
+++ b/tests/wpt/mozilla/tests/gfx-rs-gecko/display-block-baselines-1-ref.html
@@ -6,11 +6,8 @@
 <html><head>
   <meta charset="utf-8">
   <title>Reference: Testcase #1 for bug 1330962</title>
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style type="text/css">
-@font-face {
- src: url(/fonts/Ahem.ttf);
- font-family: Ahem;
-}
 html,body {
   color:black; background-color:white; font:16px/1 Ahem; padding:0; margin:0;
 }
diff --git a/tests/wpt/mozilla/tests/gfx-rs-gecko/display-block-baselines-1.html b/tests/wpt/mozilla/tests/gfx-rs-gecko/display-block-baselines-1.html
index 0051525c907..cb599315d26 100644
--- a/tests/wpt/mozilla/tests/gfx-rs-gecko/display-block-baselines-1.html
+++ b/tests/wpt/mozilla/tests/gfx-rs-gecko/display-block-baselines-1.html
@@ -4,14 +4,11 @@
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <link rel="match" href="display-block-baselines-1-ref.html">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <html><head>
   <meta charset="utf-8">
   <title>Testcase #1 for bug 1330962</title>
   <style type="text/css">
-@font-face {
- src: url(/fonts/Ahem.ttf);
- font-family: Ahem;
-}
 html,body {
   color:black; background-color:white; font:16px/1 Ahem; padding:0; margin:0;
 }
diff --git a/tests/wpt/mozilla/tests/lint.whitelist b/tests/wpt/mozilla/tests/lint.whitelist
index 4e9dcc5ddf8..314a9e5b444 100644
--- a/tests/wpt/mozilla/tests/lint.whitelist
+++ b/tests/wpt/mozilla/tests/lint.whitelist
@@ -32,4 +32,8 @@ SUPPORT-WRONG-DIR:*
 
 ## Unnecessary checks ##
 
-WEB-PLATFORM.TEST:*
\ No newline at end of file
+WEB-PLATFORM.TEST:*
+
+## Too strict checks ##
+
+AHEM SYSTEM FONT: gfx-rs-gecko/descriptor-ranges.html
\ No newline at end of file
diff --git a/tests/wpt/mozilla/tests/mozilla/client-top-left-height-width.html b/tests/wpt/mozilla/tests/mozilla/client-top-left-height-width.html
index a1fade32ab9..efa80c33005 100644
--- a/tests/wpt/mozilla/tests/mozilla/client-top-left-height-width.html
+++ b/tests/wpt/mozilla/tests/mozilla/client-top-left-height-width.html
@@ -2,6 +2,7 @@
 <head>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 #no-border {
     width: 100px;
diff --git a/tests/wpt/mozilla/tests/mozilla/getBoundingClientRect.html b/tests/wpt/mozilla/tests/mozilla/getBoundingClientRect.html
index a8e92d83633..447c782db35 100644
--- a/tests/wpt/mozilla/tests/mozilla/getBoundingClientRect.html
+++ b/tests/wpt/mozilla/tests/mozilla/getBoundingClientRect.html
@@ -2,6 +2,7 @@
 <head>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 #rel-div {
     position: relative;
diff --git a/tests/wpt/mozilla/tests/mozilla/mime_sniffing_font_context.html b/tests/wpt/mozilla/tests/mozilla/mime_sniffing_font_context.html
index 3d8a4d17059..57c18f558ff 100644
--- a/tests/wpt/mozilla/tests/mozilla/mime_sniffing_font_context.html
+++ b/tests/wpt/mozilla/tests/mozilla/mime_sniffing_font_context.html
@@ -3,6 +3,7 @@
 <title>Sniffed Content-Type for @font-face is different than XHR</title>
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
   @font-face {
     font-family: MimelessAhem;