Update web-platform-tests to revision 347a7974c93326910109cd0f3386cc427add4ec5

656 files changed, 6386 insertions, 4726 deletions

diff --git a/tests/wpt/metadata/2dcontext/imagebitmap/createImageBitmap-drawImage.html.ini b/tests/wpt/metadata/2dcontext/imagebitmap/createImageBitmap-drawImage.html.ini
index 8db1ab505b6..5a201d2ecad 100644
--- a/tests/wpt/metadata/2dcontext/imagebitmap/createImageBitmap-drawImage.html.ini
+++ b/tests/wpt/metadata/2dcontext/imagebitmap/createImageBitmap-drawImage.html.ini
@@ -1,10 +1,11 @@
 [createImageBitmap-drawImage.html]
   type: testharness
+  expected: TIMEOUT
   [createImageBitmap from a HTMLImageElement, and drawImage on the created ImageBitmap]
     expected: FAIL
 
   [createImageBitmap from a Blob, and drawImage on the created ImageBitmap]
-    expected: FAIL
+    expected: TIMEOUT
 
   [createImageBitmap from a HTMLCanvasElement, and drawImage on the created ImageBitmap]
     expected: FAIL
@@ -49,7 +50,7 @@
     expected: FAIL
 
   [createImageBitmap from a Blob with negative sw/sh, and drawImage on the created ImageBitmap]
-    expected: FAIL
+    expected: NOTRUN
 
   [createImageBitmap from a bitmap HTMLImageElement, and drawImage on the created ImageBitmap]
     expected: FAIL
@@ -172,11 +173,11 @@
     expected: FAIL
 
   [createImageBitmap from a Blob scaled down, and drawImage on the created ImageBitmap]
-    expected: FAIL
+    expected: NOTRUN
 
   [createImageBitmap from a Blob scaled up, and drawImage on the created ImageBitmap]
-    expected: FAIL
+    expected: NOTRUN
 
   [createImageBitmap from a Blob resized, and drawImage on the created ImageBitmap]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 77861123680..e430e5c3c97 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -6067,1818 +6067,6 @@
      {}
     ]
    ],
-   "css/WOFF2/available-001.xht": [
-    [
-     "/css/WOFF2/available-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/blocks-extraneous-data-001.xht": [
-    [
-     "/css/WOFF2/blocks-extraneous-data-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/blocks-extraneous-data-002.xht": [
-    [
-     "/css/WOFF2/blocks-extraneous-data-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/blocks-extraneous-data-003.xht": [
-    [
-     "/css/WOFF2/blocks-extraneous-data-003.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/blocks-extraneous-data-004.xht": [
-    [
-     "/css/WOFF2/blocks-extraneous-data-004.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/blocks-extraneous-data-005.xht": [
-    [
-     "/css/WOFF2/blocks-extraneous-data-005.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/blocks-extraneous-data-006.xht": [
-    [
-     "/css/WOFF2/blocks-extraneous-data-006.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/blocks-extraneous-data-007.xht": [
-    [
-     "/css/WOFF2/blocks-extraneous-data-007.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/blocks-extraneous-data-008.xht": [
-    [
-     "/css/WOFF2/blocks-extraneous-data-008.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/blocks-overlap-001.xht": [
-    [
-     "/css/WOFF2/blocks-overlap-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/blocks-overlap-002.xht": [
-    [
-     "/css/WOFF2/blocks-overlap-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/blocks-overlap-003.xht": [
-    [
-     "/css/WOFF2/blocks-overlap-003.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/datatypes-alt-255uint16-001.xht": [
-    [
-     "/css/WOFF2/datatypes-alt-255uint16-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/datatypes-invalid-base128-001.xht": [
-    [
-     "/css/WOFF2/datatypes-invalid-base128-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/datatypes-invalid-base128-002.xht": [
-    [
-     "/css/WOFF2/datatypes-invalid-base128-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/datatypes-invalid-base128-003.xht": [
-    [
-     "/css/WOFF2/datatypes-invalid-base128-003.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/directory-mismatched-tables-001.xht": [
-    [
-     "/css/WOFF2/directory-mismatched-tables-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/header-length-001.xht": [
-    [
-     "/css/WOFF2/header-length-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/header-length-002.xht": [
-    [
-     "/css/WOFF2/header-length-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/header-numTables-001.xht": [
-    [
-     "/css/WOFF2/header-numTables-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/header-reserved-001.xht": [
-    [
-     "/css/WOFF2/header-reserved-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/header-signature-001.xht": [
-    [
-     "/css/WOFF2/header-signature-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/header-totalsfntsize-001.xht": [
-    [
-     "/css/WOFF2/header-totalsfntsize-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/header-totalsfntsize-002.xht": [
-    [
-     "/css/WOFF2/header-totalsfntsize-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadata-noeffect-001.xht": [
-    [
-     "/css/WOFF2/metadata-noeffect-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadata-noeffect-002.xht": [
-    [
-     "/css/WOFF2/metadata-noeffect-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-authoritative-001.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-authoritative-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-compression-001.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-compression-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-encoding-001.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-encoding-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-encoding-002.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-encoding-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-encoding-003.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-encoding-003.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-encoding-004.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-encoding-004.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-encoding-005.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-encoding-005.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-encoding-006.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-encoding-006.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-metaOrigLength-001.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-metaOrigLength-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-metaOrigLength-002.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-metaOrigLength-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-001.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-002.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-003.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-003.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-004.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-004.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-005.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-005.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-006.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-006.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-007.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-007.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-008.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-008.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-009.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-009.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-010.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-010.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-011.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-011.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-012.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-012.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-013.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-013.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-014.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-014.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-015.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-015.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-016.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-016.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-017.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-017.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-018.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-018.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-019.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-019.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-020.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-020.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-021.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-021.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-022.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-022.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-023.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-023.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-024.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-024.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-025.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-025.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-026.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-026.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-027.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-027.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-028.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-028.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-029.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-029.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-copyright-030.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-copyright-030.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-credit-001.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-credit-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-credit-002.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-credit-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-credit-003.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-credit-003.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-credit-004.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-credit-004.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-credit-005.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-credit-005.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-credit-006.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-credit-006.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-credit-007.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-credit-007.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-credit-008.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-credit-008.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-credit-009.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-credit-009.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-credit-010.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-credit-010.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-credit-011.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-credit-011.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-credits-001.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-credits-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-credits-002.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-credits-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-credits-003.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-credits-003.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-credits-004.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-credits-004.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-credits-005.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-credits-005.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-credits-006.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-credits-006.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-credits-007.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-credits-007.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-001.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-002.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-003.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-003.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-004.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-004.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-005.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-005.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-006.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-006.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-007.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-007.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-008.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-008.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-009.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-009.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-010.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-010.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-011.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-011.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-012.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-012.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-013.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-013.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-014.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-014.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-015.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-015.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-016.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-016.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-017.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-017.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-018.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-018.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-019.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-019.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-020.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-020.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-021.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-021.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-022.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-022.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-023.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-023.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-024.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-024.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-025.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-025.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-026.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-026.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-027.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-027.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-028.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-028.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-029.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-029.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-030.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-030.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-031.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-031.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-description-032.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-description-032.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-001.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-002.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-003.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-003.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-004.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-004.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-005.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-005.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-006.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-006.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-007.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-007.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-008.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-008.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-009.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-009.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-010.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-010.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-011.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-011.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-012.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-012.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-013.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-013.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-014.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-014.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-015.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-015.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-016.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-016.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-017.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-017.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-018.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-018.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-019.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-019.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-020.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-020.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-021.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-021.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-022.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-022.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-023.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-023.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-024.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-024.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-025.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-025.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-026.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-026.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-027.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-027.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-028.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-028.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-029.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-029.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-030.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-030.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-031.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-031.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-032.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-032.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-033.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-033.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-034.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-034.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-035.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-035.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-036.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-036.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-037.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-037.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-038.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-038.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-039.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-039.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-040.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-040.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-041.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-041.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-042.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-042.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-043.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-043.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-044.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-044.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-045.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-045.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-046.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-046.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-047.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-047.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-048.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-048.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-049.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-049.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-extension-050.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-extension-050.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-001.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-002.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-003.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-003.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-004.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-004.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-005.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-005.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-006.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-006.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-007.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-007.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-008.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-008.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-009.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-009.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-010.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-010.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-011.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-011.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-012.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-012.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-013.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-013.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-014.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-014.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-015.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-015.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-016.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-016.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-017.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-017.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-018.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-018.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-019.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-019.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-020.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-020.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-021.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-021.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-022.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-022.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-023.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-023.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-024.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-024.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-025.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-025.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-026.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-026.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-027.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-027.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-028.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-028.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-029.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-029.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-030.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-030.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-031.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-031.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-032.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-032.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-license-033.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-license-033.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-licensee-001.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-licensee-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-licensee-002.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-licensee-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-licensee-003.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-licensee-003.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-licensee-004.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-licensee-004.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-licensee-005.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-licensee-005.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-licensee-006.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-licensee-006.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-licensee-007.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-licensee-007.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-licensee-008.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-licensee-008.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-licensee-009.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-licensee-009.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-licensee-010.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-licensee-010.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-metadata-001.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-metadata-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-metadata-002.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-metadata-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-metadata-003.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-metadata-003.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-metadata-004.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-metadata-004.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-metadata-005.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-metadata-005.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-metadata-006.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-metadata-006.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-001.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-002.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-003.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-003.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-004.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-004.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-005.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-005.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-006.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-006.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-007.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-007.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-008.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-008.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-009.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-009.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-010.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-010.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-011.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-011.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-012.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-012.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-013.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-013.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-014.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-014.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-015.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-015.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-016.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-016.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-017.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-017.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-018.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-018.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-019.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-019.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-020.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-020.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-021.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-021.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-022.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-022.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-023.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-023.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-024.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-024.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-025.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-025.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-026.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-026.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-027.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-027.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-028.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-028.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-029.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-029.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-trademark-030.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-trademark-030.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-uniqueid-001.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-uniqueid-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-uniqueid-002.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-uniqueid-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-uniqueid-003.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-uniqueid-003.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-uniqueid-004.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-uniqueid-004.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-uniqueid-005.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-uniqueid-005.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-uniqueid-006.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-uniqueid-006.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-uniqueid-007.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-uniqueid-007.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-vendor-001.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-vendor-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-vendor-002.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-vendor-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-vendor-003.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-vendor-003.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-vendor-004.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-vendor-004.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-vendor-005.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-vendor-005.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-vendor-006.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-vendor-006.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-vendor-007.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-vendor-007.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-vendor-008.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-vendor-008.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-vendor-009.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-vendor-009.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-vendor-010.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-vendor-010.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-vendor-011.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-vendor-011.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-schema-vendor-012.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-schema-vendor-012.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-well-formed-001.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-well-formed-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-well-formed-002.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-well-formed-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-well-formed-003.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-well-formed-003.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-well-formed-004.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-well-formed-004.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-well-formed-005.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-well-formed-005.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-well-formed-006.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-well-formed-006.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/metadatadisplay-well-formed-007.xht": [
-    [
-     "/css/WOFF2/metadatadisplay-well-formed-007.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/privatedata-noeffect-001.xht": [
-    [
-     "/css/WOFF2/privatedata-noeffect-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/privatedata-noeffect-002.xht": [
-    [
-     "/css/WOFF2/privatedata-noeffect-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/tabledata-bad-origlength-loca-001.xht": [
-    [
-     "/css/WOFF2/tabledata-bad-origlength-loca-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/tabledata-bad-origlength-loca-002.xht": [
-    [
-     "/css/WOFF2/tabledata-bad-origlength-loca-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/tabledata-brotli-001.xht": [
-    [
-     "/css/WOFF2/tabledata-brotli-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/tabledata-decompressed-length-001.xht": [
-    [
-     "/css/WOFF2/tabledata-decompressed-length-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/tabledata-decompressed-length-002.xht": [
-    [
-     "/css/WOFF2/tabledata-decompressed-length-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/tabledata-decompressed-length-003.xht": [
-    [
-     "/css/WOFF2/tabledata-decompressed-length-003.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/tabledata-decompressed-length-004.xht": [
-    [
-     "/css/WOFF2/tabledata-decompressed-length-004.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/tabledata-extraneous-data-001.xht": [
-    [
-     "/css/WOFF2/tabledata-extraneous-data-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/tabledata-glyf-bbox-001.xht": [
-    [
-     "/css/WOFF2/tabledata-glyf-bbox-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/tabledata-glyf-bbox-002.xht": [
-    [
-     "/css/WOFF2/tabledata-glyf-bbox-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/tabledata-glyf-bbox-003.xht": [
-    [
-     "/css/WOFF2/tabledata-glyf-bbox-003.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/tabledata-glyf-origlength-001.xht": [
-    [
-     "/css/WOFF2/tabledata-glyf-origlength-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/tabledata-glyf-origlength-002.xht": [
-    [
-     "/css/WOFF2/tabledata-glyf-origlength-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/tabledata-non-zero-loca-001.xht": [
-    [
-     "/css/WOFF2/tabledata-non-zero-loca-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/tabledata-recontruct-loca-001.xht": [
-    [
-     "/css/WOFF2/tabledata-recontruct-loca-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/tabledata-transform-bad-flag-001.xht": [
-    [
-     "/css/WOFF2/tabledata-transform-bad-flag-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/tabledata-transform-bad-flag-002.xht": [
-    [
-     "/css/WOFF2/tabledata-transform-bad-flag-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/tabledata-transform-hmtx-001.xht": [
-    [
-     "/css/WOFF2/tabledata-transform-hmtx-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/tabledata-transform-hmtx-002.xht": [
-    [
-     "/css/WOFF2/tabledata-transform-hmtx-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/tabledata-transform-hmtx-003.xht": [
-    [
-     "/css/WOFF2/tabledata-transform-hmtx-003.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/tabledata-transform-hmtx-004.xht": [
-    [
-     "/css/WOFF2/tabledata-transform-hmtx-004.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/valid-001.xht": [
-    [
-     "/css/WOFF2/valid-001.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/valid-002.xht": [
-    [
-     "/css/WOFF2/valid-002.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/valid-003.xht": [
-    [
-     "/css/WOFF2/valid-003.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/valid-004.xht": [
-    [
-     "/css/WOFF2/valid-004.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/valid-005.xht": [
-    [
-     "/css/WOFF2/valid-005.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/valid-006.xht": [
-    [
-     "/css/WOFF2/valid-006.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/valid-007.xht": [
-    [
-     "/css/WOFF2/valid-007.xht",
-     {}
-    ]
-   ],
-   "css/WOFF2/valid-008.xht": [
-    [
-     "/css/WOFF2/valid-008.xht",
-     {}
-    ]
-   ],
    "css/css-animations/animation-delay-001.html": [
     [
      "/css/css-animations/animation-delay-001.html",
@@ -99661,6 +97849,3618 @@
      {}
     ]
    ],
+   "css/WOFF2/blocks-extraneous-data-001.xht": [
+    [
+     "/css/WOFF2/blocks-extraneous-data-001.xht",
+     [
+      [
+       "/css/WOFF2/blocks-extraneous-data-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/blocks-extraneous-data-002.xht": [
+    [
+     "/css/WOFF2/blocks-extraneous-data-002.xht",
+     [
+      [
+       "/css/WOFF2/blocks-extraneous-data-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/blocks-extraneous-data-003.xht": [
+    [
+     "/css/WOFF2/blocks-extraneous-data-003.xht",
+     [
+      [
+       "/css/WOFF2/blocks-extraneous-data-003-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/blocks-extraneous-data-004.xht": [
+    [
+     "/css/WOFF2/blocks-extraneous-data-004.xht",
+     [
+      [
+       "/css/WOFF2/blocks-extraneous-data-004-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/blocks-extraneous-data-005.xht": [
+    [
+     "/css/WOFF2/blocks-extraneous-data-005.xht",
+     [
+      [
+       "/css/WOFF2/blocks-extraneous-data-005-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/blocks-extraneous-data-006.xht": [
+    [
+     "/css/WOFF2/blocks-extraneous-data-006.xht",
+     [
+      [
+       "/css/WOFF2/blocks-extraneous-data-006-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/blocks-extraneous-data-007.xht": [
+    [
+     "/css/WOFF2/blocks-extraneous-data-007.xht",
+     [
+      [
+       "/css/WOFF2/blocks-extraneous-data-007-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/blocks-extraneous-data-008.xht": [
+    [
+     "/css/WOFF2/blocks-extraneous-data-008.xht",
+     [
+      [
+       "/css/WOFF2/blocks-extraneous-data-008-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/blocks-overlap-001.xht": [
+    [
+     "/css/WOFF2/blocks-overlap-001.xht",
+     [
+      [
+       "/css/WOFF2/blocks-overlap-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/blocks-overlap-002.xht": [
+    [
+     "/css/WOFF2/blocks-overlap-002.xht",
+     [
+      [
+       "/css/WOFF2/blocks-overlap-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/blocks-overlap-003.xht": [
+    [
+     "/css/WOFF2/blocks-overlap-003.xht",
+     [
+      [
+       "/css/WOFF2/blocks-overlap-003-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/datatypes-alt-255uint16-001.xht": [
+    [
+     "/css/WOFF2/datatypes-alt-255uint16-001.xht",
+     [
+      [
+       "/css/WOFF2/datatypes-alt-255uint16-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/datatypes-invalid-base128-001.xht": [
+    [
+     "/css/WOFF2/datatypes-invalid-base128-001.xht",
+     [
+      [
+       "/css/WOFF2/datatypes-invalid-base128-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/datatypes-invalid-base128-002.xht": [
+    [
+     "/css/WOFF2/datatypes-invalid-base128-002.xht",
+     [
+      [
+       "/css/WOFF2/datatypes-invalid-base128-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/datatypes-invalid-base128-003.xht": [
+    [
+     "/css/WOFF2/datatypes-invalid-base128-003.xht",
+     [
+      [
+       "/css/WOFF2/datatypes-invalid-base128-003-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/directory-mismatched-tables-001.xht": [
+    [
+     "/css/WOFF2/directory-mismatched-tables-001.xht",
+     [
+      [
+       "/css/WOFF2/directory-mismatched-tables-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/header-length-001.xht": [
+    [
+     "/css/WOFF2/header-length-001.xht",
+     [
+      [
+       "/css/WOFF2/header-length-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/header-length-002.xht": [
+    [
+     "/css/WOFF2/header-length-002.xht",
+     [
+      [
+       "/css/WOFF2/header-length-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/header-numTables-001.xht": [
+    [
+     "/css/WOFF2/header-numTables-001.xht",
+     [
+      [
+       "/css/WOFF2/header-numTables-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/header-reserved-001.xht": [
+    [
+     "/css/WOFF2/header-reserved-001.xht",
+     [
+      [
+       "/css/WOFF2/header-reserved-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/header-signature-001.xht": [
+    [
+     "/css/WOFF2/header-signature-001.xht",
+     [
+      [
+       "/css/WOFF2/header-signature-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/header-totalsfntsize-001.xht": [
+    [
+     "/css/WOFF2/header-totalsfntsize-001.xht",
+     [
+      [
+       "/css/WOFF2/header-totalsfntsize-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/header-totalsfntsize-002.xht": [
+    [
+     "/css/WOFF2/header-totalsfntsize-002.xht",
+     [
+      [
+       "/css/WOFF2/header-totalsfntsize-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadata-noeffect-001.xht": [
+    [
+     "/css/WOFF2/metadata-noeffect-001.xht",
+     [
+      [
+       "/css/WOFF2/metadata-noeffect-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadata-noeffect-002.xht": [
+    [
+     "/css/WOFF2/metadata-noeffect-002.xht",
+     [
+      [
+       "/css/WOFF2/metadata-noeffect-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-authoritative-001.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-authoritative-001.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-authoritative-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-compression-001.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-compression-001.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-compression-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-encoding-001.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-encoding-001.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-encoding-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-encoding-002.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-encoding-002.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-encoding-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-encoding-003.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-encoding-003.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-encoding-003-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-encoding-004.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-encoding-004.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-encoding-004-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-encoding-005.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-encoding-005.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-encoding-005-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-encoding-006.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-encoding-006.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-encoding-006-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-metaOrigLength-001.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-metaOrigLength-001.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-metaOrigLength-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-metaOrigLength-002.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-metaOrigLength-002.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-metaOrigLength-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-001.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-001.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-002.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-002.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-003.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-003.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-003-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-004.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-004.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-004-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-005.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-005.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-005-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-006.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-006.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-006-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-007.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-007.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-007-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-008.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-008.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-008-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-009.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-009.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-009-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-010.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-010.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-010-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-011.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-011.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-011-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-012.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-012.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-012-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-013.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-013.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-013-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-014.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-014.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-014-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-015.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-015.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-015-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-016.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-016.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-016-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-017.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-017.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-017-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-018.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-018.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-018-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-019.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-019.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-019-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-020.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-020.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-020-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-021.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-021.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-021-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-022.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-022.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-022-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-023.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-023.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-023-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-024.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-024.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-024-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-025.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-025.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-025-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-026.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-026.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-026-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-027.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-027.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-027-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-028.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-028.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-028-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-029.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-029.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-029-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-copyright-030.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-copyright-030.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-copyright-030-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-credit-001.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-credit-001.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-credit-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-credit-002.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-credit-002.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-credit-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-credit-003.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-credit-003.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-credit-003-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-credit-004.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-credit-004.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-credit-004-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-credit-005.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-credit-005.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-credit-005-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-credit-006.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-credit-006.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-credit-006-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-credit-007.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-credit-007.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-credit-007-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-credit-008.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-credit-008.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-credit-008-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-credit-009.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-credit-009.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-credit-009-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-credit-010.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-credit-010.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-credit-010-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-credit-011.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-credit-011.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-credit-011-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-credits-001.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-credits-001.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-credits-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-credits-002.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-credits-002.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-credits-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-credits-003.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-credits-003.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-credits-003-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-credits-004.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-credits-004.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-credits-004-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-credits-005.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-credits-005.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-credits-005-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-credits-006.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-credits-006.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-credits-006-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-credits-007.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-credits-007.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-credits-007-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-001.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-001.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-002.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-002.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-003.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-003.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-003-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-004.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-004.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-004-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-005.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-005.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-005-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-006.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-006.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-006-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-007.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-007.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-007-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-008.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-008.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-008-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-009.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-009.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-009-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-010.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-010.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-010-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-011.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-011.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-011-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-012.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-012.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-012-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-013.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-013.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-013-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-014.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-014.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-014-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-015.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-015.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-015-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-016.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-016.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-016-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-017.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-017.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-017-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-018.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-018.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-018-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-019.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-019.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-019-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-020.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-020.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-020-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-021.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-021.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-021-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-022.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-022.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-022-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-023.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-023.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-023-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-024.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-024.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-024-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-025.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-025.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-025-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-026.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-026.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-026-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-027.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-027.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-027-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-028.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-028.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-028-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-029.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-029.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-029-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-030.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-030.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-030-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-031.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-031.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-031-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-description-032.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-description-032.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-description-032-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-001.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-001.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-002.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-002.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-003.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-003.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-003-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-004.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-004.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-004-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-005.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-005.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-005-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-006.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-006.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-006-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-007.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-007.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-007-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-008.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-008.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-008-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-009.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-009.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-009-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-010.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-010.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-010-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-011.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-011.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-011-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-012.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-012.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-012-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-013.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-013.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-013-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-014.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-014.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-014-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-015.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-015.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-015-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-016.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-016.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-016-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-017.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-017.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-017-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-018.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-018.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-018-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-019.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-019.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-019-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-020.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-020.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-020-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-021.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-021.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-021-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-022.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-022.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-022-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-023.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-023.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-023-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-024.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-024.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-024-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-025.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-025.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-025-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-026.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-026.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-026-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-027.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-027.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-027-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-028.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-028.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-028-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-029.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-029.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-029-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-030.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-030.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-030-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-031.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-031.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-031-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-032.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-032.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-032-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-033.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-033.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-033-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-034.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-034.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-034-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-035.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-035.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-035-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-036.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-036.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-036-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-037.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-037.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-037-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-038.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-038.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-038-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-039.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-039.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-039-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-040.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-040.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-040-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-041.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-041.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-041-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-042.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-042.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-042-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-043.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-043.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-043-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-044.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-044.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-044-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-045.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-045.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-045-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-046.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-046.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-046-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-047.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-047.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-047-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-048.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-048.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-048-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-049.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-049.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-049-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-extension-050.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-extension-050.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-extension-050-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-001.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-001.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-002.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-002.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-003.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-003.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-003-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-004.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-004.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-004-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-005.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-005.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-005-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-006.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-006.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-006-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-007.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-007.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-007-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-008.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-008.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-008-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-009.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-009.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-009-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-010.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-010.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-010-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-011.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-011.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-011-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-012.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-012.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-012-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-013.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-013.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-013-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-014.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-014.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-014-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-015.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-015.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-015-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-016.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-016.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-016-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-017.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-017.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-017-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-018.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-018.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-018-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-019.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-019.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-019-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-020.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-020.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-020-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-021.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-021.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-021-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-022.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-022.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-022-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-023.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-023.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-023-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-024.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-024.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-024-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-025.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-025.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-025-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-026.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-026.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-026-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-027.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-027.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-027-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-028.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-028.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-028-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-029.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-029.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-029-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-030.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-030.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-030-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-031.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-031.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-031-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-032.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-032.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-032-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-license-033.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-license-033.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-license-033-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-licensee-001.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-licensee-001.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-licensee-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-licensee-002.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-licensee-002.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-licensee-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-licensee-003.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-licensee-003.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-licensee-003-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-licensee-004.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-licensee-004.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-licensee-004-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-licensee-005.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-licensee-005.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-licensee-005-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-licensee-006.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-licensee-006.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-licensee-006-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-licensee-007.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-licensee-007.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-licensee-007-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-licensee-008.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-licensee-008.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-licensee-008-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-licensee-009.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-licensee-009.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-licensee-009-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-licensee-010.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-licensee-010.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-licensee-010-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-metadata-001.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-metadata-001.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-metadata-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-metadata-002.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-metadata-002.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-metadata-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-metadata-003.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-metadata-003.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-metadata-003-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-metadata-004.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-metadata-004.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-metadata-004-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-metadata-005.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-metadata-005.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-metadata-005-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-metadata-006.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-metadata-006.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-metadata-006-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-001.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-001.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-002.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-002.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-003.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-003.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-003-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-004.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-004.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-004-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-005.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-005.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-005-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-006.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-006.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-006-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-007.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-007.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-007-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-008.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-008.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-008-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-009.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-009.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-009-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-010.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-010.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-010-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-011.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-011.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-011-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-012.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-012.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-012-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-013.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-013.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-013-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-014.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-014.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-014-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-015.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-015.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-015-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-016.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-016.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-016-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-017.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-017.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-017-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-018.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-018.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-018-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-019.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-019.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-019-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-020.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-020.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-020-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-021.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-021.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-021-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-022.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-022.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-022-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-023.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-023.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-023-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-024.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-024.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-024-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-025.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-025.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-025-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-026.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-026.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-026-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-027.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-027.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-027-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-028.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-028.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-028-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-029.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-029.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-029-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-trademark-030.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-trademark-030.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-trademark-030-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-uniqueid-001.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-uniqueid-001.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-uniqueid-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-uniqueid-002.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-uniqueid-002.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-uniqueid-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-uniqueid-003.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-uniqueid-003.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-uniqueid-003-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-uniqueid-004.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-uniqueid-004.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-uniqueid-004-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-uniqueid-005.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-uniqueid-005.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-uniqueid-005-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-uniqueid-006.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-uniqueid-006.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-uniqueid-006-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-uniqueid-007.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-uniqueid-007.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-uniqueid-007-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-vendor-001.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-vendor-001.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-vendor-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-vendor-002.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-vendor-002.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-vendor-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-vendor-003.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-vendor-003.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-vendor-003-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-vendor-004.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-vendor-004.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-vendor-004-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-vendor-005.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-vendor-005.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-vendor-005-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-vendor-006.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-vendor-006.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-vendor-006-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-vendor-007.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-vendor-007.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-vendor-007-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-vendor-008.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-vendor-008.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-vendor-008-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-vendor-009.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-vendor-009.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-vendor-009-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-vendor-010.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-vendor-010.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-vendor-010-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-vendor-011.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-vendor-011.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-vendor-011-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-schema-vendor-012.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-schema-vendor-012.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-schema-vendor-012-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-well-formed-001.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-well-formed-001.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-well-formed-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-well-formed-002.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-well-formed-002.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-well-formed-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-well-formed-003.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-well-formed-003.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-well-formed-003-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-well-formed-004.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-well-formed-004.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-well-formed-004-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-well-formed-005.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-well-formed-005.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-well-formed-005-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-well-formed-006.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-well-formed-006.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-well-formed-006-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/metadatadisplay-well-formed-007.xht": [
+    [
+     "/css/WOFF2/metadatadisplay-well-formed-007.xht",
+     [
+      [
+       "/css/WOFF2/metadatadisplay-well-formed-007-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/privatedata-noeffect-001.xht": [
+    [
+     "/css/WOFF2/privatedata-noeffect-001.xht",
+     [
+      [
+       "/css/WOFF2/privatedata-noeffect-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/privatedata-noeffect-002.xht": [
+    [
+     "/css/WOFF2/privatedata-noeffect-002.xht",
+     [
+      [
+       "/css/WOFF2/privatedata-noeffect-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/tabledata-bad-origlength-loca-001.xht": [
+    [
+     "/css/WOFF2/tabledata-bad-origlength-loca-001.xht",
+     [
+      [
+       "/css/WOFF2/tabledata-bad-origlength-loca-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/tabledata-bad-origlength-loca-002.xht": [
+    [
+     "/css/WOFF2/tabledata-bad-origlength-loca-002.xht",
+     [
+      [
+       "/css/WOFF2/tabledata-bad-origlength-loca-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/tabledata-brotli-001.xht": [
+    [
+     "/css/WOFF2/tabledata-brotli-001.xht",
+     [
+      [
+       "/css/WOFF2/tabledata-brotli-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/tabledata-decompressed-length-001.xht": [
+    [
+     "/css/WOFF2/tabledata-decompressed-length-001.xht",
+     [
+      [
+       "/css/WOFF2/tabledata-decompressed-length-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/tabledata-decompressed-length-002.xht": [
+    [
+     "/css/WOFF2/tabledata-decompressed-length-002.xht",
+     [
+      [
+       "/css/WOFF2/tabledata-decompressed-length-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/tabledata-decompressed-length-003.xht": [
+    [
+     "/css/WOFF2/tabledata-decompressed-length-003.xht",
+     [
+      [
+       "/css/WOFF2/tabledata-decompressed-length-003-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/tabledata-decompressed-length-004.xht": [
+    [
+     "/css/WOFF2/tabledata-decompressed-length-004.xht",
+     [
+      [
+       "/css/WOFF2/tabledata-decompressed-length-004-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/tabledata-extraneous-data-001.xht": [
+    [
+     "/css/WOFF2/tabledata-extraneous-data-001.xht",
+     [
+      [
+       "/css/WOFF2/tabledata-extraneous-data-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/tabledata-glyf-bbox-001.xht": [
+    [
+     "/css/WOFF2/tabledata-glyf-bbox-001.xht",
+     [
+      [
+       "/css/WOFF2/tabledata-glyf-bbox-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/tabledata-glyf-bbox-002.xht": [
+    [
+     "/css/WOFF2/tabledata-glyf-bbox-002.xht",
+     [
+      [
+       "/css/WOFF2/tabledata-glyf-bbox-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/tabledata-glyf-bbox-003.xht": [
+    [
+     "/css/WOFF2/tabledata-glyf-bbox-003.xht",
+     [
+      [
+       "/css/WOFF2/tabledata-glyf-bbox-003-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/tabledata-glyf-origlength-001.xht": [
+    [
+     "/css/WOFF2/tabledata-glyf-origlength-001.xht",
+     [
+      [
+       "/css/WOFF2/tabledata-glyf-origlength-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/tabledata-glyf-origlength-002.xht": [
+    [
+     "/css/WOFF2/tabledata-glyf-origlength-002.xht",
+     [
+      [
+       "/css/WOFF2/tabledata-glyf-origlength-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/tabledata-non-zero-loca-001.xht": [
+    [
+     "/css/WOFF2/tabledata-non-zero-loca-001.xht",
+     [
+      [
+       "/css/WOFF2/tabledata-non-zero-loca-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/tabledata-recontruct-loca-001.xht": [
+    [
+     "/css/WOFF2/tabledata-recontruct-loca-001.xht",
+     [
+      [
+       "/css/WOFF2/tabledata-recontruct-loca-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/tabledata-transform-bad-flag-001.xht": [
+    [
+     "/css/WOFF2/tabledata-transform-bad-flag-001.xht",
+     [
+      [
+       "/css/WOFF2/tabledata-transform-bad-flag-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/tabledata-transform-bad-flag-002.xht": [
+    [
+     "/css/WOFF2/tabledata-transform-bad-flag-002.xht",
+     [
+      [
+       "/css/WOFF2/tabledata-transform-bad-flag-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/tabledata-transform-hmtx-001.xht": [
+    [
+     "/css/WOFF2/tabledata-transform-hmtx-001.xht",
+     [
+      [
+       "/css/WOFF2/tabledata-transform-hmtx-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/tabledata-transform-hmtx-002.xht": [
+    [
+     "/css/WOFF2/tabledata-transform-hmtx-002.xht",
+     [
+      [
+       "/css/WOFF2/tabledata-transform-hmtx-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/tabledata-transform-hmtx-003.xht": [
+    [
+     "/css/WOFF2/tabledata-transform-hmtx-003.xht",
+     [
+      [
+       "/css/WOFF2/tabledata-transform-hmtx-003-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/tabledata-transform-hmtx-004.xht": [
+    [
+     "/css/WOFF2/tabledata-transform-hmtx-004.xht",
+     [
+      [
+       "/css/WOFF2/tabledata-transform-hmtx-004-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/valid-001.xht": [
+    [
+     "/css/WOFF2/valid-001.xht",
+     [
+      [
+       "/css/WOFF2/valid-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/valid-002.xht": [
+    [
+     "/css/WOFF2/valid-002.xht",
+     [
+      [
+       "/css/WOFF2/valid-002-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/valid-003.xht": [
+    [
+     "/css/WOFF2/valid-003.xht",
+     [
+      [
+       "/css/WOFF2/valid-003-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/valid-004.xht": [
+    [
+     "/css/WOFF2/valid-004.xht",
+     [
+      [
+       "/css/WOFF2/valid-004-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/valid-005.xht": [
+    [
+     "/css/WOFF2/valid-005.xht",
+     [
+      [
+       "/css/WOFF2/valid-005-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/valid-006.xht": [
+    [
+     "/css/WOFF2/valid-006.xht",
+     [
+      [
+       "/css/WOFF2/valid-006-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/valid-007.xht": [
+    [
+     "/css/WOFF2/valid-007.xht",
+     [
+      [
+       "/css/WOFF2/valid-007-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/WOFF2/valid-008.xht": [
+    [
+     "/css/WOFF2/valid-008.xht",
+     [
+      [
+       "/css/WOFF2/valid-008-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/compositing/background-blending/background-blend-mode-gradient-image.html": [
     [
      "/css/compositing/background-blending/background-blend-mode-gradient-image.html",
@@ -237129,22 +238929,22 @@
      {}
     ]
    ],
-   "css/WOFF2/support/FontsToInstall/SFNT-CFF-Fallback.otf": [
+   "css/WOFF2/support/SFNT-CFF-Fallback.otf": [
     [
      {}
     ]
    ],
-   "css/WOFF2/support/FontsToInstall/SFNT-CFF-Reference.otf": [
+   "css/WOFF2/support/SFNT-CFF-Reference.otf": [
     [
      {}
     ]
    ],
-   "css/WOFF2/support/FontsToInstall/SFNT-TTF-Fallback.ttf": [
+   "css/WOFF2/support/SFNT-TTF-Fallback.ttf": [
     [
      {}
     ]
    ],
-   "css/WOFF2/support/FontsToInstall/SFNT-TTF-Reference.ttf": [
+   "css/WOFF2/support/SFNT-TTF-Reference.ttf": [
     [
      {}
     ]
@@ -238629,6 +240429,11 @@
      {}
     ]
    ],
+   "css/WOFF2/support/test-fonts.css": [
+    [
+     {}
+    ]
+   ],
    "css/WOFF2/support/valid-001.woff2": [
     [
      {}
@@ -241199,6 +243004,11 @@
      {}
     ]
    ],
+   "css/css-filter/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "css/css-filter/filtered-block-is-container-ref.html": [
     [
      {}
@@ -296869,6 +298679,26 @@
      {}
     ]
    ],
+   "service-workers/service-worker/resources/service-worker-interception-dynamic-import-worker.js": [
+    [
+     {}
+    ]
+   ],
+   "service-workers/service-worker/resources/service-worker-interception-network-worker.js": [
+    [
+     {}
+    ]
+   ],
+   "service-workers/service-worker/resources/service-worker-interception-service-worker.js": [
+    [
+     {}
+    ]
+   ],
+   "service-workers/service-worker/resources/service-worker-interception-static-import-worker.js": [
+    [
+     {}
+    ]
+   ],
    "service-workers/service-worker/resources/shared-worker-controlled.js": [
     [
      {}
@@ -308177,6 +310007,12 @@
      {}
     ]
    ],
+   "IndexedDB/bigint_value.htm": [
+    [
+     "/IndexedDB/bigint_value.htm",
+     {}
+    ]
+   ],
    "IndexedDB/bindings-inject-key.html": [
     [
      "/IndexedDB/bindings-inject-key.html",
@@ -325135,6 +326971,12 @@
      {}
     ]
    ],
+   "css/cssom/computed-style-set-property.html": [
+    [
+     "/css/cssom/computed-style-set-property.html",
+     {}
+    ]
+   ],
    "css/cssom/css-style-attr-decl-block.html": [
     [
      "/css/cssom/css-style-attr-decl-block.html",
@@ -367829,6 +369671,12 @@
      {}
     ]
    ],
+   "service-workers/service-worker/dedicated-worker-service-worker-interception.https.html": [
+    [
+     "/service-workers/service-worker/dedicated-worker-service-worker-interception.https.html",
+     {}
+    ]
+   ],
    "service-workers/service-worker/detached-context.https.html": [
     [
      "/service-workers/service-worker/detached-context.https.html",
@@ -396779,6 +398627,12 @@
      {}
     ]
    ],
+   "css/WOFF2/available-001.xht": [
+    [
+     "/css/WOFF2/available-001.xht",
+     {}
+    ]
+   ],
    "css/compositing/Blending_in_a_group_with_filter.html": [
     [
      "/css/compositing/Blending_in_a_group_with_filter.html",
@@ -399939,7 +401793,7 @@
    "support"
   ],
   "./README.md": [
-   "99961df1909cc6fe0a4a7aa50ae9f34bd271d54f",
+   "2ecef188cb7cb27d10b6bf148eddb3f9a031771b",
    "support"
   ],
   "./check_stability.ini": [
@@ -404398,6 +406252,10 @@
    "4cd712bd5fed3581ed770c4dbc4200f3a50c5299",
    "testharness"
   ],
+  "IndexedDB/bigint_value.htm": [
+   "dcfface11b3fbbf7ba21262d687c2a0f4ed99300",
+   "testharness"
+  ],
   "IndexedDB/bindings-inject-key.html": [
    "95f44900d9565baf718be23bafd33e48e6f4fc52",
    "testharness"
@@ -487335,2207 +489193,2207 @@
    "support"
   ],
   "css/WOFF2/available-001.xht": [
-   "e2201c267c06bc1939b376d3292cf6f57320db97",
-   "manual"
+   "0dafe267d3bb4827a9947a9a331d3bb3a180a3f2",
+   "visual"
   ],
   "css/WOFF2/blocks-extraneous-data-001-ref.xht": [
-   "034fba4d321c2ee942c760a1759f4873ee2b58dc",
+   "694d9b85ccc8f483b9e16c1b4e79fde485670e54",
    "support"
   ],
   "css/WOFF2/blocks-extraneous-data-001.xht": [
-   "3ee2169a961da0316958cf330abe7953435de1d3",
-   "manual"
+   "1905ea0fcd0ff5a9c1da3f9cdcc24a290b4e512e",
+   "reftest"
   ],
   "css/WOFF2/blocks-extraneous-data-002-ref.xht": [
-   "07f3b3bbbb289d986544a6a26e4ee824fe7a4d73",
+   "ba24e8644200e4e6e304973118024ec3b9263300",
    "support"
   ],
   "css/WOFF2/blocks-extraneous-data-002.xht": [
-   "bea298b3ce610e66148ea4d511245a168c482ffe",
-   "manual"
+   "b24d64f17c1f26f4bf173770a24eec76ecf797c1",
+   "reftest"
   ],
   "css/WOFF2/blocks-extraneous-data-003-ref.xht": [
-   "562185f2a34a75e7430d47fce52176cd4a539027",
+   "4593be26a53f69ff4301c7ded2b793eed698d580",
    "support"
   ],
   "css/WOFF2/blocks-extraneous-data-003.xht": [
-   "a3255aaa97486755cdd3ffa7a632f2e11c88c001",
-   "manual"
+   "948558cdd3fd5d070fe06b23626461530713c2b7",
+   "reftest"
   ],
   "css/WOFF2/blocks-extraneous-data-004-ref.xht": [
-   "e77d23636ac994c43699ce21d3770a604cf2db83",
+   "681dd1a82daeb4d240c1bd3590b0e16dea637b1a",
    "support"
   ],
   "css/WOFF2/blocks-extraneous-data-004.xht": [
-   "d98b57ac3cba6dd1c16195e9c22213b00785fae2",
-   "manual"
+   "45b545b359c1a93b576de3d81b8485e1e8ed006d",
+   "reftest"
   ],
   "css/WOFF2/blocks-extraneous-data-005-ref.xht": [
-   "1054d998c3310e817c3f9238423950b7135d1a75",
+   "6ff92786444e3e1513bcdc66491b75af42dbea5b",
    "support"
   ],
   "css/WOFF2/blocks-extraneous-data-005.xht": [
-   "090839cd46664465c83deb9aa8ee957e589f1398",
-   "manual"
+   "8036df13b1a9145f9fd7d562051cf5d28a92e5bf",
+   "reftest"
   ],
   "css/WOFF2/blocks-extraneous-data-006-ref.xht": [
-   "c8408f0b418ee4e0c84dc013d03b4a08f3e67f6a",
+   "0a43a1668ce44ad7bcdbc925d9fe6eb1a7a032de",
    "support"
   ],
   "css/WOFF2/blocks-extraneous-data-006.xht": [
-   "265ceb0153283023434c8953a095199a884b99a8",
-   "manual"
+   "8b8a9f50a936fdd1d06f9f8437c75d2a0b074166",
+   "reftest"
   ],
   "css/WOFF2/blocks-extraneous-data-007-ref.xht": [
-   "6129f01b61f48ce1abf4351d114ac457d782b00b",
+   "d49f04fd00a000374e11119ba9d02118e05c244a",
    "support"
   ],
   "css/WOFF2/blocks-extraneous-data-007.xht": [
-   "159793c5221b8b42a1ec0db0ccc3b52363b39711",
-   "manual"
+   "88e98afc0e7befac5ec2bd583e73772dc645aa8a",
+   "reftest"
   ],
   "css/WOFF2/blocks-extraneous-data-008-ref.xht": [
-   "9a00cdbcbb70a5deec3fc2832f36b8f840300d1f",
+   "3fab0eb9ca3a400c055c714ad3bf4e826aa1daa3",
    "support"
   ],
   "css/WOFF2/blocks-extraneous-data-008.xht": [
-   "5878c83e56ebb2ac7ce5364c58a0ce76b91d6ed0",
-   "manual"
+   "5ebda8397209e6f5d2712681d6e2309b060b5b12",
+   "reftest"
   ],
   "css/WOFF2/blocks-overlap-001-ref.xht": [
-   "3715b97758767d3ebe021fc95a7cde36457297d6",
+   "2fb4b3bc049eb5c7c7e2648be55531227b9217df",
    "support"
   ],
   "css/WOFF2/blocks-overlap-001.xht": [
-   "5b8827e2c75ba612d6bdf4b5a4c07f431a7a1b43",
-   "manual"
+   "5afe6ea1ad450084366f1c248017bb94b58cded4",
+   "reftest"
   ],
   "css/WOFF2/blocks-overlap-002-ref.xht": [
-   "0a6fca901a1749ac28c50620c1eb080abff337c1",
+   "046dff84ebe406c9c4cbfb2f2f9d82eb11f338a8",
    "support"
   ],
   "css/WOFF2/blocks-overlap-002.xht": [
-   "63b3a113d29233ed46d7453ed9875887f121e061",
-   "manual"
+   "81cecc955f5ff2bd85cac2227f3e3a2b3854204b",
+   "reftest"
   ],
   "css/WOFF2/blocks-overlap-003-ref.xht": [
-   "93f6309b687447e0322f3e22c7b56df463a5605a",
+   "40061818a9ffc4d4634bbc28b62bf3a6ef08a825",
    "support"
   ],
   "css/WOFF2/blocks-overlap-003.xht": [
-   "e5e425714a9241af69d8e646daf623a00e0f693a",
-   "manual"
+   "b631defc6144b383c0fe85b5d4fdf82d852b4338",
+   "reftest"
   ],
   "css/WOFF2/datatypes-alt-255uint16-001-ref.xht": [
-   "a923faf5c2bba646f710790c1073adc018a17e5b",
+   "de9f30476d7afcec36ecae0738523b3c723b0f8f",
    "support"
   ],
   "css/WOFF2/datatypes-alt-255uint16-001.xht": [
-   "db937478c2122b18f48003801dfec595f4ced174",
-   "manual"
+   "439207ecc5c904344357e8a5829881a6946ca6de",
+   "reftest"
   ],
   "css/WOFF2/datatypes-invalid-base128-001-ref.xht": [
-   "9529c27e1659ce2ee4639e94a7533228c9894eb6",
+   "654035586af960079fd9a574537a2e0efa6691e2",
    "support"
   ],
   "css/WOFF2/datatypes-invalid-base128-001.xht": [
-   "7ebe9caead1f4b2c90913d41f4a3a08802dcc178",
-   "manual"
+   "a2f26c6c67974ced3d94561f86c6ee18549df051",
+   "reftest"
   ],
   "css/WOFF2/datatypes-invalid-base128-002-ref.xht": [
-   "30769a289a39f5d6923e81765451c2049721e271",
+   "01446c56e41f42f3f3e217668c6a93d761c494fe",
    "support"
   ],
   "css/WOFF2/datatypes-invalid-base128-002.xht": [
-   "980db99eca9fafd7821ce5fbbb67e07c725614f0",
-   "manual"
+   "eabcdd1589f858db88debad4ad6c09b1d58ade76",
+   "reftest"
   ],
   "css/WOFF2/datatypes-invalid-base128-003-ref.xht": [
-   "f9272cba4b53e6b3b6dab1779b42f3e53923879f",
+   "a138196350291fbc2eb728a80ae26899de7e55d5",
    "support"
   ],
   "css/WOFF2/datatypes-invalid-base128-003.xht": [
-   "2e4d566ab8fa96c67510f01c4075f42fd63dedd6",
-   "manual"
+   "5d7134479531d0b98d2352b82b6f6fcfd979a3d5",
+   "reftest"
   ],
   "css/WOFF2/directory-mismatched-tables-001-ref.xht": [
-   "9873b26ebb2e95344d0732f1402f83adb66800e6",
+   "5e4aa8029a33e5e276a454b2741458e5a8b5040d",
    "support"
   ],
   "css/WOFF2/directory-mismatched-tables-001.xht": [
-   "6c87e47b045d2c7d450f61a6eeaf9aab9afdcf3c",
-   "manual"
+   "b60dc3fee29259837f97d5ca46256212929f4e6e",
+   "reftest"
   ],
   "css/WOFF2/header-length-001-ref.xht": [
-   "faacf9b4443393468313efebcd214c2712373194",
+   "2dfe1a51d47650a43f516edf1afb28dab2b7fd76",
    "support"
   ],
   "css/WOFF2/header-length-001.xht": [
-   "54ad9033a58839ecfceefcef82f26939d7802fbc",
-   "manual"
+   "753de19bbdfd6a23e33223e2e3e070303dabf47a",
+   "reftest"
   ],
   "css/WOFF2/header-length-002-ref.xht": [
-   "1684f53be8768850b97ef8ec50dcea5423e70a74",
+   "bda58d2dd3e0931329b9fc4cf3a3fdbac558211e",
    "support"
   ],
   "css/WOFF2/header-length-002.xht": [
-   "30f30496aefbcd3118e2971d2e57be8751633cbf",
-   "manual"
+   "50c776a7e453347de1a34b95f031d03d62373dd9",
+   "reftest"
   ],
   "css/WOFF2/header-numTables-001-ref.xht": [
-   "0b24dda2b62534bcaa2e7c697e199eb2e0100d79",
+   "85313139bf27cdb059c0c61b98c43723ff538fe9",
    "support"
   ],
   "css/WOFF2/header-numTables-001.xht": [
-   "8409cb2aa2b0cff4736f091c0297d902c44c0656",
-   "manual"
+   "00f324f4c8b51193007a4ffeb71106be65c568f6",
+   "reftest"
   ],
   "css/WOFF2/header-reserved-001-ref.xht": [
-   "41ca5d1fcbb0b9a9b21720900cb94f7cb1722dfa",
+   "af3bea4c623564ac8120c14aed6afea324bf0ee4",
    "support"
   ],
   "css/WOFF2/header-reserved-001.xht": [
-   "952e0d34bb4c09d870042261f59a8948f6928839",
-   "manual"
+   "b0d24476a933620cd9db9a6f7d05723da3cbe0d7",
+   "reftest"
   ],
   "css/WOFF2/header-signature-001-ref.xht": [
-   "88e5718847ad8e2341ad05c05aeff89815173c82",
+   "3200604ee264228f181bb2ffff69c5c14354b562",
    "support"
   ],
   "css/WOFF2/header-signature-001.xht": [
-   "e3f4d3f233ec9076df3498abc5181db17e7bbfed",
-   "manual"
+   "012c6e90293c7313427d933c987d7432b9d0fc54",
+   "reftest"
   ],
   "css/WOFF2/header-totalsfntsize-001-ref.xht": [
-   "459733507d919310541d0eb4305b347547248152",
+   "e6a3eeef96e441111e357deace7a021db016a819",
    "support"
   ],
   "css/WOFF2/header-totalsfntsize-001.xht": [
-   "4ba972563f576793bc202283676c836dc27b20e0",
-   "manual"
+   "74fde73ffa6e06f8f062b4f89e7170c9f03a4885",
+   "reftest"
   ],
   "css/WOFF2/header-totalsfntsize-002-ref.xht": [
-   "4bec7dcca6391847397e4894172c1eb7d4e1d97f",
+   "152afe2e580412d7f97781369242903149019c64",
    "support"
   ],
   "css/WOFF2/header-totalsfntsize-002.xht": [
-   "5a8f193d9ab3d7944fc3d18e0704c0dadb040f71",
-   "manual"
+   "c9f5437c1d9ddc7e1a34bbb318eaf7df3757cbfd",
+   "reftest"
   ],
   "css/WOFF2/metadata-noeffect-001-ref.xht": [
-   "e336115cbab9c5a1f2e0c0bafc60e6128469642a",
+   "adfad113b7c65710a0a17cae166e80945c7a858b",
    "support"
   ],
   "css/WOFF2/metadata-noeffect-001.xht": [
-   "961cf0992cf875ce061b8e9aa4add74616cc7743",
-   "manual"
+   "fa80f9410a3b2907aa6744ba2cd4fe776fae0969",
+   "reftest"
   ],
   "css/WOFF2/metadata-noeffect-002-ref.xht": [
-   "e5b43e8424479cd6eea2f78ef6a3522e6cc0b3c8",
+   "1742908643a16ff911d73b56f38e671a18cf6c18",
    "support"
   ],
   "css/WOFF2/metadata-noeffect-002.xht": [
-   "9b1f7a6430938161f24b224223c87f93db772ff0",
-   "manual"
+   "bc2080ce5fd122350d4eae8406161e13f9ebc214",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-authoritative-001-ref.xht": [
-   "105be9daad84f4c241dae41c0ef2bb4cc35cc571",
+   "507bdfd5d57e29658440355013896dfe7a5ce216",
    "support"
   ],
   "css/WOFF2/metadatadisplay-authoritative-001.xht": [
-   "cd217942ce543926987aadca5b3a56f3acb8e9ed",
-   "manual"
+   "7299d9aa2c5fb542d360f5dac242a969e104828d",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-compression-001-ref.xht": [
-   "78237f2077f1c20ecb16302d26eefa708cb499c4",
+   "25d0f9cca6bbcc55a47941f4231f208af3f4eb3e",
    "support"
   ],
   "css/WOFF2/metadatadisplay-compression-001.xht": [
-   "c5bd1fc70d46ac169787ae8e4027c06fd9281d3a",
-   "manual"
+   "15895a97269a3cb5498fa837a5d858033e33dc14",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-encoding-001-ref.xht": [
-   "e46fd2a4e08f60a63372bb68fb1044deb11882ba",
+   "c28fef565dd73042cf37c5336ad9f866846a4c20",
    "support"
   ],
   "css/WOFF2/metadatadisplay-encoding-001.xht": [
-   "2f1b76171e18d46ed8bfb978f1a92ece9bd92bc2",
-   "manual"
+   "5f1b99641709e7cc4966b6260cbea502646cf2d6",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-encoding-002-ref.xht": [
-   "8ce76f9e4efdb4a42a05f4ee9783ba860eacea32",
+   "2e648b8fa46ff0a7d33200357c7e79f8a86d95bb",
    "support"
   ],
   "css/WOFF2/metadatadisplay-encoding-002.xht": [
-   "1e8fa4e321518296bfe494d92041aec9de2bf466",
-   "manual"
+   "622226b066a1b62bd6d104e037abd8c51c210085",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-encoding-003-ref.xht": [
-   "bf2c1df737481855ee336f005a78bd21ac02c3b9",
+   "bc58894a36989be09ffa827762ae6bd35c4ab8d2",
    "support"
   ],
   "css/WOFF2/metadatadisplay-encoding-003.xht": [
-   "b446996dbd638da14e859a0320a112861bd25489",
-   "manual"
+   "845b843503ef9bcaf21d65a2bab5e0db079c5d50",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-encoding-004-ref.xht": [
-   "0bce9bedae118a8db567cb8c2e3e3ad0efcfaf15",
+   "b1f2c3ebbada4e48fb1dafe9526015c892cd642c",
    "support"
   ],
   "css/WOFF2/metadatadisplay-encoding-004.xht": [
-   "635e60cd46655d9e6a8fb33358133d2d6e4fb402",
-   "manual"
+   "81e13ad4a048755ead23ddc774276c7a5043a094",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-encoding-005-ref.xht": [
-   "3c4d35b00bbddc31ce3832bfbf21b0760ec9144a",
+   "281067e20da0d8164e3943f18e695c084a967e3b",
    "support"
   ],
   "css/WOFF2/metadatadisplay-encoding-005.xht": [
-   "ba40fe7f6e00f5df3d99c8b222ec551dccf8a7dc",
-   "manual"
+   "294aa12fe8a827813802a31996e2879917133069",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-encoding-006-ref.xht": [
-   "ec74bcd3c1201bcdb06d333a8250574cef056ef2",
+   "2671882372fa1408c933e180cbba89c15cd2f57e",
    "support"
   ],
   "css/WOFF2/metadatadisplay-encoding-006.xht": [
-   "d3bfec6441e894820800830c2355acb7970bf5e4",
-   "manual"
+   "a8bf08333020d25b32cfa6bdab5c3172b3940594",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-metaOrigLength-001-ref.xht": [
-   "08110e47bbec2b4dbaf2d30a23458023faad16f1",
+   "c1c08bc7e057291f5fe07890501dc95d9feb18bd",
    "support"
   ],
   "css/WOFF2/metadatadisplay-metaOrigLength-001.xht": [
-   "abf03ac2fe0ab98aa3e64b53aefcf13415acbec0",
-   "manual"
+   "8d79cf6d4e747d23b918ff42b78ac956b0666d0a",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-metaOrigLength-002-ref.xht": [
-   "e96f3ecc1ef45ad408b4d087e4cdbeb0d0149312",
+   "7a04ca1888421a78d6251eaac3437e1cfb589b7e",
    "support"
   ],
   "css/WOFF2/metadatadisplay-metaOrigLength-002.xht": [
-   "c2e46d26c05ef6d9db0ef4a75e2df9232026eaec",
-   "manual"
+   "1851e02b2efd0a52e067123a8fc073521beaaaa4",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-001-ref.xht": [
-   "cd45897988f02e5228e8ea963c80ce98ee7fc547",
+   "9e1aaf9ca7809855fa6e24024d5a10715599a42e",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-001.xht": [
-   "fa6a991d9c3482784df88e7f2096b21224f5b7ed",
-   "manual"
+   "7bb9943ae7f501a30eae84ee02f4b88525ef6b18",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-002-ref.xht": [
-   "d91e8b5bedc2284ddecf04164c727c7f5f773311",
+   "2b08bae4f14e61ccb65ad30f2ff20973d6030a3d",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-002.xht": [
-   "911ca3f81bb42306dddd4bceeebcbc5b0d083be7",
-   "manual"
+   "2d7a0929bee4e5586359986ba546bfb9881e9af5",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-003-ref.xht": [
-   "7988be873ad330f116f233b878027609f271455c",
+   "a2118acef10191d714b9430001acab03385cb75a",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-003.xht": [
-   "3672b6e8881691f2407b66e353570cac1cbd8229",
-   "manual"
+   "1d78a9f217e6be618880d5a3142b4ead0407d040",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-004-ref.xht": [
-   "77a00edfd83234f47836d7c8b1c59e59f7e65fd8",
+   "cf5a7d0696298e43dc75d2af6eea272b242ebcbe",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-004.xht": [
-   "8f1e96fc872be1a1f27dfb6a24eed4c17418ca50",
-   "manual"
+   "d49a5d31b85684ed3b1f7148e91c7b0e5cb9f755",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-005-ref.xht": [
-   "501d5d4bfe27aafbf5c1b8e0b020ac16c88b8865",
+   "94488675c0b559b9b41aa71fd3f6501a123c8ae2",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-005.xht": [
-   "76b082efca577bba1a4e013da03645b8fe2f70a0",
-   "manual"
+   "fc041ffbe296cd19fc02f2326493ded228b01eee",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-006-ref.xht": [
-   "f89acab25645a6a9ceb843879e16f3572f63bcc2",
+   "b471bcff9bcf1ccb603a171755024013eaead74b",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-006.xht": [
-   "514a66db180d401ab112ac8f33eb39acbe6fd3dd",
-   "manual"
+   "aee87fa2d5311d2bc48110bcc57bc77cf9ca7e44",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-007-ref.xht": [
-   "ce859fee79ab40fdffb172d79e11152a75c2b10c",
+   "b1f11bfb43b60df90a8c8df7d25e071f856c4118",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-007.xht": [
-   "b9ae1bae7b2c19bfa5ce3e9f660a5991365b0a1c",
-   "manual"
+   "fbe934b7c6e3e4d6abd20daa0a3341d2e323e06c",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-008-ref.xht": [
-   "18b0156a900a7fd93898fb587a7637c4340603c6",
+   "03b7b6cf1b5e0f5d9eb3a557e39b12538b81fd32",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-008.xht": [
-   "51d48ca24e1b146be66dfa42c1e42aa008527d39",
-   "manual"
+   "daedc83f9ec226e7ba31cc2cdaf409bc8ceed2d6",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-009-ref.xht": [
-   "8332db10350ca68d8a11aa8e11177e64b0cc96a1",
+   "ae7ea9068a7de49b67dd2e6effd55eeddaa8ae9d",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-009.xht": [
-   "097e7ba2c564bab3ff7d92dd0cf56d73a6a8c94a",
-   "manual"
+   "d68603b3a2c29cd7558103d64907e503356e1e06",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-010-ref.xht": [
-   "1b98a7651ee3b2c66fd34b049a19f6e27d6d314f",
+   "850e9f660d4d0646c18936e3da3f6c1f8a5f0672",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-010.xht": [
-   "d021044f94a74ae2ffcf1a5f95e473cb4e223d80",
-   "manual"
+   "fabbd7f3d7e505353d9d69528c7240b4af35ef6e",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-011-ref.xht": [
-   "f5950041b08750749625bba48f0fb96912b1318b",
+   "da94c634314f7890ceb07ce88682f86b9635985e",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-011.xht": [
-   "b3d8ac90c9b545c457f99004056b832fecffb8b4",
-   "manual"
+   "0a67b572a53930466deb9082fa265b3989035e70",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-012-ref.xht": [
-   "f735b037554367e882d1a28342eb7db151526152",
+   "ff7cdb007e319d6a216112143029cc127e5f09b6",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-012.xht": [
-   "3a2df767f7c52e93381bdb3e472fb56fcfed82b0",
-   "manual"
+   "460e507ad3dc91bdcba22efb70773eb9137be006",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-013-ref.xht": [
-   "a4baa2e35419835f749854d271d4ebd8334e5374",
+   "0d39d939dfb0cd109d2ce02712cec70a329d9aaf",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-013.xht": [
-   "ac95737e6465dadd3a9d8c63c2f5b0b832ec0b39",
-   "manual"
+   "a67506e3b6ab131006b96ce88687f90aa342198f",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-014-ref.xht": [
-   "2bd7ccb939b3b8cf493cd73177c11e6d0f65af61",
+   "00c725d5bb5a7a3e0f34239f14d3156ce410f43e",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-014.xht": [
-   "9831674d81fb3a56785f45b59ed28af65c0dfb18",
-   "manual"
+   "a2c0456f05d171a9ac91de43e276db3fd69c10d7",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-015-ref.xht": [
-   "32e225e0cba466566c3f41be113bf97b0d22f25d",
+   "31a8f2752ad6031b7d6eecd97fae82bc35cb0bec",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-015.xht": [
-   "162851774d54b2c8984dd08ea9db265ed63b3889",
-   "manual"
+   "8a8d0cee69d84ce443b461fde5c3744087a733d1",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-016-ref.xht": [
-   "20c03f2c507beec1e1ed739c2386ee9b51c69bc1",
+   "be3683aa5792a0a75617dec5ab52ca2b39c69b0f",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-016.xht": [
-   "a802bebcd3ad9dc18741f19e26437140381cbc9b",
-   "manual"
+   "df14d8d4fc0ebbddea43b26bee679b36d18e610b",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-017-ref.xht": [
-   "aca53231b3732bbe0c7c130e7afd5e507d71951c",
+   "f9f755332dedcff5a822585c39d80efeb1f6b6dd",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-017.xht": [
-   "a3f91fe2ec8fe81097464b1ffb31382b14a785f4",
-   "manual"
+   "47ee5b0bf2c33cf52a90ad08d1f824c6ae19e3c3",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-018-ref.xht": [
-   "6d760fb305c91002c98621393f2b3bbd91a95581",
+   "8b6592c9aa450d0f6a4e307d728cb33ad7edffa7",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-018.xht": [
-   "45fc8e037a55ae1e27735f034a4ae8d2b769e2e8",
-   "manual"
+   "702890aebf20ef3b0c4bd29b37084018e9d1fa57",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-019-ref.xht": [
-   "3113c29376eed3ebb961f4f04a872f9ca0fb74d5",
+   "1a789770e2b30645f9550e9833f3757df5e29a2f",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-019.xht": [
-   "c1d20dd0ef7aaf1bd1f2ab322b4257ec1402f34a",
-   "manual"
+   "7408e006371a7cb179ca21f6368d949731b130e5",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-020-ref.xht": [
-   "84354ffc6c3455a0416450e56dc07cc81ac05730",
+   "0f0c5f06049a4c57add6ce8b63c1ee24f87f704e",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-020.xht": [
-   "1cb844b8383b11fdd096263a75a2b06ba57d5439",
-   "manual"
+   "142cae0f80ab051e26d877e56156592717ed8358",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-021-ref.xht": [
-   "eee4b472323d71f33fb8e23dc92a0484656d0c7c",
+   "c5832528272fc0675765d0838cd348a5f3e087c2",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-021.xht": [
-   "42b31a85e4d3699ebb0c99076e3816d835bccc13",
-   "manual"
+   "e7f34c9635c0c3d20b16013399023827f7ef15f4",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-022-ref.xht": [
-   "1f8be7b750e4485bb8b5c45edfe4d428f15c539e",
+   "e30f3f1671492bc4581cfa6dc9e9136a58857c6b",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-022.xht": [
-   "2bc8d6018f9991ee65f2a15273037a410986d7c1",
-   "manual"
+   "9ef773722d7717fe5ed461189c6caba7919da5b2",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-023-ref.xht": [
-   "daf1a053c5329445d60a5f42152b3747e37e02b9",
+   "9269e7978dd914ca792e985088eef51b72b7bec6",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-023.xht": [
-   "c1e5045545ef7015298f361917b893b5c0d4a566",
-   "manual"
+   "08ee914d670069bb2c97eb0737042a1c4248ab72",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-024-ref.xht": [
-   "7f8871bd97be70d8e0aff5e1abb59d44d4dae0ef",
+   "d43cae93d69117a5d7b3a09ed4526cb93a9b71c4",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-024.xht": [
-   "3cd11f97c85b5cb6d2fe5902e129ed15f2d3f357",
-   "manual"
+   "ed396be3c8db439d1ad0d56f9625f457715a77ad",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-025-ref.xht": [
-   "716723e18efe97e19ca6eb7be68b659d776c7e09",
+   "0b0c2f2692e027adc48a7f8d3aa87ee7e68d1661",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-025.xht": [
-   "5ef17cca2e09d5510c5eeced0ada993676a47565",
-   "manual"
+   "be06f07c0044b0d945ec54c0859401b3a567fc95",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-026-ref.xht": [
-   "9000ef199adf9efbaad887d2b2986c95650a3d18",
+   "657b2863c335beac6d62921090bfc7b80db52887",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-026.xht": [
-   "f39586a20d15ca9386ec4cd9e47dee52ec742f52",
-   "manual"
+   "4b36196ea60a099e92ffc2a03a982fb0d0521ca6",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-027-ref.xht": [
-   "e46ea31b08a2c823e1af3bcf8f66ffbc6fe58d53",
+   "a0d9386051b9cff01ec65b8140016d3866945eaf",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-027.xht": [
-   "7694d215c69a11830ae9c02f96db93fb7009f592",
-   "manual"
+   "2fd0f96097f8045c488f9b79e6b38cea609fff9d",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-028-ref.xht": [
-   "942061536779ed0da4cdd7423186a043a3952b24",
+   "b443d50136dd8936a9b23784244bf2c4e44158da",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-028.xht": [
-   "27998e81a9e2185db242f25357d21c9c2840799b",
-   "manual"
+   "6409035f4def863c5f85a418b02eececa4794f6a",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-029-ref.xht": [
-   "ffd323f61041a7290f0249ac5239c1e6617b2f25",
+   "c9edff51e1684aa276e527bd2c817f51fc3b9613",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-029.xht": [
-   "731879fcecfb6ed7252e0aacd0a407bfa0523bbe",
-   "manual"
+   "d1920ee31e20a968281a21499602cd7f40b4cce6",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-030-ref.xht": [
-   "344e4b7547c0a4fbc4d7a97db2780bdd17cb1d09",
+   "74d63aff90a96ef1c4044d65a06793cd5d37e6e7",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-copyright-030.xht": [
-   "e12cb81047e4214983b73fcb1897cfcf18baa882",
-   "manual"
+   "c7a3c034737183633a62cc7281195ae9f3c9bc7d",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-credit-001-ref.xht": [
-   "1982554c6b060358b371d31fc3b2343dea62812d",
+   "0c102cb63e4ab3e4da7c2cc15f48b19a6aa27f9d",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-credit-001.xht": [
-   "e04c8e87c7faf526136d3533803f3b6cb0946943",
-   "manual"
+   "65dc9b68752171ba36696bac9dec18d5ddbd6651",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-credit-002-ref.xht": [
-   "6ece930d653a359ea230a2d0016d1248330638d1",
+   "d494b321257162d206c3fd4664761a1b9f76de27",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-credit-002.xht": [
-   "dfedd50cf9d1314b9cd7840b86c66f29fa2dcd07",
-   "manual"
+   "f5550f3bffb64e1a2eb15627905430d15acabd1f",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-credit-003-ref.xht": [
-   "527d33fb6c054b3e06c4fadd3ee7b85e52c564e9",
+   "4c478e56158ef653679f839de642a594c0f8682e",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-credit-003.xht": [
-   "f77a55283acdb4f6a7c48e3c9acf8ab3ec1a3ec0",
-   "manual"
+   "43c9047a8e318a0024da00f83bf92216034a4bb3",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-credit-004-ref.xht": [
-   "b95cbe0fa147bbf135d747a02eb2b6aa800d8517",
+   "ecb2e5b6b86d21ec5c2eaa503f5af30d51eec952",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-credit-004.xht": [
-   "8aed7bba0c4358dccd90ebf4fad747b74860d9d4",
-   "manual"
+   "f87061717b762a86719dd64cda0b804da4310b69",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-credit-005-ref.xht": [
-   "3941e584b8463e303f05d6adf9acfa891283c4a8",
+   "4406f9728e36682ca88565992d5f6a8b7e6a8d8a",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-credit-005.xht": [
-   "844d8b8bdd0c77fafe27b0d82c296dea30eed6b9",
-   "manual"
+   "b3608443a062435d78fbcf77899832851e28bd0e",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-credit-006-ref.xht": [
-   "f34a4038ddb499f8b45fa0089718b2f20a419e72",
+   "6e205adfe8ec95eba00b1bfb1cbefd90dc2de544",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-credit-006.xht": [
-   "28d21c0ae89ca8818e12d913567bc021a29dace7",
-   "manual"
+   "7821b8ef4cd0f6bd3f0a881e884898c3ad1ea70a",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-credit-007-ref.xht": [
-   "508ba1f1a26ff1707a3f1327d059f865a593dde8",
+   "4d6b2cea5e0eb823f5e770f57dcf647e9366baea",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-credit-007.xht": [
-   "83711afa6a67e4e4193680c8a121ec52e95c5e1b",
-   "manual"
+   "832db89bf2954175663aeb1b7ebaa2e8315c75c6",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-credit-008-ref.xht": [
-   "1a0c1f1f90eabc521367149beea1027cea078357",
+   "9e8aefb6f70aff1af8fdaabca2987025ea4c0b49",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-credit-008.xht": [
-   "976bfa415363a697f52982eefc4d8f31f81f4f6a",
-   "manual"
+   "8374b76dda9b9c056418c15f578a20abe5312d06",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-credit-009-ref.xht": [
-   "4f68723bba0c25e5ea3abe2d0abdd21193738881",
+   "33eabe523c58db982c23ace2e77f3ec5ccf67334",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-credit-009.xht": [
-   "ac219be2ca9141787a28450aed73d6474d6e7933",
-   "manual"
+   "baf9439b13af26182e54acdd50e68f8890c561ad",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-credit-010-ref.xht": [
-   "52ef6d984b17c317350c7aada9d93243ec1f6fb1",
+   "6526e1fdc1f187bf623e391985f3ff5b694fb725",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-credit-010.xht": [
-   "a37e70cea313dc5ebc34cfd60e5401369c520a40",
-   "manual"
+   "dd3e8ef0912cd1e20cd8f4ee90b7b2254d7c8baa",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-credit-011-ref.xht": [
-   "b361ac230de6fcea1cdb7964b1a6cfe9b2af5bcd",
+   "0d2d6f435f58df2205d3c356a1beb3e7d83e6de1",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-credit-011.xht": [
-   "e1ea508bf48205cd4a1ba85d00f1a9a689ce3411",
-   "manual"
+   "9d557409358685e725cb9c7fee4f4ef1331425f6",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-credits-001-ref.xht": [
-   "1828976a58cea1448ffb86342fdcaa394d90f9d9",
+   "258e07208c2c74809b4af460d1a7aafc57007820",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-credits-001.xht": [
-   "a92aba497bc1ca9c74cbb6f79fae07a4c6d86cdb",
-   "manual"
+   "15d8b4d09072f2c33f2f84f2ec166e59e1aced6b",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-credits-002-ref.xht": [
-   "999e1e7ca54e85fe86faa68aec5dbaeb6836bdf3",
+   "af148fa4e785ef524d0ffecd92879ef651464405",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-credits-002.xht": [
-   "1866f01ea813d274c993159703557154b78088ef",
-   "manual"
+   "26b00f0fa642cd2b8d50e0331a3d04e121d73db1",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-credits-003-ref.xht": [
-   "7a3300267c03ed4861d9131566ebfccd1aafe610",
+   "3ed990c765c886263ff4c88d582dee3944cab1ce",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-credits-003.xht": [
-   "1bbdee57b44031c2d942057489d8a3c58b7cc28c",
-   "manual"
+   "a51cd0b70d9365fa5a81c7baa533ade53e74e24f",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-credits-004-ref.xht": [
-   "cf18cba292c36e651acff1450b0cdad618a413dd",
+   "218d52d5a0470218182cfefd6dbeda5a8c3c31ce",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-credits-004.xht": [
-   "e6f175e941bb8981eda585fa9f02792a4f368555",
-   "manual"
+   "913db2bda45fa15d6dec2e343f0d272238319338",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-credits-005-ref.xht": [
-   "453882ab7be6888b6c4884ca90cd1a2823af9022",
+   "60b295c640b1aade13b45fcf0d765f9326149b60",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-credits-005.xht": [
-   "e707b88aeeef3c34a17393cb29706d1821776049",
-   "manual"
+   "783f1e56a230c13e9c297185d20279adc499d76e",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-credits-006-ref.xht": [
-   "1af56e2a26db9bc9c6ed2a1131bc310e5168ddbb",
+   "58ea2ef4f8485baa2e62a630e6a911e3ed62d7f4",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-credits-006.xht": [
-   "64c2be5210b63661802ef9305ad75f3323def176",
-   "manual"
+   "af2218b47bc24f8cc6a3f4aeb6bd121c221e4628",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-credits-007-ref.xht": [
-   "872cb2f43a0e26c8d8008762c55487dac9bd7475",
+   "95287be39fc2a330dc4583f32706e292e3216c2a",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-credits-007.xht": [
-   "5664833d0fcaf351154f2bc1c6ad6ced84096dac",
-   "manual"
+   "49979fb9f03978be8b4b9030d146da62635a1ea0",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-001-ref.xht": [
-   "e9bfcd09a5e7211d1fda2b7591db487de283c931",
+   "7f096cbcddde20217737cce05a0645259ed83437",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-001.xht": [
-   "73b3913a5137985a2e1e251d43fe4ac141a9cb24",
-   "manual"
+   "12dcdc0e49ea3e11bac316f3519c961a1067c0c8",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-002-ref.xht": [
-   "fb69114ac0b754f14f8871da9ea8eadbd70a4d9d",
+   "318b3c4866fce913c6607f5848a1588e4136a171",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-002.xht": [
-   "8617aa8a760a45bd9d3ea87066aa0fe2c21cbe32",
-   "manual"
+   "0d82bd0441e0e6c0993faad9c9c15abaf4b243e9",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-003-ref.xht": [
-   "24d3fd760ec527e15da530b5ccaa6de976545ba4",
+   "605e30fedf09de88575c61b579284d78630e2a8b",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-003.xht": [
-   "7d8c0a872dbcafe147c250b201b4580c225f64eb",
-   "manual"
+   "75ca4847b69077834b38d8aa5b12132000797481",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-004-ref.xht": [
-   "10aadaa2a867f2b29840b30c19c7fe747c9b795b",
+   "26f49ac9d4ba9c9a6b8cbd20843b6847b5b21ca0",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-004.xht": [
-   "3f398ea72cc9f539d63192b249cf08619d4a6b30",
-   "manual"
+   "e093c8f7c401a3e4d234d2690ebc4c34c64d6222",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-005-ref.xht": [
-   "b13cb85adc5736fdb8de20155a770efcaf9680fe",
+   "3d62eefacd09f860c93dacc9e6c796cdbd0ce1f5",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-005.xht": [
-   "ce56cf9781628e58388ceb184cc824ff07e774f9",
-   "manual"
+   "7df096846fdec619f2951ac02675e5a52ed3ea6f",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-006-ref.xht": [
-   "9adbd8e64dcb83d754604cbea2b0a6312d45e538",
+   "3f641fa4aa5e56bb3b1fec48cd627461d5c00d47",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-006.xht": [
-   "6bcd420b7342cb1f7753177610a1fa0ae6733070",
-   "manual"
+   "04d178a5a46ec55bb9af52000ed6c66180bddeb2",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-007-ref.xht": [
-   "069d911402a55e6b42b07f1629f20adf358147e7",
+   "ce3aa8981c9d1b9fc8bbaea0f35d6774843f38bd",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-007.xht": [
-   "e13ec21b149e0aea7e055c31bbf185cedb6bbaed",
-   "manual"
+   "e5f34718232b745a1edd0260828498771b6773f4",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-008-ref.xht": [
-   "9195044bfab24fe64bd1c4bdebca08cce8c6d473",
+   "aa09ebc8d11ba3f18de39e87ea7710bfcbd605f6",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-008.xht": [
-   "20121d73f9d02d79614096234ea315c5e191251d",
-   "manual"
+   "6c1d416eefafb3351f1a26b7e2fee7b9bcf6098d",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-009-ref.xht": [
-   "c558eedbfa55f7bf2f8d86952d7aeeee37b703b7",
+   "5fbbc40cf47fa87e16dbdcec2a7d41b2828dc440",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-009.xht": [
-   "5813578d285f43fb349e1b9653903a9af1202195",
-   "manual"
+   "defda946b2c5a1fb3c3befb28f636240667e7602",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-010-ref.xht": [
-   "b926eacfaf2e900e4a4780c36d84b5a65711799d",
+   "2fce821cda2d07dee01b2146ba52e14549a1d169",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-010.xht": [
-   "461b58c24e30d83f6cad537f9c53d500a33f8349",
-   "manual"
+   "e7e4f1e18f459f0bfee9b3645c34ccd06e012ce3",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-011-ref.xht": [
-   "e47463367c9da809cb8aaf5118a0c11dc3af1fd2",
+   "0f7f3f7d65cd6f8cee90ff809782271df4df6b3d",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-011.xht": [
-   "d6dbb0359bbf04a25305603c2e426242a4dceed3",
-   "manual"
+   "2f38af1c9ecd8465734d7d6505cbba1242940f83",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-012-ref.xht": [
-   "63373a4db55a53adb30265de7d74cf481d907f5e",
+   "a7924b19987f2f42f411a5473387d64a990cc7d0",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-012.xht": [
-   "f3e18dc5f7ef9639ff700106acd4bc0a0d7a7315",
-   "manual"
+   "211f9eb4b491ee1dfba58c9597785f2eace333a4",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-013-ref.xht": [
-   "557fbf83b4646b94348124145242de86dcdeeaae",
+   "33b5472a7b52405f23e7ade0d4dc288cc6b4b001",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-013.xht": [
-   "f747974cff9ddca11f10579d98070000e8ef9a28",
-   "manual"
+   "fb93161eca943cd08ff3f23a480cef403c3ec1bb",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-014-ref.xht": [
-   "353f315892954cf4d71acf724eef5d5777284702",
+   "5fd758c606ae7cba60896cee6acb0d744fcf09d0",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-014.xht": [
-   "a90fcd780b1756f8275dfdeb0e28ab33e0a623f0",
-   "manual"
+   "60f7168fdd2fd1020054176688adf70259496686",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-015-ref.xht": [
-   "529e1a3689e18acfc80bad6a8cb237694f707074",
+   "018eeb362a5463c0a8d022aa8fc6c24d9714eaba",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-015.xht": [
-   "4639f471194c17c3d6b8a9e5894baa213a190fdc",
-   "manual"
+   "e5c4c397639fe395e8c798b1e9fc865d8b97f510",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-016-ref.xht": [
-   "6f13c5247da0c69c551725f74109c70522d73279",
+   "46e4264d787c2a8d4c9eba57674f6139cb964652",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-016.xht": [
-   "100578c0b781a3e58f1f072c4fc27f5bddac7f0a",
-   "manual"
+   "6ec96d281b6707c91931e7c3cb2b726e21202b8a",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-017-ref.xht": [
-   "8ba284031202c43b9b38f98a4fbdf95c18cdd291",
+   "9bd7971ea33c6dd4e6930101df73c3469a8d8632",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-017.xht": [
-   "24a4bbf21b4e559b696dcd2950052cefdfb2f665",
-   "manual"
+   "2b36aea83e699eb210b4031d21653588440ade99",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-018-ref.xht": [
-   "fca396aa8a9e192d5dc54fa585234e4f5d90cac0",
+   "b39d019b2d1e30d218da11a18bdf17d2d592a32c",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-018.xht": [
-   "6ac5c59ac021b4caf53c4d43a40540ea9933d965",
-   "manual"
+   "81028071864d0be42454cadd7fcf9a570c4db031",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-019-ref.xht": [
-   "c576ff019f0f6eaafdac0890e47b16c177eb244d",
+   "fb1dc905e4b51f42a44421687e5397edccef4221",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-019.xht": [
-   "504aa770de23bfe158d0e086baf30a38f0b96818",
-   "manual"
+   "eab5e5feb01ad1815569a409701461b3a5bf1480",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-020-ref.xht": [
-   "7afb5dc59dbb74d41a687c78f17f8f504d9c986d",
+   "210a615554a3dd9e0fb308dfd53e4f32ecc75a8d",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-020.xht": [
-   "8440dae48d9eddcb564416136f3d58d57d6e2c98",
-   "manual"
+   "87fd3005facde6976362938ae4ee6a28c6a4174d",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-021-ref.xht": [
-   "0cbba74a986fe7a7690bf538585fce8bf3bd868c",
+   "93b3e28985d9f286d41dec3925427b0634f71d0f",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-021.xht": [
-   "6d7007567c9d3d1492525c3dc98e8cf0e9468469",
-   "manual"
+   "61cbde06a491aabdea9a74f510c080822b3599ef",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-022-ref.xht": [
-   "c5ad66c68a8d9acfeaec1fa65f03a264bf77d859",
+   "49453564c825c26028a64e7a90b60acc8c69c852",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-022.xht": [
-   "36a369f2af87f7506437e626e6311c98fcc9e6f6",
-   "manual"
+   "9d77ab540e87770535c1b14ffd53e7dcae29587e",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-023-ref.xht": [
-   "022668ce1e83b010de171e85fe12ca1b53ca0449",
+   "e3e2d4e2dd07e687ec3e29f83a2728de24bd94d0",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-023.xht": [
-   "4cebce4e0268ce0674efbce29325e4ca62e1c830",
-   "manual"
+   "854dfef54f87dff2091f0ec33032057b0240665a",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-024-ref.xht": [
-   "78a87f295c8d7f35b98e2322a18adfe74065db25",
+   "2e61d6197c8b00ba0140b441c30d6be4314c0130",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-024.xht": [
-   "6b619a106f5d1594314cc3c098f2704e5bbad6a5",
-   "manual"
+   "27667159641433c67a875c55ecc769154b692bb6",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-025-ref.xht": [
-   "d34964447d28ae1fa4c804a6acb9420e161f56c7",
+   "71c1bc196346796c55a41398a4c562831f4cea3f",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-025.xht": [
-   "7a42a167db83d2a7fe49d95a3f7e93f66ce7d3ba",
-   "manual"
+   "ccbe9c72885cb3103e09bb5ac6d95ea721295cbb",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-026-ref.xht": [
-   "435ceae81719b1dc43eb1a26941e92ad0d80b533",
+   "b17d15ec64a61cf08720c47336ddd57506d52422",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-026.xht": [
-   "8f16d4e03eebf8624578c7d910b9d2d6607528ec",
-   "manual"
+   "25884a5ec2b0605bed07c84a01290a485c8916f0",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-027-ref.xht": [
-   "52dc3a79721bd331da1b5832c68df72ca726d92b",
+   "0c8624deb918223fba082c3960b762592de6482c",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-027.xht": [
-   "cfa3fd79e77910255821371d0bc826d8ba5fa9f4",
-   "manual"
+   "310a75f37c44b35a59a9eb5b78c70b16d657d8f0",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-028-ref.xht": [
-   "71341a55031dbd77da9a4127057e436fab653693",
+   "e2a01ba29975a4c982ddff0e28debd22b105594a",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-028.xht": [
-   "ac552f6b5da3b53112ea4f2d547e71d4bf39f5dd",
-   "manual"
+   "aa3dce8d4d00b664713ee0afc83f7996bd4b4503",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-029-ref.xht": [
-   "e500a8a01e69765fc1e4b710c63666d036668037",
+   "fc780254bef33ffead57e711be73cb109d034dae",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-029.xht": [
-   "e53a4905a43e12a6d4fbe1494d8c662445c0cd52",
-   "manual"
+   "7f4e2d46165cb95f43a9e9642f0fb2e9e49a4145",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-030-ref.xht": [
-   "1d73c0a6473893b4cf809dd8482776136ad3ca32",
+   "8ce3c8e5b7e98e0abfe11c4b7f5b5bb577966d90",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-030.xht": [
-   "61070bd313a0bef3665de130f3fe628e82b989f9",
-   "manual"
+   "4247a56598ab9334a579121b97f89f018f976409",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-031-ref.xht": [
-   "57633020d23105a5f6723e753113dc3d4ce5bd87",
+   "1db42595d929a3942c6ff1ded285e7c3e6b0436b",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-031.xht": [
-   "781a50eeb9181dcfa1766a4a5abb0e0bb2d448b6",
-   "manual"
+   "1d8698d56d4c101e08fa17c2c8ea72c714fcd132",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-description-032-ref.xht": [
-   "cbfd3fee20073be2b45299d9ec17770f47d35be0",
+   "a4d90a6d56a3a9dc0eee0bbe03ec495c26e33a58",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-description-032.xht": [
-   "417728e2f3ab0f10f0bf77d21bf82fc626dba9c5",
-   "manual"
+   "12079584e3f6c328e56901cd4476b56954fc2fd6",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-001-ref.xht": [
-   "c4df8f9c13295936b23defb37a10434696a01a14",
+   "2e6a0b5c03b7ecb0e5c4e19fc912898f948941c2",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-001.xht": [
-   "26cfcf9d6c68639a925e886020bab93e7d3b21eb",
-   "manual"
+   "575a6441db0dc8b63f5d24c490ad3048c3d8205e",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-002-ref.xht": [
-   "96d848b25d7f249ec76308200deabe0c70a78ec5",
+   "3f1c67e8f6e9c0d6ea0b74eddcf680a49ecec105",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-002.xht": [
-   "32decf19435b8f97a4e9535ab2f1b550265176b1",
-   "manual"
+   "e21ff887f2151eabb29303dbb229278002905e27",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-003-ref.xht": [
-   "c103821459b366f20823f00785aca290f8df202c",
+   "80a01ae90a23fe636f32ad9ec65855e59d18ae9e",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-003.xht": [
-   "99019548e476bc1fedabd344f676a6477088ec58",
-   "manual"
+   "0d13c6e3f4ed56991a4773b887b656e658d71754",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-004-ref.xht": [
-   "62d89e4456879344a82f2bed5da992329c57dfcc",
+   "00c98101bddc64a29ad8258af3b33e318036b938",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-004.xht": [
-   "279dcfc6fe239280ce6a15b1ff4fe379fb59497d",
-   "manual"
+   "704dd45fe2684cd2eabcefe3373842ac458f4fec",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-005-ref.xht": [
-   "7d272501e276dd30b0ddea372cd264c5849c5b25",
+   "239fb627a75b8e193a378661f93fb0b48bd36c08",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-005.xht": [
-   "d84d0a6d77a8fc2aec6eec4c7d4168c27d57def2",
-   "manual"
+   "3533339f9173da8a9716890144d367586bc8d9d2",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-006-ref.xht": [
-   "3e9c5bbbb851d56bb0c27d184c46bc87f00b72c9",
+   "7ff06d556afeef37783fd9a9a8b1ee6026b42021",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-006.xht": [
-   "71b2184f969fec3ed00b0b0f20d22559c7af9caf",
-   "manual"
+   "d4af2cf75b8a84001ed4785c0daac411913e45ee",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-007-ref.xht": [
-   "bdbb07de40408c26b5a222ebc974c91276523fc0",
+   "8312ee8ebbf67e675adf273cf9c4502ff0e70f08",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-007.xht": [
-   "1da01e004302979a35514d3b97ca11468631603f",
-   "manual"
+   "28e5b761c8b8384cacabde1b76e03f7dc86dd0e9",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-008-ref.xht": [
-   "c1894ddaa516a511359c5743bbf7fff5b4a541b9",
+   "3db571213b867ee26c7d1ea07beaf04e75696009",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-008.xht": [
-   "a3dbfffa60fb1a0fae3b7ffa732a33bec79538a5",
-   "manual"
+   "029fa6464427ba764700ff0507a6cd3d5e2f7f05",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-009-ref.xht": [
-   "4caa9db04cd8836ac2dc3ab21645fa765addb034",
+   "b1a971a66bdddec53776bfca96ea81bf39b3dbe1",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-009.xht": [
-   "f0c17baa7ae8456f30a5c6766c7a48719201cd78",
-   "manual"
+   "ed9ac22c63c510fcca4aa92aae137f35b832f919",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-010-ref.xht": [
-   "fb820fbca9faad3adc5381f594b823bf655f0e39",
+   "35378d50d48949b6e421edf9fc2229d7efc38e10",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-010.xht": [
-   "bd19bd48ba4b144d6e63d75bc5d47d272cced755",
-   "manual"
+   "fe0af73420cc3bf0fd6734916fa779ea5210ff99",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-011-ref.xht": [
-   "7113071ab503f1093d30eab50dc3c2432a41403d",
+   "923306e34fce84c85798d064a8a2d8c15d8b64e4",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-011.xht": [
-   "677e9965fc54326f12f517b1044621c884060a5f",
-   "manual"
+   "ff45199b48c11ee64ce96d3b11c006ed314c0461",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-012-ref.xht": [
-   "cc71f7d1ebcd82e85ea7daabbe044c38cb0006e9",
+   "56c1bc45b74674c0c27364b842d9863f64fa55d1",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-012.xht": [
-   "dbf186aea3f75b6b12afeb2499aac3db178aad73",
-   "manual"
+   "ebae87021125ff970422178e9dc6199c7d75e6f1",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-013-ref.xht": [
-   "b9633f8fd0f9a0beed8c6bfb94974306e9b2cf40",
+   "98e6acf9bd6ecf7ed4b0c35520ff8fa2389c2116",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-013.xht": [
-   "1186a3a65e6f65bdc443ede357badd911c14f1fd",
-   "manual"
+   "0c17b3c31e040c323a90d66bd64cb3d79185fa6a",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-014-ref.xht": [
-   "679b239a5b9e0a580d7da3465f247f8687ca3c67",
+   "57c02d90475091644115d87c9bc795646add30b6",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-014.xht": [
-   "9ed6ca46e1cfa2c7b1914a9062d359ac0fb0ac94",
-   "manual"
+   "40b9eaaaf7c03f53daa2c1b8f009244c7a5acae0",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-015-ref.xht": [
-   "fa280d02d74221b24e88b77642c7268ca6966fbf",
+   "89ca797c9663de1734f7bec17a650a8ef6357a75",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-015.xht": [
-   "d714a603adda2c9e7bdc1c3e9bafc9d4a75c3f13",
-   "manual"
+   "60dbdff349e9d7f856d918da74f86a15fb4dc630",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-016-ref.xht": [
-   "89a2e161afbb35680fc297ce5322c99325433090",
+   "9cd9b7926daa7726792f9c5c413e58ca0991b183",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-016.xht": [
-   "c6e0819f503af0d3267bafd0b83c762a4950145d",
-   "manual"
+   "f1a497ad4be86463363a5755638bf0063480f337",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-017-ref.xht": [
-   "ca439b072e83207412c58e45c20aa0ddeaffad8e",
+   "4ac2c32dddbb939931c5595dc581b957f662cbe0",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-017.xht": [
-   "51b5de12eb095d9ed53d606ccd022270f6d50d83",
-   "manual"
+   "9afea4aa4669a5377a6894fa8bf39bae225aee1d",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-018-ref.xht": [
-   "d03699137529123a7f693f0378274490e9c9c911",
+   "88d4d3c604272c1c2263de4026b33b816fc15b66",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-018.xht": [
-   "bb3191983f30b334853b127c6e30dfb9328f9b75",
-   "manual"
+   "3f7eef23e7f3aaa6c7c12f3dda15362e0b9810c1",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-019-ref.xht": [
-   "db4cf7c126105177f7157d162bb7d700b2e869d8",
+   "caf4241172e0640373f0708e0b9122385106cd4c",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-019.xht": [
-   "1d07bbeeab087ccae40633afd992d293a9c5e023",
-   "manual"
+   "b9d3448fd8d45c854dfdd480a0f4927f53700b64",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-020-ref.xht": [
-   "f25f894fcb8e03bad7c0b8f1c8110c600d1fcf6c",
+   "ba09a7bb48aa5d0b8b46af958cc34bf8f9763c5c",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-020.xht": [
-   "2d3e867463f86daee64cb243f2817edb0273136e",
-   "manual"
+   "62ac3ce4633bd126a422155397b87a7a00e825ef",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-021-ref.xht": [
-   "b52ce9be62ae199c603360d8652f5cc05601d249",
+   "b863cc25203f1d819699ba5868522a7975d75c91",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-021.xht": [
-   "1d95b9a61f30f6ab1f192d109477dd9106668bb0",
-   "manual"
+   "8df9c27b7414b2e990ab8fe2c56b557a9a379f2a",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-022-ref.xht": [
-   "bb98dcd913bb5fc83e2c9e1df2ea8350095598ac",
+   "95c632c6f177f199696f88aaa7e42b916e74b704",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-022.xht": [
-   "7f7b8c555069f5b44fc27ed6da70c80a70e1223c",
-   "manual"
+   "0e865f1bdd3b6f886e1d6f13ac7aff005a681411",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-023-ref.xht": [
-   "09025294e8570efec525e9a64ff2e3e8709449fe",
+   "0598e8b4d41f29d0200fd70556923a790071d692",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-023.xht": [
-   "df7b979c0b931cec892e9972ae01bc26ad3b0128",
-   "manual"
+   "ba187b46d7d5ac13c28794b3315b5e07009227a4",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-024-ref.xht": [
-   "fb590661068946e19f08516a02a337d9b287485b",
+   "e40b7a0c47dbe9bd05c852c85b72d774e5f288ea",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-024.xht": [
-   "7b237fa35c28bc2afaffc232a967d33d940ef925",
-   "manual"
+   "8bb6d1cdc28d02e8a9fc38d24df817af6ca3de4f",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-025-ref.xht": [
-   "871952b935a29345fedffbed085395e19f53e972",
+   "20304d413fd998ce822f2b06517b354f45c46e19",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-025.xht": [
-   "a7b3c4cb03538553add57b670a5d2fad01b8252b",
-   "manual"
+   "8ed3dec3978d7538396448f418f3d69b828cd687",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-026-ref.xht": [
-   "a9788de7a336064ae6770a40f4ecda79cf406173",
+   "a8cf268a4fef71c119b9e711157c1996f66d2ee8",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-026.xht": [
-   "02ba7cfb16ca52c5598b35853b0b2d2bf18052bd",
-   "manual"
+   "09b86ce3d1b40fe0416781b0484596d35617a20b",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-027-ref.xht": [
-   "a53201b2b5b46d6537284ad627d213a7f76dec03",
+   "598b0e505bdd2272f4dba96b44ac71586508dd19",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-027.xht": [
-   "519f174fa9e73c51d3eeb93dafdaa27de32440ff",
-   "manual"
+   "77c13ba565b0f18f5e73ea8d109f7a1045b02a00",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-028-ref.xht": [
-   "83b8d51749d20bcc2386601c411b641f631c0e94",
+   "fa5d546fc3d9af956d2c91681f724935848d64eb",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-028.xht": [
-   "3fe63436d8a338bacb76e7c90cd8257a6295a479",
-   "manual"
+   "6c143925415caadf99a3aff3701bde5c9d485f81",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-029-ref.xht": [
-   "625b71d821aaca5841a3faba37148fd2df8a2422",
+   "2a186c656e0531aad41b5a45decace8463060bd8",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-029.xht": [
-   "03a5514b8d646a3bc25b38ade49c710fdf74b43d",
-   "manual"
+   "b3a1615bdd49bf856de71a55c6f934e299cb4876",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-030-ref.xht": [
-   "ca831f90056b22ef0eab1feafb851a2b303e1462",
+   "dc38701ac52fad4386b6c0fe3ef718d162236f1b",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-030.xht": [
-   "542448a2ef2a543f5ffb029c625ebcf5060c320b",
-   "manual"
+   "7cf8ac8939288e30039d5b578fbf3eab875191bb",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-031-ref.xht": [
-   "bb8cad721966fa6835e48c69368c279dd6ce16b0",
+   "50fbb3c3b7c1ade1c9e3849d10d3290b6b6645a0",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-031.xht": [
-   "d9597279a54eab49789f757c476f0ac5c6d4e31e",
-   "manual"
+   "63d17809d869303f510bd895d7bb14276b4bc15b",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-032-ref.xht": [
-   "1afa2f9a28a986d7d4a447856dc3ecf284b476b0",
+   "3b1cf740c53faaf60643eb891e49b6bde45a7839",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-032.xht": [
-   "0eb01e66ecf2605130f4064295468793538ab4f6",
-   "manual"
+   "b3f25b2ff9046d88c90aee4273db5a0ff22a4227",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-033-ref.xht": [
-   "0de3b31300bc487f99b3917e02044c5a34121467",
+   "8baf69d036128cea3bdc2944c126b5ae05e4e165",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-033.xht": [
-   "b442b65810f8fee2a7e81e5df6f5a7bd40aa1376",
-   "manual"
+   "2f695f6750971e085118d6037bf3f64f1f5e9cdd",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-034-ref.xht": [
-   "d5435cce4250c0fca9f692d5a7e9cb4cb270e5a4",
+   "69476f1fc9144a7649ca21a174eab7179d0203c3",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-034.xht": [
-   "5564fbd5c572f77f8f7598989bf32290865c2f12",
-   "manual"
+   "1d90f8a10bad2ef31cd7bd7dfe15ab6f38bce1ac",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-035-ref.xht": [
-   "b2057a66c430b80dc21e9645eccf6cdebe060865",
+   "3df8547e593e01ff02034669cbc772a24ee87e3a",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-035.xht": [
-   "59e1dedecbdf38c0a2484d4eb0da7ac40f7d6f60",
-   "manual"
+   "fd618c6e0e41c6a63e1ff39d2c7e0dba30112314",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-036-ref.xht": [
-   "c6f7efcde2b8199252f5c849ed9395faf1b53d50",
+   "0a4a81a398140a842edc901faa10de4183c2f574",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-036.xht": [
-   "728d114e1cbcd800f8e6a2f946f6b8650ba95fc2",
-   "manual"
+   "cd3f9b12e221d57ac90e1cd906d54a688416fe55",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-037-ref.xht": [
-   "5c303548cb7309f9e2f7a5f3fedaf8f3bb45018b",
+   "a1c92ec610839ddd348ee9685ed95352130c60ca",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-037.xht": [
-   "8028cad113d7a85702d9b94eb0eefad0ba1dcf50",
-   "manual"
+   "2a8bd46be58824af86aaf8c7ed697a6d5ee41d7d",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-038-ref.xht": [
-   "2ca22d98cebeafac5334da589028ba802154922b",
+   "90905b60381e821f0d16998d224ddd36ae185b27",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-038.xht": [
-   "c306d041046b7c2a7eb3dd3f2bb613a2e0bb7dd9",
-   "manual"
+   "70e620cd4cd5697371e864476c3b2f0ee1a54898",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-039-ref.xht": [
-   "7242f883ef385e28fbf4068c9267a2b7430b8eb9",
+   "c9a73f9dae22a511d4348a7fe66e8928422078a3",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-039.xht": [
-   "718cb733b30b4b6047bab976ae471d13463c10d4",
-   "manual"
+   "2068eadf8de82880eae2ac28282daad035fdc501",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-040-ref.xht": [
-   "ffbc8ce1378d2e879595501d400a827093621230",
+   "6fc96d7dc4f5fe53af80287a0f35457b5008abb1",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-040.xht": [
-   "3431ae54dbc1bce0d77d927845f42ab8ffc1383a",
-   "manual"
+   "9de03d05cad610999338bbbc85e3bc71e6344d74",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-041-ref.xht": [
-   "690cd780df4dee31d27471406794359d00720939",
+   "d4fce6e2508f51e9dcee781ed69673cdea7eaca1",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-041.xht": [
-   "737f943721d918f426c58f1642a4ed04d7bb712c",
-   "manual"
+   "607fa85012e598fd62361d71a4a43b7d9c47802c",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-042-ref.xht": [
-   "1b9e4f29ced0578f63639bb739dae8ea048b0976",
+   "dc4ff1988cdc9c5d1f91ac5cf3a248e047e67298",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-042.xht": [
-   "f6ea591df1392b97389d278b824753d531eb5c7f",
-   "manual"
+   "fac4e71639ec69000f06f192fda21f82da67fca1",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-043-ref.xht": [
-   "7548baf3575d38e9e281a7743a99c1e0fc034fc5",
+   "95fb111fd71dc86eadd4c2aed188ba8f5a578ded",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-043.xht": [
-   "10401d8f557c4b03cfdaabd180bfafc7265bb862",
-   "manual"
+   "21a2f29885ac059feddafb9d7ab5f9f29c40ef7c",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-044-ref.xht": [
-   "612186789d59d1347fb0e6d63e7f10ca702a76f4",
+   "1e1bf942adc5e1eff483bc39baa7f9bf28ecae1c",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-044.xht": [
-   "ccb9a3b32812915649ec448dad9ffa21f0dbac13",
-   "manual"
+   "a5b8f35fd4bba8c3637474f7f0c67a11f0f04203",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-045-ref.xht": [
-   "526196f7e5cd201d1b1d57097fd68ecefd99d0cc",
+   "d4ebb62591a7862f7413d9b7adc9f6d9d061a563",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-045.xht": [
-   "c85b0fccd0076fcdd8d66fb82a026c43dc298404",
-   "manual"
+   "276ad2fe8e9db5bf882982aa13f6265c229cb36a",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-046-ref.xht": [
-   "e0f9e040747b0e40e0fdc92f8c0eb69ead207e12",
+   "b0e642f6025a022d0becf75c25996e809ad9e6e5",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-046.xht": [
-   "28f4454fd2c397fcb990f422b9f26d7732250c73",
-   "manual"
+   "73bc573bcb65ee2327fbdf68c7e3cd7caf77ef9a",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-047-ref.xht": [
-   "9d3a8df901f4dbfc715504fe6f3ee94e2df58998",
+   "6216c55f9ac9512f4249f03153c383476d7040f3",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-047.xht": [
-   "294307e48ff49f5beabd4837017e561489afa1c7",
-   "manual"
+   "40e913f5d4e72bff48b9aab248cb70af38e5b449",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-048-ref.xht": [
-   "826259db449ef98b8bed8f9a0d012e63607c8dd5",
+   "72faa4bad210becc8d7852637ae4b1dc9302ce85",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-048.xht": [
-   "864451fb7b58afc1c1332565c33588f99d7a45c4",
-   "manual"
+   "3474ee9bc1efc97cb740caeda518a5df40842c12",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-049-ref.xht": [
-   "a725514fe0d8a0c25291e6a7d84e999a5c9f538d",
+   "facac48ab560e3d5fc81bbe47051e0477f8cf545",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-049.xht": [
-   "68489091cf8ba5919649036453a2960c377923db",
-   "manual"
+   "b144e02c91ad8932663d0d594698ffc15000fb7e",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-050-ref.xht": [
-   "14170b9babc6af01df23eac4c9bab432d7513960",
+   "c0f8db97c3ed63f493177e7e28f36f57c8217a15",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-extension-050.xht": [
-   "c0fd638d61dae6f7be4612c0728c3c77a6f0d5fd",
-   "manual"
+   "7f86fb62bf5d5c3ac2dffa3c8fde971dc4d4de76",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-001-ref.xht": [
-   "1a9d54ba44c5955137c3fe01f5572a71065e4110",
+   "02a19351e067b64b8fd64e79d4d0d4fdcd95dd94",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-001.xht": [
-   "e10844bc0620256e303e714c827499d498013074",
-   "manual"
+   "141d574f60bfd915305dfc5970fb3366cb0ba5c9",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-002-ref.xht": [
-   "ef922265b7ec215dbc3cfe56485eb5f52deff9ec",
+   "846ebdeee23d82c686154c33fbb889a9f1dbdefa",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-002.xht": [
-   "d5e3bdf57da9f0cd34aca7dd225d68ab1b07326d",
-   "manual"
+   "d47de71bb4894fac3b7cf889c01c5a344e51231d",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-003-ref.xht": [
-   "47bec0ef5e7a986f654b56194facbaffacb69a60",
+   "96fa194f284bc3a2819167d90737073d13b68a21",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-003.xht": [
-   "4c7afd560af484820c4aca622a969d86e4c4844a",
-   "manual"
+   "14d0af296161759faf8b6422e5f596d2487b354d",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-004-ref.xht": [
-   "62b9ab0cc99ff4b76031e8839b5efc35dafba9a0",
+   "88b8b032ac694141114b74bef316d048fb3790af",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-004.xht": [
-   "b75b0da243958d448a2a3a36f4fb8a571c8b0842",
-   "manual"
+   "c06f21231360b1e85facc4cb1960f27166426158",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-005-ref.xht": [
-   "e36fec54dada16dd3f2bbb9b47cf8ff6e1b4df25",
+   "94216f606bae14575ea511d0617ac365ef93e5dd",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-005.xht": [
-   "d1c2a88c99ab6e41614a315a4a682dec425c35c5",
-   "manual"
+   "3ec42f1e1c3c716d326db3d3139aef8abd4b7eec",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-006-ref.xht": [
-   "4b0bbaef01709c05eeea3e27748f0b00514899c7",
+   "719b93b64c3d4ce0be586e16c82ff6d4dfa5112a",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-006.xht": [
-   "c553de73a0859c3cda79a6d9cfc8f1cb2ecf526e",
-   "manual"
+   "4fec56617ab664422779ca4f6f53b7537d1591f5",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-007-ref.xht": [
-   "7862d954693584b857f903157a559218c9245f9f",
+   "e6b1d9703aa93619da8166507fffd400ea84b14d",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-007.xht": [
-   "7457dc8f2652228558c02132af30acf94ee02524",
-   "manual"
+   "f3786c4b31fe0f6842ba286844c9ef7f0287648a",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-008-ref.xht": [
-   "7d12f09a3c4a272c4b10db4cf9dfec4df7504ec2",
+   "17d10c73c97b147bde11538bb1fa72d59df1e312",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-008.xht": [
-   "593daaaeb2e0366f5aab979163bbdd5fbde7e7e1",
-   "manual"
+   "c83d4e801c2b7509db32786586258f97920d07a0",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-009-ref.xht": [
-   "4ce25bf1c1abba7db54a377ec1ce84acad579aee",
+   "f53e699b04dc133662c7624c86baca44fa8eddf4",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-009.xht": [
-   "1f91a33163c8c434da9813122aad66f3b1ad0443",
-   "manual"
+   "174102cc5f33aa40ef6f43e0a715ccbbbb75f85c",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-010-ref.xht": [
-   "067d19e630c169e807823675a318a07194eef52c",
+   "d3cff68830c0e04a674d9e78902f8194e671fc4b",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-010.xht": [
-   "a3df37ebb350cb6bb9931f65cd35bd2ce329ab60",
-   "manual"
+   "ceaf8c08b4fbf1c5dae5426c0b06f45c38657b77",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-011-ref.xht": [
-   "53e212ae7d369f7054ae61b578b65624efaea77e",
+   "eeafe001c243051891d9656a444cb03266c2f280",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-011.xht": [
-   "59d3aca65da1328d1feda376396d305740fe3511",
-   "manual"
+   "22f7a8d998b7fa4f79b3dd7030d40ee1a235d954",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-012-ref.xht": [
-   "3dc21069f744506012c8367b00e28fb27f0274bd",
+   "0d6d0bd673bb4d3abc746c7acea3604838d739c7",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-012.xht": [
-   "adedea948125754764104ba3c6cccaeea75bd8fd",
-   "manual"
+   "423c28677e39e572415faf0a5632d751f0cf525c",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-013-ref.xht": [
-   "a18fa555f01371779c45b35017ab7c395772af50",
+   "c23602c6d6eef50692b6c956a769f8855f9c9977",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-013.xht": [
-   "f15185a2ce560f1722121c17e2d6e92734909238",
-   "manual"
+   "ff3118cc6983448f3cb54a6e28c4805f5c17a2d3",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-014-ref.xht": [
-   "7ab7d6c3f938c2ca84ea13804f17030cfd11f107",
+   "4ad6b53832da0c70c25a3d627e1a435f67199602",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-014.xht": [
-   "f06ff3592c8226c562c6a94cdd2ddce2fa82572a",
-   "manual"
+   "47036318a4b32fc9377addf88ffa348bd609688d",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-015-ref.xht": [
-   "b474891c6e1cd526d2b3fa6a31503c4332052429",
+   "2f5e3a3d2633a6a79cc5f2d97fa12b51c1440d54",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-015.xht": [
-   "062de567407fed56af5efc717a0e871a5ecd24ce",
-   "manual"
+   "45f2c3ebdd4c844f16952174c75726d44c3dc919",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-016-ref.xht": [
-   "93ff54b404dc9af8cc58500297f7429894d2b411",
+   "d66e9a0faecd963dbb7e34c7f9be5e204ed719d9",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-016.xht": [
-   "164566d15425cfc3ae68d37f55daee61ff4c1b8a",
-   "manual"
+   "94c60f786d76060efc6b79e17e43fb733f55cbce",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-017-ref.xht": [
-   "fe85c54945ea6b7a0c93596497b77ca3161c5ce6",
+   "5ed47f82852b45a857264ddeadc3689f7242a7e8",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-017.xht": [
-   "d6a039fdff92eb0c2c9f0e694692a0bc9e2e707e",
-   "manual"
+   "592565a8a54af46f028d2815262a464c3076b545",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-018-ref.xht": [
-   "4cba63a61ce4a78d1c7230854095fc4ee2185b85",
+   "38f1a1eb5d961e679878fd6e60e99da0785b2627",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-018.xht": [
-   "f3ce131a5a0069094479c233f00c49500213674d",
-   "manual"
+   "04a4eddd413b4dc9f7b6d3a66c6f70e7e943fb8b",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-019-ref.xht": [
-   "165084fdf8d4dd4802a9b57d9b26bcae0bb2026b",
+   "21ff28e54c4318ccb9da26c814538fbcb0c50f44",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-019.xht": [
-   "0b644def5761e1538960311515eb3121768760cd",
-   "manual"
+   "6a2db2292bcb740884f7de5d2f0f48e8fa4dd139",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-020-ref.xht": [
-   "6b85d0b9c2b341be03d678623090dfcc5fa532d8",
+   "3fe7f890a5cc45034310f816052b342d7d44f5f3",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-020.xht": [
-   "0770c9df664f9f2b7b41705474dfb9b15a6515ae",
-   "manual"
+   "07eb97fb868cc41b28d4062dcf8c51710beee9ab",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-021-ref.xht": [
-   "a5fbffb67f3aadad21bf1d79c426defe8ce7d915",
+   "4e50fa4f089316eeaf930b6b70be6b6fea64439c",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-021.xht": [
-   "9addb377126a2c7a75cd6e290d103b1be4aed18c",
-   "manual"
+   "f7e3a4d5a631e658b5f2f4e8b8681d3bba3c36fe",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-022-ref.xht": [
-   "d159229d41613c328c22999247bfab93e0fa2bd4",
+   "4f12f4fbe19ffd08d836153650760ac2b70a691c",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-022.xht": [
-   "bce083d105ffa9752dd22d8fdee971051a795f71",
-   "manual"
+   "dbdad958457519d0ccf52317eba3512ef51519c1",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-023-ref.xht": [
-   "96f5db5b8adf8822cf290ce6364ac8209b27407a",
+   "31634625fa3d85a11a77967d920e5d6f103a4ab4",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-023.xht": [
-   "bc29ad088e89f170be1bce2ca8b0d3909f83321c",
-   "manual"
+   "ef870f0937d8ec5b97460919d9a4060f3bb3107e",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-024-ref.xht": [
-   "c45582db1f6931b13e743ca0ce20987c3b22bd88",
+   "75fbd1bda36e77076bbb077de4f6b38f8d226dd4",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-024.xht": [
-   "c41a6ed1e1c83aea058a2e359387c1c32b500823",
-   "manual"
+   "51aae49319674effe072538fd9c2a5dc3ca3bc8a",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-025-ref.xht": [
-   "b61a33fb219b4c9a5c29a00ca7d83b6aa131ebfc",
+   "91852f8eaf0cc9a7c77c48675d0e851eed307e02",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-025.xht": [
-   "3ad98f152eb58e68182697797a276c8bad7e9f33",
-   "manual"
+   "a6cb9128da528f4328d1971665b5c7ee17f75a90",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-026-ref.xht": [
-   "3de2dc3f455b7c7f46a27399cebf534c217843dd",
+   "7b5cb8dad253151b01df7fdaf42914206be24564",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-026.xht": [
-   "5e3964af41dc6e4fc002d08bcd6adf3c44e89c6f",
-   "manual"
+   "6ddf0b0237834a9379b6500c13b67a5627065f4a",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-027-ref.xht": [
-   "cd3db08fa7759b6b0e030dd388fa9b82a9cf2687",
+   "5ef2ff7d0d558b57edb269b8f8b1bf9ec2cd5521",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-027.xht": [
-   "8eb00fc371487724f47e0cb671e510e8e455ce4c",
-   "manual"
+   "8db50ecb794253e88a3c848a9b291e7d17deb100",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-028-ref.xht": [
-   "8f1876b1a36b79b8edd7382ea5fcef17dd084957",
+   "dc3cc7fa538adc91424d19c07eb741e319f37bc0",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-028.xht": [
-   "7aaf248fbe3099c8035649e17dbc13b47ebe798b",
-   "manual"
+   "98b2de670388c9a333194d791a9a99add93af088",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-029-ref.xht": [
-   "88a12e7b9deab110c22661925d00f4ba92301157",
+   "f40bece6a3b682da89c24543bcae5e720829ab98",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-029.xht": [
-   "7536cfc5708d415ed666ede031a386defab59cd2",
-   "manual"
+   "c6f5dfbe4eb32f954785593a12bed07eac93d08e",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-030-ref.xht": [
-   "1dc45ad91c5362d5d5b7076e9b0c6fa395ed91ed",
+   "18d22f7a179cbcf4efb1b4ce6d544988bf236c0a",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-030.xht": [
-   "cd7bd25bdced0cfe504f930c0c368acb17577801",
-   "manual"
+   "b6f2600a842ed059b838251ccc53ceaf7f00d3ec",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-031-ref.xht": [
-   "4ba123d1611c81b84d70237f3437c75ad0469bc5",
+   "8ec038fa59c557399f9d3a16d722c10c9ec773ca",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-031.xht": [
-   "e5ffde0139c607eae065e7139231f6ad2c43fd27",
-   "manual"
+   "702ab78b7e7e39c6298c02d3545b12e53c5716d0",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-032-ref.xht": [
-   "9202fae1df4a26e72eb27832f76b132da2aefaa8",
+   "0d7803e83e33613cefba1ee5eb54538c0354eb9c",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-032.xht": [
-   "499e8b982452e5b7e40e79e4e5a596719b5f8330",
-   "manual"
+   "0ffd7a40cc6134900976c1a15b82c74418786a17",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-license-033-ref.xht": [
-   "926eebd0f8b2c1459d2a5af67f9d4fe2a135b096",
+   "2ae76f5b4e77b1405eee44aa082df6c6483e0f6d",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-license-033.xht": [
-   "49dc4e69b2cebfb1f3c03f5de5e3421c6dab9910",
-   "manual"
+   "f9c48b4519eed52b47cdd6fbb40c494272a31925",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-licensee-001-ref.xht": [
-   "39b46c4420cd2f8c33a188abc5b4a8ddb57c22ef",
+   "1ac0b6e307629d1613aef52bf6a4b467c921030f",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-licensee-001.xht": [
-   "d73b319c5f30ad374ad7481b58ae3b1e2b1e0340",
-   "manual"
+   "6d006e3d140ad6703fb31ed8a7eb2a47062324c9",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-licensee-002-ref.xht": [
-   "ee36723d15da3b0713ecc85a1b2ec30e3d01f942",
+   "ffdbdb419307cfb3fddd48d2a4668273326eb75c",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-licensee-002.xht": [
-   "a4bfd192641648ee6680632e962ea1618c091035",
-   "manual"
+   "0a0b5e081dbce396574f763d8e7ce82a854a2f94",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-licensee-003-ref.xht": [
-   "03eace44a5b5a3c7a9ff226a4d77ff26a76e935d",
+   "195894d368c7b5dd6807af5bf9251b9a02080d5d",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-licensee-003.xht": [
-   "84f6065d330a750391fc1bfe6843690be099d121",
-   "manual"
+   "fb0e313bcbfc064548501dda3887c584ee521031",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-licensee-004-ref.xht": [
-   "d3fe6c52396a8c813793be8098758aabe7240ef4",
+   "14359baf99811a2294a793c6e247d1d319ce48db",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-licensee-004.xht": [
-   "c2eb26632311724a6c602ef888efe0541c8a5eae",
-   "manual"
+   "7faf90ac4668b5975cc8a750e569b317eafda796",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-licensee-005-ref.xht": [
-   "23e52cdfeb2962f6d8946e8651ea8a1508132871",
+   "f094ff116cd1d352d2f010e755952607d7aa5967",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-licensee-005.xht": [
-   "3774da81dd5afdce25ed9a808864578f73e05b87",
-   "manual"
+   "47a243761b201632b4e756e8963b0ca533da2905",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-licensee-006-ref.xht": [
-   "8adb5012fcac69afe4d90d98922f1312b70032af",
+   "7aa43f772d2cf69494578d72c18e95768761e5d6",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-licensee-006.xht": [
-   "8b590bc730a799c8b746d905707dd8b5c8ee22eb",
-   "manual"
+   "522ba6a24ef14e88d16ed0f064e39329f24aa26a",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-licensee-007-ref.xht": [
-   "2c6460d799426e050e76e219dfe45237939beeca",
+   "b133e8b33c2b5a40cb455846f61f406731e0d81d",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-licensee-007.xht": [
-   "fc66d8831e1224624344d2c3adeea12235b685e8",
-   "manual"
+   "0ae3bea404e6f16a7a0c4893d9c014f6ca51e66f",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-licensee-008-ref.xht": [
-   "85b438437cb02b0d99cf43b9b6ac84e6d71d7dd2",
+   "de2ad945d04b7ab33dcce4c38b226d36e75be124",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-licensee-008.xht": [
-   "0f628d3d3fb8eca9d4cba86caf4ba3d6f3e7e5c8",
-   "manual"
+   "dbfae4764306c1d6642549376ec81c6792b1e044",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-licensee-009-ref.xht": [
-   "be9ea18f2749dd938b38ba0924dfbc435a3c1e50",
+   "fa91aeed0c86d2b890a5269d97933d1916948043",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-licensee-009.xht": [
-   "295bd7eef6907eb082eadb8eefa159463df09891",
-   "manual"
+   "a45e233f629d33d449ed24760e5337116f211184",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-licensee-010-ref.xht": [
-   "8fc851470814b79073729ae9d21f4765ffb0edc3",
+   "a018101d8ff2c96b42ae06fa17d8851f9102da79",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-licensee-010.xht": [
-   "5b438ed985aba70d08fe6d1f49754c1d87717218",
-   "manual"
+   "d16e69e373547a8af2405acce572cc42b78dfe26",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-metadata-001-ref.xht": [
-   "247556af423c74a6c203eb013cda6417068a5b3d",
+   "50ca4226eec668cb74f0f7e22241a377918d35e7",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-metadata-001.xht": [
-   "9af996f33e767a3a157c11d1be6f1d6dc5643719",
-   "manual"
+   "1d78cb8cd643754570ec50e79ee1ae121daa2f49",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-metadata-002-ref.xht": [
-   "09eef205d44f53a2e95a0e4bce1a072744b7cc47",
+   "a604e601e8385072331c07b9a6fb4be00f49155a",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-metadata-002.xht": [
-   "c5940c12f03c6d88001347d63b45bf12b568fb25",
-   "manual"
+   "0f94320f1287a4421718993d57823f42ed632ec3",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-metadata-003-ref.xht": [
-   "bca7b421378016c9e926e6f04b210eac3966fc59",
+   "b3d6f4af8a7512697f471b3a30146d33a94cae51",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-metadata-003.xht": [
-   "b1a63a1cdc7f6ad0a48a5b274df418d5609a80f5",
-   "manual"
+   "f8eb33005dda2af47a6a447886a118ff5ab30b75",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-metadata-004-ref.xht": [
-   "da7c7923d812e33f0ef75022d9bfac0e159b35a2",
+   "802f575872ae0644962d105ab77983e1ac8b53cf",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-metadata-004.xht": [
-   "987c81f82ed04c9d9e7350be1f3e30aa24ecebf7",
-   "manual"
+   "70e0b9bcc996dd0091663680598d45d5700976de",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-metadata-005-ref.xht": [
-   "69cbbdc9705ac9ad6d021d1d41fbbaa725e45315",
+   "9b449608e3ce8e9f80b8092cf2d261bb22577591",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-metadata-005.xht": [
-   "cbdd150873cb1adb250967a47e6e2ba8d96de216",
-   "manual"
+   "b7140ac5cafceb0f45ad8fa0a2562efc2edc3cc8",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-metadata-006-ref.xht": [
-   "2268296306e6da5df51296e4609e410df1882edf",
+   "f29d26e89ccc244cbe1f1965a8de05fb0a23ca54",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-metadata-006.xht": [
-   "4577ec630426ef69e900f6a517f96560a5acadc6",
-   "manual"
+   "c10b2310540065088d842b44dbf7aa8838f09e26",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-001-ref.xht": [
-   "4c0f59ea051411c40541406de23286e2fb07aa1d",
+   "0713cff0067e897cdb3c4e3850a5c75eeeabd198",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-001.xht": [
-   "925bf44edd95db7bd598dd99ec45ab61347ba1ee",
-   "manual"
+   "d702bc8f90a932457673ec7ff382c49746efe250",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-002-ref.xht": [
-   "ce69f345110789df3f9c1cb73640b0997aa58fbb",
+   "aef13c7c4c34a05d91522290c650e8905ddec83b",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-002.xht": [
-   "13fe65da23b2f25c37bb705eba6bee55c73a7a4c",
-   "manual"
+   "1e77ec8bf5252cd7eda57dce713bc90e42c8eb61",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-003-ref.xht": [
-   "d9a86bbca46904d6d267c9423deff5dfb2dc9000",
+   "e16598a210a3b4aa2b36b7641ea553aabf9cdf29",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-003.xht": [
-   "082f21eb191cdd568fdc2db83cbf149dd2c28620",
-   "manual"
+   "c83f0fcc6c42c1a037c29367e5a544ef93794075",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-004-ref.xht": [
-   "25fb6200f41843b8130a49e33b9b6f46b22b17d1",
+   "1ffb1d92ed3b035bcb2a3b23c5c1f74396c9bff2",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-004.xht": [
-   "d87a7f8fd33ea607c81d6a74993790df735fbb1f",
-   "manual"
+   "25fdd11add7d4f4d609028c6eb1a755bccf6be7d",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-005-ref.xht": [
-   "943a7d612fa32dbe914dd77fae4f966d18ad3d03",
+   "4e1dcb5ed987d826f0d160184286a7ba5f8a1569",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-005.xht": [
-   "a4233b887f5f4f1893ab1e6306f8b79f058f6be2",
-   "manual"
+   "4fa17d3c41cfd0a798e45d73e187f1030a22d5d7",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-006-ref.xht": [
-   "343c941442e89dce06b0be0d95429fe85b00724d",
+   "f09099080c7ac374f1d5b9c0f41f3b2d92df2405",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-006.xht": [
-   "1b09a8a609283e9784dfaf2bc4b207ffea498db9",
-   "manual"
+   "d7bcf7894e5a8789d6096dacd95b57e2cac48b57",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-007-ref.xht": [
-   "c848b21115ec25022ea33c041b405bf0d767d50e",
+   "4378ed8947c059b071e9c087952aa1bf6208c038",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-007.xht": [
-   "a2429cb642048a79044ef8704c78d00139a36c13",
-   "manual"
+   "7d9cf92b0b81a26004186644c14d761d258e7ec6",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-008-ref.xht": [
-   "faa9f315cd4b6223c93117c7697b0ce4a7e9aa29",
+   "f77e6c1c239b1d054299dd954ce59e333315581d",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-008.xht": [
-   "87e133eb210f4c4ef14a11af74834ad6e50fdf6a",
-   "manual"
+   "f8ace3c1f893b370b8dffb2ad32a78bc0e46157e",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-009-ref.xht": [
-   "59ab4bded3b3319341ccb63ee831bc640f048727",
+   "5b229e8bb67c1d4ecd8891d5029257a9cabd0fa7",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-009.xht": [
-   "8078edb26c8285f004ab19198bfc9f6e59429ef8",
-   "manual"
+   "12ed9973a2d7ace5fcbe775795f4a1968e2d96b3",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-010-ref.xht": [
-   "9ed6e043237a4042e169bc91648b25071120a98f",
+   "4167442a5617f87530afea843b62db2cd634969e",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-010.xht": [
-   "a342fc8529b80a0edec996c6b3287eff70aad0a8",
-   "manual"
+   "1e0deb6eff2b97ea07e03737b541dafd5fc56827",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-011-ref.xht": [
-   "874cf0fbb2c18184d7e60143c956f940af763d60",
+   "bd922784919b1af62e161c5c4410319d12680b35",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-011.xht": [
-   "ceff98b8619fe11517b8e91e13a4ddff8271363d",
-   "manual"
+   "65b113183b76485e9c3219938f753ce03f1c2c56",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-012-ref.xht": [
-   "f6d6a2a9f17fae2739209429ced9058d069db725",
+   "de035f26b662e8ddc9b2a3ae802a46d025c6d704",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-012.xht": [
-   "5dc975b00969f0f982022cb98675c721532978ed",
-   "manual"
+   "9126ba42e9376d93940e3f9afbe021588cdb45a4",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-013-ref.xht": [
-   "3d79360354be8ff2bbe0f0bdd25abbb3745704f4",
+   "a041bd0dabb5d9aec238ac3d530f7af41a690104",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-013.xht": [
-   "e160914941d976bfe13bec074443b0f1fbc994f1",
-   "manual"
+   "8119d4bd0962579a8cd9625e4c107b53d93a00e5",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-014-ref.xht": [
-   "d42c0a97bfa84e705a43b3dcc10c850748d80916",
+   "63c8f6cc1a944574ce769051fb33a6e1a30657e5",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-014.xht": [
-   "28853f191aa4eaa93676b2fbb817af05af5fb8a0",
-   "manual"
+   "cb9989ea4781c6930f3f6a090180bbe74c655b3d",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-015-ref.xht": [
-   "a7b7126465d86f1b89ae34f7f9c9c932a22ea356",
+   "b834edba667697d6c551855f68aa51c9e35c64c8",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-015.xht": [
-   "d3290b4681e63989d82f2a21f47e1498d34ca07d",
-   "manual"
+   "b8427e6bd503c6aa54ac35cd25cecd2f3031a70f",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-016-ref.xht": [
-   "6a1e5599b9ecdd1976e466507983e593b5ef6519",
+   "37cc511719b744dd9860c9490909bf39ecf32e10",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-016.xht": [
-   "dfccb2cf0324e703a261b96ea1018ddefcfdfa49",
-   "manual"
+   "15694e89d85c3749b376d320bdbc3ee19cbd6363",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-017-ref.xht": [
-   "40f7543e73323038eda553ac2189ad0f14c887e2",
+   "333c8fc1cec582f4ad4e963342376380485e7eff",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-017.xht": [
-   "469159b3e82cde79ce307dca106a7fcd53f9e440",
-   "manual"
+   "9041e23afad1b24c5c93723c5deba04c71727fbe",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-018-ref.xht": [
-   "dcf224d7a2af4a45fbb6772cedbd52270fb7bead",
+   "3283b54c72953252a8e24e507f42f104f03a7fb9",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-018.xht": [
-   "594e28f25b3a27651c4790e92e8ef20c33f40909",
-   "manual"
+   "8380a6e21d74d6a458f33dc77cdde322e75c83d0",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-019-ref.xht": [
-   "0ea1a74e36981e6da3ca4f33416c55dd386ae021",
+   "02ed7f17532738e1401d8dc054918465cbafd2cc",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-019.xht": [
-   "c513508a71911dc597c9b75cb459209bccbcfeb5",
-   "manual"
+   "e1b6e8ae785815bfdf00f1a7411c238b67ab2366",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-020-ref.xht": [
-   "37ebc6f18d783398ceb6b503889b3136e051a538",
+   "7cd83ad9940dd4be2b8c3d530b6e00fc2e1938ae",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-020.xht": [
-   "87a148da6808365a583a1c5f5609db331d95cba9",
-   "manual"
+   "3fe0c7f6bd8cab2a3f36e4e95105983cf1302d57",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-021-ref.xht": [
-   "35fde27d82da0ef8769032d524068f006d36dfff",
+   "1834ba6eb66bfd3ae2947382066d9630a499e34f",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-021.xht": [
-   "06d64da0f5015e1043c560d06a79266a991c19ec",
-   "manual"
+   "868253988089453089ffc6119a7208fd0fde4cf3",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-022-ref.xht": [
-   "703e40d53556d0dadeeb29b9d57c3f507f674e74",
+   "e8cbab26b2578651b7d09f8a52b872a87cf16a01",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-022.xht": [
-   "a3840e73b53457314110ddd9d47ed5e4c6d21d50",
-   "manual"
+   "8809ba8febb5bef2187b529575989ccf517423ad",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-023-ref.xht": [
-   "d48e9e81c8f649c6360f988f400bc7dd8809f2fd",
+   "4040851bce61ca1ac57df77d10f7169ca05c982d",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-023.xht": [
-   "92fa677ec0594c000d361e10c4d76f76b9a8b332",
-   "manual"
+   "c81c2dbf6c4b9ac05fc8e25b96db9b23c110c554",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-024-ref.xht": [
-   "b59f43bacb70534f74b9c606ec59c5ea66f2f135",
+   "a6445a531436b5c81ccb990138899d9ee3076de3",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-024.xht": [
-   "21559e9ee76d64c3485acc567ff9aed0bb28b0bf",
-   "manual"
+   "7fa5001be360a3493dfc0835acb7e1fa76134d90",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-025-ref.xht": [
-   "d5e186f35f00269a1044f5a90b23d45c91fc2aab",
+   "57c7a8b863b62753e757859129a5526e9b9c2adc",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-025.xht": [
-   "535dc2175d2205991b065f15bd59093af7dcda0b",
-   "manual"
+   "9f826366a93ec2b54118647194d96eb8064cf718",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-026-ref.xht": [
-   "726e20236bbadb2da9066b889442253ca7f00e47",
+   "8a2ed8f89514bf3524300c5228bdb42aa326a01a",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-026.xht": [
-   "d43b2e07f740a7576188fcb642a64044a523122a",
-   "manual"
+   "7fb2bd303fa2148ea5e49ed07aef5d93e9335bf5",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-027-ref.xht": [
-   "9199422cae5a7c292bb839d364c068f5726686a7",
+   "a24d88a251ed2f8ffba3baaaf1009bab60a5cf47",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-027.xht": [
-   "3f30dc12c9007f709748e80c84e6ae370af5edf3",
-   "manual"
+   "0883705d443ee889018c83e713033cbc8035f602",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-028-ref.xht": [
-   "98ddd6ad0664accdd146abf7439b2cef8fe5d70c",
+   "16944b125da4b3eb275470f6b5a7ed057924d7f7",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-028.xht": [
-   "61d4d135d2ec38edccd494c76824b1dd31a10111",
-   "manual"
+   "a8b3f08296ebe8fd8790e8f5b911a37a852fffd3",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-029-ref.xht": [
-   "6489af278b3bd0705d238ba8d246969a508e11cf",
+   "3fe93ed8600ed33c334a2816bc5cd1928023bf03",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-029.xht": [
-   "2d0939d862cede3616c301646e4429b0213d74a3",
-   "manual"
+   "43589c850d8e164e270acae1c559ff62b3624a87",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-030-ref.xht": [
-   "d01e8d28a9fc8ebc05ae1726a7bfb4dd24e39ee3",
+   "6dd45b99dabcccf9cff9ab05cd2c80a8ecd5a6b4",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-trademark-030.xht": [
-   "c04564cd1a19dadde90788e9ad97aa505f755f62",
-   "manual"
+   "c41b0537eeefcc2b62295696359e5dc5505b21a5",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-uniqueid-001-ref.xht": [
-   "bdce3f80c4bbd63a07f10347149256df50de17d6",
+   "713b8b272c2ef29428270522e59a82bd6e8f71de",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-uniqueid-001.xht": [
-   "51a5b226e8d36cd5ffa8cf7e2ad64e52bece67e3",
-   "manual"
+   "bb9b115890ac9b6a5797c790966b07021eb071ae",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-uniqueid-002-ref.xht": [
-   "1287e5effce978e4255f17bc0fea054120ff0417",
+   "155259922f8049d3ca9a8173f180cfcdfc0636bd",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-uniqueid-002.xht": [
-   "76ab18ec9c22ee47443630a9317c3ff89b1d4d7e",
-   "manual"
+   "26972f02c093e8c5ec13da0e82c9dfa6721da293",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-uniqueid-003-ref.xht": [
-   "258ff723ad64b9e2a013d0c0d7aa46e2a02b7ea1",
+   "846626b387d11bb7d3c26d0ccfada12b827d81fb",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-uniqueid-003.xht": [
-   "6350f90f92567e2c2be43e0e4f1ed04d4a124e1a",
-   "manual"
+   "0d1123e118f90bc9d90f2842b6d9ffcedd9276f9",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-uniqueid-004-ref.xht": [
-   "71a57a3b2cacf665eda4e09bcd5fb0b534a6669b",
+   "e1a018bb7f89b6d3f71066bd10d7aef66aed296f",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-uniqueid-004.xht": [
-   "7a30729e3f97a2be3c070216633134d57f02a9c1",
-   "manual"
+   "8c28456a082fad97fd580909504ca8b76d89bed9",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-uniqueid-005-ref.xht": [
-   "08f68260d66b7c1ba6b94da720e4ed366c4a8f44",
+   "4de4cfaa6ecf9b00aac58fa73b4cadc1c372b030",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-uniqueid-005.xht": [
-   "12b24a31956cd28e3007229143419acc6072e601",
-   "manual"
+   "73678c968d4c7e101cdb5f68bb5582adda7ed65f",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-uniqueid-006-ref.xht": [
-   "86d4bb99ea38f2fa725ebcdaf75329f4c11290a1",
+   "6cb929522d576c3225d0fff9787d9e5b0dfc6c3a",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-uniqueid-006.xht": [
-   "ff22dfdef01b3a2158fc153b26bb4f87144c579a",
-   "manual"
+   "92817baa4b66a5f03b5cb318068fceb762824504",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-uniqueid-007-ref.xht": [
-   "6030ee33db1088772c612e6ab7ae0aa876908356",
+   "c42a354f9f0b7cda336ad45ba4b42cff06d989ad",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-uniqueid-007.xht": [
-   "6b5806b5840f8842fb861be726a229180645bcd6",
-   "manual"
+   "c2b8652902e65e553304c716462a40c61f65bd8e",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-vendor-001-ref.xht": [
-   "157bd183a664ded2a8ed3d61e0fe60b70016526c",
+   "d6e62b3fbfbb22136a557178381233aa79687a74",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-vendor-001.xht": [
-   "e193c111e41d60cc59cd220527b33555d6c8d67a",
-   "manual"
+   "f0031e27b1f021504e2f98c7a3c7e7f781871fa4",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-vendor-002-ref.xht": [
-   "cd18131b09047442cd0cc16e5d18ce3e9e77545c",
+   "5959a6ea1f127dd50be3ebf404dbae41597f76f8",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-vendor-002.xht": [
-   "649f529f75c486b2832cf1c352494357db942d2c",
-   "manual"
+   "452757ae8b9487a0c225d3971113d05c7d252b47",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-vendor-003-ref.xht": [
-   "df997818ec05b90a22262187cdbdcb52a09468e8",
+   "cf15b4249cd0563775bc4d4d5e0e216a7f88a311",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-vendor-003.xht": [
-   "a4ec7bc32d010dbfa2ed2dbf4ab676400a2bd045",
-   "manual"
+   "8b5349a01b4d3bafa66235ecc84f8795e57693be",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-vendor-004-ref.xht": [
-   "8df50a6008928b5b1fd49ca782830841c7efb6a4",
+   "b50da1a24eb5d3edd52f49358973c50d8089b6ef",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-vendor-004.xht": [
-   "8a42648635661d6ae529d0292e2248979a9c67e3",
-   "manual"
+   "6051903e0b0ce08171610f608b770f8895a3bbe8",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-vendor-005-ref.xht": [
-   "ab2089c12ec94448200d0d27b32bd7211f234b99",
+   "869dfda377b838073da5ac13695f52f3b345abcf",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-vendor-005.xht": [
-   "ba535d768c09aa45421e2f11d1c9e9d5602ff47a",
-   "manual"
+   "2092c51bc7cf9f43b0724530b6b023791971ef57",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-vendor-006-ref.xht": [
-   "27264494aef21b0b312f620a65b485ba52ed6025",
+   "0c51642f820c35912a0f31f797de36ee7a408f8d",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-vendor-006.xht": [
-   "15562c954f5ba16f52effc1c3b878880c8446ea7",
-   "manual"
+   "d7ced3698a22696dad7f11f8fc29a849d53a0dbc",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-vendor-007-ref.xht": [
-   "4eed5e37ffab9a5b9a3e14f7829cef66f83b9030",
+   "48891e0a82bae989d641025d731ab10275701ed5",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-vendor-007.xht": [
-   "aebfe4c397386ea929a4c551bde21c5c9724ea41",
-   "manual"
+   "2c6116abc2ce831b7fd07db5f51081206ca28bcc",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-vendor-008-ref.xht": [
-   "236f3a67e885035933b9766d08bc017a8b04f34a",
+   "adc142e6063c3e62e8c96170474aa8de8c02e3d0",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-vendor-008.xht": [
-   "ef09fd1ae605b71aae9c061c5e5fd107ac7c68e3",
-   "manual"
+   "25b6b14b385a7c23d92d1c8e2928262b57ca7c05",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-vendor-009-ref.xht": [
-   "6cd58302163ac538dd4305f5e7ce1d5e5214f893",
+   "a53aff9e8aa590abebec269aa9857279ea6279d9",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-vendor-009.xht": [
-   "3d6dab4147ef6f0f5c652df0c275423ed7440fbf",
-   "manual"
+   "84f80ef5a93ebc28cd1ac0791ed36480b02b151f",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-vendor-010-ref.xht": [
-   "08e3f493334d6d0cf5d4dd059cd21845ff5884c4",
+   "4288c2462eb913fc314a441923d9280461dce31b",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-vendor-010.xht": [
-   "b7a60041bbd0be949636a241d1ae07896541e736",
-   "manual"
+   "25157ea56ca731a66a1e5e7214aa72bd6dca953d",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-vendor-011-ref.xht": [
-   "777a78f9c731b80fbc14835bb0d403da6c461140",
+   "947bb2e9cf3b0ff123c4cca37d2cd338aa0b5cac",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-vendor-011.xht": [
-   "ad21fae9619fcc3dcd1f4d11ea3d68e3b838ac1d",
-   "manual"
+   "a5507eb1470b72f58cf142204c2f126df70c4733",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-schema-vendor-012-ref.xht": [
-   "aaec0cc30faa5eaaa6c9132956a02bb6844eaefd",
+   "27f068950cb943beaf56725cfcb4092745a1e36c",
    "support"
   ],
   "css/WOFF2/metadatadisplay-schema-vendor-012.xht": [
-   "1436b345abaeccc250147955751cacddf4172210",
-   "manual"
+   "aea8f097378466caa9c725948f4318d01b648604",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-well-formed-001-ref.xht": [
-   "d8ab095277d982030c5f82cc3ebc9d0c8decc17f",
+   "98e2345f63a047741681c60fe0667fd49965f65a",
    "support"
   ],
   "css/WOFF2/metadatadisplay-well-formed-001.xht": [
-   "67f5f947328aa04caec4d77011b5b49483d8120a",
-   "manual"
+   "8b0ab8d006c01e7cb1bf8e73d5a74d120ba7c94f",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-well-formed-002-ref.xht": [
-   "d420a984574c9c3a402be1eb8d7845aedde514c6",
+   "c4409020823509e449b0a7cb39721204561fc288",
    "support"
   ],
   "css/WOFF2/metadatadisplay-well-formed-002.xht": [
-   "d9e8f5f19aacd85f25fb803a2d03d5450cae6e3e",
-   "manual"
+   "7c0b57f052cb1ea01270c4a6d8f82b8f8f1568df",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-well-formed-003-ref.xht": [
-   "a91b6e21500d42f1e871859d48d0b9049573599c",
+   "141c698416d46493ea6f93e4ef41a1ee425bf0d9",
    "support"
   ],
   "css/WOFF2/metadatadisplay-well-formed-003.xht": [
-   "126bdb223826d0d60de2b2aafef676fe9c686158",
-   "manual"
+   "00e4cf3fc20f95001025025f6eef01c8c4614e55",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-well-formed-004-ref.xht": [
-   "c2def21942dba952f81a9f5c6b0492bca88f252d",
+   "f83949eae821c897e8060930be4aa93721ac552a",
    "support"
   ],
   "css/WOFF2/metadatadisplay-well-formed-004.xht": [
-   "38a25e1907ff33c82e5f901e5e8e9dfd8d7e94e5",
-   "manual"
+   "d81b01e882623d445291d2d380b7087f8276a62d",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-well-formed-005-ref.xht": [
-   "f6a6c1427329aabaf8d215a802ed7d31fb380aae",
+   "f850b0ba4b6dad2d34e9490eb8cede4a874848ec",
    "support"
   ],
   "css/WOFF2/metadatadisplay-well-formed-005.xht": [
-   "4190f1dacb14da1ff929d123636a4ac36473da94",
-   "manual"
+   "6630f004b5f1196c33535ed4683317f79d5d292f",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-well-formed-006-ref.xht": [
-   "eed5b65461ae31e63fc8d3adcc64caa2dbf3002c",
+   "a66e8f740d5b17bc8f581b2a940354b3a6c67a8d",
    "support"
   ],
   "css/WOFF2/metadatadisplay-well-formed-006.xht": [
-   "219a9f16b2136d8087a37402ca591a438ab37dc7",
-   "manual"
+   "8c4f639fa0097d8eaee83cd6b121008a3c059464",
+   "reftest"
   ],
   "css/WOFF2/metadatadisplay-well-formed-007-ref.xht": [
-   "dbb358169499ee8eda7ef803b69fbd101c1aff8c",
+   "13a92f3dd0d91d72a6491eee77096eaba0f9f891",
    "support"
   ],
   "css/WOFF2/metadatadisplay-well-formed-007.xht": [
-   "14bb88708fc8a34ab5f3fafc5e1d0c079bf5da0e",
-   "manual"
+   "f537639e4a657d42b6dd228ac48d4a0b81e48b07",
+   "reftest"
   ],
   "css/WOFF2/privatedata-noeffect-001-ref.xht": [
-   "f87064d1eda3e76ee70cefc1b705a8dc6d0286f6",
+   "070fca62f25897e452d497d980167424042af835",
    "support"
   ],
   "css/WOFF2/privatedata-noeffect-001.xht": [
-   "6c141272c0093eeae730c230db4991095326a895",
-   "manual"
+   "61b56fe36d7924dd98c2118896fa1645f3ed8a78",
+   "reftest"
   ],
   "css/WOFF2/privatedata-noeffect-002-ref.xht": [
-   "13519b7dc15a5a0e5055c07fe26a68ba98eb292b",
+   "6d04cd7fbbc94cd3a1387a2bead0eebe12f68cea",
    "support"
   ],
   "css/WOFF2/privatedata-noeffect-002.xht": [
-   "cbcb16dbc771042af9af9be9c7af014a7b9ba1c2",
-   "manual"
+   "d0331db6942fdc3045fb6a225afe8f37ee8192a5",
+   "reftest"
   ],
-  "css/WOFF2/support/FontsToInstall/SFNT-CFF-Fallback.otf": [
+  "css/WOFF2/support/SFNT-CFF-Fallback.otf": [
    "6f1edad1b99674fd2a3931a6a813a64a9eca6a84",
    "support"
   ],
-  "css/WOFF2/support/FontsToInstall/SFNT-CFF-Reference.otf": [
+  "css/WOFF2/support/SFNT-CFF-Reference.otf": [
    "dfbbb1d4209e691f29a03d5d22ec810237db0567",
    "support"
   ],
-  "css/WOFF2/support/FontsToInstall/SFNT-TTF-Fallback.ttf": [
+  "css/WOFF2/support/SFNT-TTF-Fallback.ttf": [
    "1571b21e7321d39aa6eff906b257d01f4a62720f",
    "support"
   ],
-  "css/WOFF2/support/FontsToInstall/SFNT-TTF-Reference.ttf": [
+  "css/WOFF2/support/SFNT-TTF-Reference.ttf": [
    "506bfbd3b10b298aa6d0c54d4c33b732233d787b",
    "support"
   ],
   "css/WOFF2/support/available-001a.xht": [
-   "80db93d654d1315ad2f434d4a85c4476a213da9f",
+   "b3855f0368089ab100ed07556c86ba722379afb5",
    "support"
   ],
   "css/WOFF2/support/available-001b.xht": [
-   "61545e8d87dd4acb6fc92786bd1c2b5322001f08",
+   "c8cd9549a60cc51f2a151d68e5a8f1fc1d171a45",
    "support"
   ],
   "css/WOFF2/support/blocks-extraneous-data-001.woff2": [
@@ -489631,7 +491489,7 @@
    "support"
   ],
   "css/WOFF2/support/index.css": [
-   "781dcc9f9bc48ecdc92e3313ce1e03f56346bab6",
+   "c6ac02160548778cf67b580f42c1bd931db28fd5",
    "support"
   ],
   "css/WOFF2/support/metadata-noeffect-001.woff2": [
@@ -490714,6 +492572,10 @@
    "7d8a2a6730e623f78bbe967d0a9f41cb5a2ef547",
    "support"
   ],
+  "css/WOFF2/support/test-fonts.css": [
+   "ca9d07ca98892d650078400dc0ccfdff86cd879d",
+   "support"
+  ],
   "css/WOFF2/support/valid-001.woff2": [
    "55763656ef3ea215d39b8aadf2f85d2c9ddf0bb6",
    "support"
@@ -490747,240 +492609,240 @@
    "support"
   ],
   "css/WOFF2/tabledata-bad-origlength-loca-001-ref.xht": [
-   "f2aa2f4f45daf5415ec9d79639636bbae831ff0a",
+   "23e4a5d259db6d0679dcd2c81fc45a460a899df9",
    "support"
   ],
   "css/WOFF2/tabledata-bad-origlength-loca-001.xht": [
-   "1faa5f17fd20120d83955f5af350fd4cc3838657",
-   "manual"
+   "8f94384be3e77a323bab39e458f5da9dc22b6d19",
+   "reftest"
   ],
   "css/WOFF2/tabledata-bad-origlength-loca-002-ref.xht": [
-   "60a4d77d488f5f2df018bdbc65acb8fda2b2c545",
+   "69f06b681a95124f3c777116b9b4337e3de03672",
    "support"
   ],
   "css/WOFF2/tabledata-bad-origlength-loca-002.xht": [
-   "679ed4dd3d47d19062d1c31eca227a0f09715c21",
-   "manual"
+   "6b597b3643818e6468eae7dc2f96c5e32009062d",
+   "reftest"
   ],
   "css/WOFF2/tabledata-brotli-001-ref.xht": [
-   "e1de7ed6e835c16ff08601f2c681c0bbc2a8ce73",
+   "63e3cd528de8346f1740484b7ba871c163bb10e9",
    "support"
   ],
   "css/WOFF2/tabledata-brotli-001.xht": [
-   "9a994f3b2a3852bd81abda313ef4fd73f30299d2",
-   "manual"
+   "d7fe33ff00598dc20f705c555613bcdf08503dc0",
+   "reftest"
   ],
   "css/WOFF2/tabledata-decompressed-length-001-ref.xht": [
-   "e4f28510acb3ad2fd0b1bada46f6927d746933fa",
+   "302da5bb6e72e1e9b0a8dc3b47838024f3bb5541",
    "support"
   ],
   "css/WOFF2/tabledata-decompressed-length-001.xht": [
-   "2c4149b696418d474e8138676ab02f9ccb338d66",
-   "manual"
+   "ed9e65d9a3be2fd6a8475179dd081a6ba20f69c8",
+   "reftest"
   ],
   "css/WOFF2/tabledata-decompressed-length-002-ref.xht": [
-   "afb4ea1d1a7785d9313327b6bbdaab1c12ce98a7",
+   "25665fc2b7b811aa3fac8b34eb7094d6bbc2f0c0",
    "support"
   ],
   "css/WOFF2/tabledata-decompressed-length-002.xht": [
-   "6fc3deb28adc10350aa9dbe211a956b60e70d7d3",
-   "manual"
+   "2c6a3eda1528f314220f01713044ad6be31f72d5",
+   "reftest"
   ],
   "css/WOFF2/tabledata-decompressed-length-003-ref.xht": [
-   "e33cb1b0e6b316fef7e11f58c034a7e8ac5f057b",
+   "d4dcb767757eb3514841c956f0535197d871e90d",
    "support"
   ],
   "css/WOFF2/tabledata-decompressed-length-003.xht": [
-   "3cced3f0fd80d26efcb7258e4b9427f83780cec0",
-   "manual"
+   "9137dd8836b981590a21427b2cdfb3d481b543b2",
+   "reftest"
   ],
   "css/WOFF2/tabledata-decompressed-length-004-ref.xht": [
-   "cbfc9d771f05f2f12544ef33ec31eb5d0bf74fcc",
+   "3d3431334c8ae550b5ebbb7c98e3b1aa27fae86f",
    "support"
   ],
   "css/WOFF2/tabledata-decompressed-length-004.xht": [
-   "70c662df2842aab4c7d87d424cfd813cf242a57b",
-   "manual"
+   "f355d984f1244eaad2faf476bd6d524ef59e884b",
+   "reftest"
   ],
   "css/WOFF2/tabledata-extraneous-data-001-ref.xht": [
-   "d5c927dae4da3cba9efb4bd9d7cc6015c3db80a1",
+   "b38974e1e51939f7fc062595997437099b8c122c",
    "support"
   ],
   "css/WOFF2/tabledata-extraneous-data-001.xht": [
-   "7e6e8c9ce9e9cc5a54c52ccf78b6c33fe3d06723",
-   "manual"
+   "0292e9622a1bc2b2bdd51e09970a5ea158354f7e",
+   "reftest"
   ],
   "css/WOFF2/tabledata-glyf-bbox-001-ref.xht": [
-   "5a62c8a3562f7a8474068de329f7e402a228a476",
+   "a7324c97e670c96c84df0ca830ee29df3a4a85cb",
    "support"
   ],
   "css/WOFF2/tabledata-glyf-bbox-001.xht": [
-   "59c5cc4a633a016675b9078a81ececf86a6624c7",
-   "manual"
+   "da0584334359bab8f1169a5409684578cefedf18",
+   "reftest"
   ],
   "css/WOFF2/tabledata-glyf-bbox-002-ref.xht": [
-   "ecc2d34f9b4d319c8ac7b51293cbb77c884da5fe",
+   "09b076486c393ff68ef0aef9ebf7cedecf95045d",
    "support"
   ],
   "css/WOFF2/tabledata-glyf-bbox-002.xht": [
-   "a9e47ac9b253ecac1b43e853c4f0d502ee5901e6",
-   "manual"
+   "fb93aaabeb015ca3476ba305ad72ce01f78203f3",
+   "reftest"
   ],
   "css/WOFF2/tabledata-glyf-bbox-003-ref.xht": [
-   "1e6a99111b87e4dd1099a4bfb15a2b515c40558b",
+   "298a432d47c111ee254a528dd72b0fe96f916fa3",
    "support"
   ],
   "css/WOFF2/tabledata-glyf-bbox-003.xht": [
-   "9e6db8e48daf64a7d8154671e69952d5499caf23",
-   "manual"
+   "6ea6aa734b8a51e020605a3c29bc8d6c2edc64b5",
+   "reftest"
   ],
   "css/WOFF2/tabledata-glyf-origlength-001-ref.xht": [
-   "80ec83e53633978f5286ee782085eddc2dd06021",
+   "141febccaeb47ea7bca2334c93aea966e5e87917",
    "support"
   ],
   "css/WOFF2/tabledata-glyf-origlength-001.xht": [
-   "894b067b5e350ed55aaf2b7a041e3bf30b6cf65c",
-   "manual"
+   "03a86f4cc0bddd3ae9e43243d600815596c69b20",
+   "reftest"
   ],
   "css/WOFF2/tabledata-glyf-origlength-002-ref.xht": [
-   "5189c67fe97a840ed5af5c6ee5299e300211a311",
+   "5410057c2fc5797339492f94ce6c9fd28d5bb847",
    "support"
   ],
   "css/WOFF2/tabledata-glyf-origlength-002.xht": [
-   "2d5e26a5d86035e76c8849d0ce6bfbaa350033a9",
-   "manual"
+   "f8cacad49157188912c0eb1d7fdd1da889c141d5",
+   "reftest"
   ],
   "css/WOFF2/tabledata-non-zero-loca-001-ref.xht": [
-   "f7d1102fbacde781f950d0e15da25a5ba104a324",
+   "8ccf10f2e034bcd6b12a335698d96ed1607ec47f",
    "support"
   ],
   "css/WOFF2/tabledata-non-zero-loca-001.xht": [
-   "d576f85e88c2bffdd8315fc5958ad0674da5bf62",
-   "manual"
+   "39558fac94b2d304bdc8560fe7257a22ee678a70",
+   "reftest"
   ],
   "css/WOFF2/tabledata-recontruct-loca-001-ref.xht": [
-   "fe3b69ac0c4f3393581c38ee27ea8c60dea6a73e",
+   "b0153d9c1b994c4809419c0b8642bed17a4e985e",
    "support"
   ],
   "css/WOFF2/tabledata-recontruct-loca-001.xht": [
-   "978169eebcde63489d2911117eac94bf3b8cd160",
-   "manual"
+   "724fbc83e045f922486da644f5c792969dc2d785",
+   "reftest"
   ],
   "css/WOFF2/tabledata-transform-bad-flag-001-ref.xht": [
-   "0d28c31e354405614de181114b9e53b1f4495725",
+   "3d0091a7a0cdd01ef5bc3f439d47dc0c9d262d94",
    "support"
   ],
   "css/WOFF2/tabledata-transform-bad-flag-001.xht": [
-   "1253abb0956eeceb36c99564decb3d1f7cbcfee3",
-   "manual"
+   "a64357df0c694da0f37fecc90f5fde06a5aa2817",
+   "reftest"
   ],
   "css/WOFF2/tabledata-transform-bad-flag-002-ref.xht": [
-   "30b539b8fab6963bd7e0ff1bec8f599e9b4f783e",
+   "5b78a2cc46a90b063883fd8cc6bebcfe3c1fc09c",
    "support"
   ],
   "css/WOFF2/tabledata-transform-bad-flag-002.xht": [
-   "6c94fd12a22dcce17d7d65ed00674b6220f9bbda",
-   "manual"
+   "250b3d24ad85072b29074f6de643c80ad5f676f8",
+   "reftest"
   ],
   "css/WOFF2/tabledata-transform-hmtx-001-ref.xht": [
-   "ae04cb921aca3e8cb89ec64ed9e78c95d6b1953d",
+   "d45bfc11b55f7e46e33777f8ce33a977c925d9b3",
    "support"
   ],
   "css/WOFF2/tabledata-transform-hmtx-001.xht": [
-   "1a84cd0a83cb2669f381659eacc9f912d93512b2",
-   "manual"
+   "678d97ac99ab810753863c28377b4fbbcad11865",
+   "reftest"
   ],
   "css/WOFF2/tabledata-transform-hmtx-002-ref.xht": [
-   "a9a29d99a9a9a9c522250e4ac68c67dc16ab2262",
+   "09157abdcb1bffabaf6c95d36b05ee73347561fd",
    "support"
   ],
   "css/WOFF2/tabledata-transform-hmtx-002.xht": [
-   "a7e78eb0f14244fb576ecd5ccc394321a2bfb7a3",
-   "manual"
+   "c2632a71a43b78958c54ef3dce5d2245b36e7d97",
+   "reftest"
   ],
   "css/WOFF2/tabledata-transform-hmtx-003-ref.xht": [
-   "7649bf4aac8c8e97c67281afaf66057bd27d4497",
+   "5011e524627f708178ba216685d1a0761403c8bf",
    "support"
   ],
   "css/WOFF2/tabledata-transform-hmtx-003.xht": [
-   "f14a7968ba2c8a7fffd4bcb071e4deb49479f4f8",
-   "manual"
+   "7d306fa31cf5ed0d343fa5e882d306c5bbb06d16",
+   "reftest"
   ],
   "css/WOFF2/tabledata-transform-hmtx-004-ref.xht": [
-   "b69ec1aa0d7f869ca3419712be45d62bf462149a",
+   "157caf1d1ef583b6800f74dd309e01b4db0aa03a",
    "support"
   ],
   "css/WOFF2/tabledata-transform-hmtx-004.xht": [
-   "af0863fbb12537c977e65ac96df1e623a19926b7",
-   "manual"
+   "31c7e2d198ad3aa2c0cd5db8cf0d9e823edb62a3",
+   "reftest"
   ],
   "css/WOFF2/testcaseindex.xht": [
-   "fd17034007210d4f0028cd0d22beb51c7caedbdc",
+   "cecf29c942d42bd8c8bc5df0c3e3f2ca3ee35016",
    "support"
   ],
   "css/WOFF2/valid-001-ref.xht": [
-   "59a81ceae7879cf2152002acfef9b900b62b0108",
+   "713d705bcdd0563aad4d578c231543b9eb565c1e",
    "support"
   ],
   "css/WOFF2/valid-001.xht": [
-   "69612b07cddcc325252333a8962c8365345aea65",
-   "manual"
+   "a06ea45323797327bbc793ad09fe0972aef6ddea",
+   "reftest"
   ],
   "css/WOFF2/valid-002-ref.xht": [
-   "d5d309ca403948476ca438c0ded50c57bbd66d91",
+   "f1c963020d352486a9d6ecc9fcde20e39595a9bb",
    "support"
   ],
   "css/WOFF2/valid-002.xht": [
-   "afeb663fe174c02320d2e46efd1dd0238b579367",
-   "manual"
+   "39d4131f2b8f3dc978d7945abe33e286e42a5cbf",
+   "reftest"
   ],
   "css/WOFF2/valid-003-ref.xht": [
-   "42419c3dbd866f388741277f6a3ae15804486585",
+   "467cc526bd65f9cfb13d94bfc7e3998592bf2f4e",
    "support"
   ],
   "css/WOFF2/valid-003.xht": [
-   "8f9d73b38459a883252729ed039ee063145c3538",
-   "manual"
+   "e6a4e250a2abea2c2c254b983de0e7820a437983",
+   "reftest"
   ],
   "css/WOFF2/valid-004-ref.xht": [
-   "e09864ae5c6d9b05b069315b4553a9da043d500f",
+   "812a886a3eb1e5a6feda2436d96455ad40cd2b68",
    "support"
   ],
   "css/WOFF2/valid-004.xht": [
-   "b37aecb20d4d3ace2aa0835fc163ff18b71ef027",
-   "manual"
+   "8e0356a5d33d73199e6233405b9aed49e1ec6d8d",
+   "reftest"
   ],
   "css/WOFF2/valid-005-ref.xht": [
-   "6f491d1f7f0ee39c77ab7afa65fd12b8fb2a3fbe",
+   "2e99a830763802fd26d867c0a509592e1343fec8",
    "support"
   ],
   "css/WOFF2/valid-005.xht": [
-   "78bec525758efe23ae234d89775d3c60f9228a40",
-   "manual"
+   "4d712bd8bf2cf9ce86ea1f1f438929855b338ed8",
+   "reftest"
   ],
   "css/WOFF2/valid-006-ref.xht": [
-   "9c8a91bc234b3fd9a82057d43ae2a3208d456290",
+   "177427d16881e667a5fca9b8bf4c826aac72b006",
    "support"
   ],
   "css/WOFF2/valid-006.xht": [
-   "32b33e8d359a255a5d969c7071b1cac665ca4974",
-   "manual"
+   "37e53b1585235bc9e8790c5a9490c77851262130",
+   "reftest"
   ],
   "css/WOFF2/valid-007-ref.xht": [
-   "a4a036e0a0cff47997fef560ad161ba6d44bf892",
+   "f1b8f73946a00a2ea20b4d5fbb562cd67d9ac60f",
    "support"
   ],
   "css/WOFF2/valid-007.xht": [
-   "7500810eb877943de3040614573458d1e7c07ee3",
-   "manual"
+   "b2f834f42eb7863477163025ca0752c072d0db40",
+   "reftest"
   ],
   "css/WOFF2/valid-008-ref.xht": [
-   "a7412c037dcfe8584d144eaa35a35a6679632883",
+   "51ece733973b3891c20a73509eeced07677eed75",
    "support"
   ],
   "css/WOFF2/valid-008.xht": [
-   "7a6c1866bbb7a27eabdc102aadd5005df3c74e21",
-   "manual"
+   "f0351a814f37471d2a58d8fd8e20c086ebe324d2",
+   "reftest"
   ],
   "css/build-css-testsuites.sh": [
    "0f1d955402449b61d134265ea5962d6ed93836f4",
@@ -498858,6 +500720,10 @@
    "35eb3b4cfe4505a5c9761dcecc047a8cd09f8fb9",
    "support"
   ],
+  "css/css-filter/OWNERS": [
+   "2cfbd08dc91d273609aa2b2befe52ec96e655ca8",
+   "support"
+  ],
   "css/css-filter/filtered-block-is-container-ref.html": [
    "937aebf17944a83bfb41b3d9a6035f00e975c05d",
    "support"
@@ -502539,7 +504405,7 @@
    "support"
   ],
   "css/css-fonts/font-variant-05.xht": [
-   "fee9c5cac5d976d2e92e7dd05f15b1d275260dc8",
+   "4c47b5a0366ff20fb5cc9faeb676ec8bde7f0ec6",
    "reftest"
   ],
   "css/css-fonts/font-variant-06-ref.xht": [
@@ -502771,7 +504637,7 @@
    "support"
   ],
   "css/css-fonts/font-variant-descriptor-01.html": [
-   "283cff53934f570387e025af366147b18fe6ad09",
+   "d465e4166c0827ccebddeb4f202ac7d455b28abb",
    "reftest"
   ],
   "css/css-fonts/font-variant-east-asian-01-ref.html": [
@@ -543962,6 +545828,10 @@
    "55010cf90dc7fc2ef8ec6cbd13d1ec947a823aed",
    "testharness"
   ],
+  "css/cssom/computed-style-set-property.html": [
+   "ce05e756acf5a53d37d854e5e635bb68febf84a1",
+   "testharness"
+  ],
   "css/cssom/css-style-attr-decl-block.html": [
    "1d68a3fd1560308c0d2f3478864d84f4361e4ab9",
    "testharness"
@@ -594115,7 +595985,7 @@
    "testharness"
   ],
   "picture-in-picture/resources/picture-in-picture-helpers.js": [
-   "2ad1e3e8c5b857fa747b840457f06e943461558b",
+   "f31184184ba9a74456ab449c480a6777e860a81a",
    "support"
   ],
   "picture-in-picture/shadow-dom.html": [
@@ -604818,6 +606688,10 @@
    "8402c159967bb6e91903adc52e7d68c8d2443a72",
    "testharness"
   ],
+  "service-workers/service-worker/dedicated-worker-service-worker-interception.https.html": [
+   "f0eefc8b5ca0e26d87bddd7821bcfcb2a387d6f8",
+   "testharness"
+  ],
   "service-workers/service-worker/detached-context.https.html": [
    "81fc149311b54f92a2daedd81ffaba33fb88e831",
    "testharness"
@@ -606266,6 +608140,22 @@
    "f7c6bb3ba222dc35a09ef806a7c6d145339f9eb2",
    "support"
   ],
+  "service-workers/service-worker/resources/service-worker-interception-dynamic-import-worker.js": [
+   "4b123607e3cb215ed6ebcb1d6c88793c2245be50",
+   "support"
+  ],
+  "service-workers/service-worker/resources/service-worker-interception-network-worker.js": [
+   "d14febde5e8eceecc45e6104bb91fbe41ae6dea7",
+   "support"
+  ],
+  "service-workers/service-worker/resources/service-worker-interception-service-worker.js": [
+   "323d1116c23cd9bfb9d6b14e7d815dfb132e36d0",
+   "support"
+  ],
+  "service-workers/service-worker/resources/service-worker-interception-static-import-worker.js": [
+   "0f321563c9d64c45859f548988d0701e4e6373c5",
+   "support"
+  ],
   "service-workers/service-worker/resources/shared-worker-controlled.js": [
    "9ae937c2e8499991432caa4587eb68fe2998f503",
    "support"
diff --git a/tests/wpt/metadata/css/CSS2/selectors/first-letter-punctuation-033.xht.ini b/tests/wpt/metadata/css/CSS2/selectors/first-letter-punctuation-033.xht.ini
index 075153c4929..560c2795527 100644
--- a/tests/wpt/metadata/css/CSS2/selectors/first-letter-punctuation-033.xht.ini
+++ b/tests/wpt/metadata/css/CSS2/selectors/first-letter-punctuation-033.xht.ini
@@ -1,3 +1,3 @@
 [first-letter-punctuation-033.xht]
   type: reftest
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini b/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini
index 8462217d346..7ff7dbf5769 100644
--- a/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini
+++ b/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini
@@ -101,48 +101,6 @@
   [Matching font-stretch: '100%' should prefer '100%' over '110% 120%']
     expected: FAIL
 
-  [Matching font-stretch: '100%' should prefer '110% 120%' over '115% 116%']
-    expected: FAIL
-
-  [Matching font-stretch: '110%' should prefer '110% 120%' over '115% 116%']
-    expected: FAIL
-
-  [Matching font-stretch: '110%' should prefer '115% 116%' over '105%']
-    expected: FAIL
-
-  [Matching font-stretch: '110%' should prefer '105%' over '100%']
-    expected: FAIL
-
-  [Matching font-stretch: '110%' should prefer '100%' over '50% 80%']
-    expected: FAIL
-
-  [Matching font-stretch: '110%' should prefer '50% 80%' over '60% 70%']
-    expected: FAIL
-
-  [Matching font-stretch: '90%' should prefer '90% 100%' over '50% 80%']
-    expected: FAIL
-
-  [Matching font-stretch: '90%' should prefer '50% 80%' over '60% 70%']
-    expected: FAIL
-
-  [Matching font-stretch: '90%' should prefer '60% 70%' over '110% 140%']
-    expected: FAIL
-
-  [Matching font-stretch: '90%' should prefer '110% 140%' over '120% 130%']
-    expected: FAIL
-
-  [Matching font-style: 'normal' should prefer 'normal' over 'oblique 0deg']
-    expected: FAIL
-
-  [Matching font-style: 'normal' should prefer 'oblique 0deg' over 'oblique 10deg 40deg']
-    expected: FAIL
-
-  [Matching font-style: 'normal' should prefer 'oblique 10deg 40deg' over 'oblique 20deg 30deg']
-    expected: FAIL
-
-  [Matching font-style: 'normal' should prefer 'oblique 20deg 30deg' over 'oblique -50deg -20deg']
-    expected: FAIL
-
   [Matching font-style: 'normal' should prefer 'oblique -50deg -20deg' over 'oblique -40deg -30deg']
     expected: FAIL
 
diff --git a/tests/wpt/metadata/css/css-fonts/variations/font-weight-matching.html.ini b/tests/wpt/metadata/css/css-fonts/variations/font-weight-matching.html.ini
index b075270b5f3..33589c5901a 100644
--- a/tests/wpt/metadata/css/css-fonts/variations/font-weight-matching.html.ini
+++ b/tests/wpt/metadata/css/css-fonts/variations/font-weight-matching.html.ini
@@ -29,15 +29,6 @@
   [Test @font-face matching for weight 1000]
     expected: FAIL
 
-  [Test @font-face matching for weight 99]
-    expected: FAIL
-
-  [Test @font-face matching for weight 100]
-    expected: FAIL
-
-  [Test @font-face matching for weight 249]
-    expected: FAIL
-
   [Test @font-face matching for weight 420]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/css/css-values/vh_not_refreshing_on_chrome.html.ini b/tests/wpt/metadata/css/css-values/vh_not_refreshing_on_chrome.html.ini
new file mode 100644
index 00000000000..26435e28b09
--- /dev/null
+++ b/tests/wpt/metadata/css/css-values/vh_not_refreshing_on_chrome.html.ini
@@ -0,0 +1,2 @@
+[vh_not_refreshing_on_chrome.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom/computed-style-set-property.html.ini b/tests/wpt/metadata/css/cssom/computed-style-set-property.html.ini
new file mode 100644
index 00000000000..835413f2ba6
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom/computed-style-set-property.html.ini
@@ -0,0 +1,10 @@
+[computed-style-set-property.html]
+  [Computed style parent (should be null)]
+    expected: FAIL
+
+  [Exception thrown when trying to change a computed style alias via property]
+    expected: FAIL
+
+  [Exception thrown when trying to change a computed style alias via setProperty]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/javascript-url-abort-return-value-undefined.tentative.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/javascript-url-abort-return-value-undefined.tentative.html.ini
index 5b38c37b086..78879bad5f1 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/javascript-url-abort-return-value-undefined.tentative.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/javascript-url-abort-return-value-undefined.tentative.html.ini
@@ -1,4 +1,5 @@
 [javascript-url-abort-return-value-undefined.tentative.html]
+  expected: TIMEOUT
   [Not aborting fetch for javascript:undefined navigation]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
index 559c27de134..1de3f8d68b2 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
@@ -172,63 +172,3 @@
   [XHTML img usemap="http://example.org/#garbage-before-hash-id"]
     expected: FAIL
 
-  [HTML (quirks) IMG usemap="no-hash-name"]
-    expected: FAIL
-
-  [HTML (quirks) IMG usemap="no-hash-id"]
-    expected: FAIL
-
-  [HTML (quirks) IMG usemap="hash-last#"]
-    expected: FAIL
-
-  [HTML (quirks) IMG usemap=""]
-    expected: FAIL
-
-  [HTML (quirks) IMG usemap="#"]
-    expected: FAIL
-
-  [HTML (quirks) IMG usemap="#percent-escape-name-%41"]
-    expected: FAIL
-
-  [HTML (quirks) IMG usemap="#percent-escape-id-%41"]
-    expected: FAIL
-
-  [HTML (quirks) IMG usemap="#no-such-map"]
-    expected: FAIL
-
-  [HTML (quirks) IMG usemap="#different-CASE-name"]
-    expected: FAIL
-
-  [HTML (quirks) IMG usemap="#different-CASE-id"]
-    expected: FAIL
-
-  [XHTML img usemap="no-hash-name"]
-    expected: FAIL
-
-  [XHTML img usemap="no-hash-id"]
-    expected: FAIL
-
-  [XHTML img usemap="hash-last#"]
-    expected: FAIL
-
-  [XHTML img usemap=""]
-    expected: FAIL
-
-  [XHTML img usemap="#"]
-    expected: FAIL
-
-  [XHTML img usemap="#percent-escape-name-%41"]
-    expected: FAIL
-
-  [XHTML img usemap="#percent-escape-id-%41"]
-    expected: FAIL
-
-  [XHTML img usemap="#no-such-map"]
-    expected: FAIL
-
-  [XHTML img usemap="#different-CASE-name"]
-    expected: FAIL
-
-  [XHTML img usemap="#different-CASE-id"]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/css/iframe/hide_after_load.html.ini b/tests/wpt/mozilla/meta/css/iframe/hide_after_load.html.ini
new file mode 100644
index 00000000000..65c78fd3a4a
--- /dev/null
+++ b/tests/wpt/mozilla/meta/css/iframe/hide_after_load.html.ini
@@ -0,0 +1,2 @@
+[hide_after_load.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/mozilla/meta/mozilla/img_find_non_sibling_map.html.ini b/tests/wpt/mozilla/meta/mozilla/img_find_non_sibling_map.html.ini
new file mode 100644
index 00000000000..c6be0f3c561
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/img_find_non_sibling_map.html.ini
@@ -0,0 +1,2 @@
+[img_find_non_sibling_map.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/rapid-resizing.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/rapid-resizing.html.ini
new file mode 100644
index 00000000000..1e2567027d8
--- /dev/null
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/rapid-resizing.html.ini
@@ -0,0 +1,5 @@
+[rapid-resizing.html]
+  expected: TIMEOUT
+  [Overall test]
+    expected: NOTRUN
+
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-release-with-workers.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-release-with-workers.html.ini
new file mode 100644
index 00000000000..7aab2f5f662
--- /dev/null
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-release-with-workers.html.ini
@@ -0,0 +1,5 @@
+[context-release-with-workers.html]
+  expected: TIMEOUT
+  [Overall test]
+    expected: NOTRUN
+
diff --git a/tests/wpt/web-platform-tests/IndexedDB/bigint_value.htm b/tests/wpt/web-platform-tests/IndexedDB/bigint_value.htm
new file mode 100644
index 00000000000..589eeabe6c6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/IndexedDB/bigint_value.htm
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>IndexedDB: BigInt keys and values</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support.js"></script>
+
+<script>
+// BigInt and BigInt objects are supported in serialization, per
+// https://github.com/whatwg/html/pull/3480
+// This support allows them to be used as IndexedDB values.
+
+function value_test(value, predicate, name) {
+    async_test(t => {
+        t.step(function() {
+            assert_true(predicate(value),
+                        "Predicate should return true for the initial value.");
+        });
+
+        createdb(t).onupgradeneeded = t.step_func(e => {
+            e.target.result
+                    .createObjectStore("store")
+                    .add(value, 1);
+
+            e.target.onsuccess = t.step_func(e => {
+                e.target.result
+                        .transaction("store")
+                        .objectStore("store")
+                        .get(1)
+                        .onsuccess = t.step_func(e =>
+                {
+                    assert_true(predicate(e.target.result),
+                                "Predicate should return true for the deserialized result.");
+                    t.done();
+                });
+            });
+        });
+    }, "BigInts as values in IndexedDB - " + name);
+}
+
+value_test(1n,
+           x => x === 1n,
+           "primitive BigInt");
+value_test(Object(1n),
+           x => typeof x === 'object' &&
+                x instanceof BigInt &&
+                x.valueOf() === 1n,
+           "BigInt object");
+value_test({val: 1n},
+           x => x.val === 1n,
+           "primitive BigInt inside object");
+value_test({val: Object(1n)},
+           x => x.val.valueOf() === 1n &&
+                x.val instanceof BigInt &&
+                x.val.valueOf() === 1n,
+           "BigInt object inside object");
+
+// However, BigInt is not supported as an IndexedDB key; support
+// has been proposed in the following PR, but that change has not
+// landed at the time this patch was written
+// https://github.com/w3c/IndexedDB/pull/231
+
+function invalidKey(key, name) {
+    test(t => {
+        assert_throws("DataError", () => indexedDB.cmp(0, key));
+    }, "BigInts as keys in IndexedDB - " + name);
+}
+
+invalidKey(1n, "primitive BigInt");
+// Still an error even if the IndexedDB patch lands
+invalidKey(Object(1n), "BigInt object");
+</script>
diff --git a/tests/wpt/web-platform-tests/README.md b/tests/wpt/web-platform-tests/README.md
index db5612ea03c..6fa4f74490b 100644
--- a/tests/wpt/web-platform-tests/README.md
+++ b/tests/wpt/web-platform-tests/README.md
@@ -35,7 +35,7 @@ To get the tests running, you need to set up the test domains in your
 [`hosts` file](http://en.wikipedia.org/wiki/Hosts_%28file%29%23Location_in_the_file_system).
 
 The necessary content can be generated with `./wpt make-hosts-file`; on
-Windows, you will need to preceed the prior command with `python` or
+Windows, you will need to precede the prior command with `python` or
 the path to the Python binary (`python wpt make-hosts-file`).
 
 For example, on most UNIX-like systems, you can setup the hosts file with:
@@ -62,7 +62,7 @@ The test server can be started using
 ./wpt serve
 ```
 
-**On Windows**: You will need to preceed the prior command with
+**On Windows**: You will need to precede the prior command with
 `python` or the path to the python binary.
 ```bash
 python wpt serve
@@ -104,7 +104,7 @@ line syntax is:
 ./wpt run product [tests]
 ```
 
-**On Windows**: You will need to preceed the prior command with
+**On Windows**: You will need to precede the prior command with
 `python` or the path to the python binary.
 ```bash
 python wpt run product [tests]
@@ -169,7 +169,7 @@ git submodule update --init --recursive
 ```
 
 Prior to commit `39d07eb01fab607ab1ffd092051cded1bdd64d78` submodules
-were requried for basic functionality. If you are working with an
+were required for basic functionality. If you are working with an
 older checkout, the above command is required in all cases.
 
 When moving between a commit prior to `39d07eb` and one after it git
@@ -181,7 +181,7 @@ error: The following untracked working tree files would be overwritten by checko
 […]
 ```
 
-followed by a long list of files. To avoid this error remove
+...followed by a long list of files. To avoid this error, remove
 the `resources` and `tools` directories before switching branches:
 
 ```
@@ -203,7 +203,7 @@ Failed to recurse into submodule path 'resources'
 Failed to recurse into submodule path 'tools'
 ```
 
-then remove the `tools` and `resources` directories, as above.
+...then remove the `tools` and `resources` directories, as above.
 
 <span id="windows-notes">Windows Notes</span>
 =============================================
@@ -227,7 +227,7 @@ line endings, as it will cause lint errors. For git, please set
 Certificates
 ============
 
-By default pregenerated certificates for the web-platform.test domain
+By default pre-generated certificates for the web-platform.test domain
 are provided in [`tools/certs`](tools/certs). If you wish to generate new
 certificates for any reason it's possible to use OpenSSL when starting
 the server, or starting a test run, by providing the
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/available-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/available-001.xht
index 5b3cd165de0..cba147780b4 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/available-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/available-001.xht
@@ -6,7 +6,6 @@
 		<link rel="author" title="Chris Lilley" href="http://www.w3.org/People" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#General" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-css3font-available" />
-		<meta name="flags" content="font" />
 		<meta name="assert" content="Linked fonts are only available to the documents that reference them" />
 		<style type="text/css"><![CDATA[
 			body {
@@ -23,7 +22,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears <em>twice</em> below.</p>
 		<iframe src="support/available-001a.xht" />
 		<iframe src="support/available-001b.xht" />
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-001-ref.xht
index a60fc6057f3..df7edfe563e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-001-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-extraneous-reject" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="There are four null bytes between the header and the table directory." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-001.xht
index b8aa7e54389..6cf0351fda0 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-001.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-extraneous-reject" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="blocks-extraneous-data-001-ref.xht" />
 		<meta name="assert" content="There are four null bytes between the header and the table directory." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/blocks-extraneous-data-001.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-002-ref.xht
index 308f03c6f11..de7f62c5913 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-002-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-extraneous-reject" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="There are four null bytes between the table directory and the table data." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-002.xht
index 86ca716bd9e..09960d820d0 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-002.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-extraneous-reject" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="blocks-extraneous-data-002-ref.xht" />
 		<meta name="assert" content="There are four null bytes between the table directory and the table data." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/blocks-extraneous-data-002.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-003-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-003-ref.xht
index 39cab6d0d4d..17e43ef9b25 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-003-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-003-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-extraneous-reject" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="There are four null bytes after the table data block and there is no metadata or private data." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-003.xht b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-003.xht
index ee300af8bd5..6f1a19ee13f 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-003.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-003.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-extraneous-reject" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="blocks-extraneous-data-003-ref.xht" />
 		<meta name="assert" content="There are four null bytes after the table data block and there is no metadata or private data." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/blocks-extraneous-data-003.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-004-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-004-ref.xht
index 1eaabaef5c9..a8f33aed085 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-004-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-004-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-extraneous-reject" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="There are four null bytes between the table data and the metadata." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-004.xht b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-004.xht
index d79744ac7e5..010d3e1bbd8 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-004.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-004.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-extraneous-reject" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="blocks-extraneous-data-004-ref.xht" />
 		<meta name="assert" content="There are four null bytes between the table data and the metadata." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/blocks-extraneous-data-004.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-005-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-005-ref.xht
index 4d6cb837033..ca382e019f3 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-005-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-005-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-extraneous-reject" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="There are four null bytes between the table data and the private data." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-005.xht b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-005.xht
index 00ec29f2479..2c7ce840cbe 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-005.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-005.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-extraneous-reject" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="blocks-extraneous-data-005-ref.xht" />
 		<meta name="assert" content="There are four null bytes between the table data and the private data." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/blocks-extraneous-data-005.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-006-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-006-ref.xht
index 5c5be00da27..95188bf1587 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-006-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-006-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-extraneous-reject" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="There are four null bytes between the metadata and the private data." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-006.xht b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-006.xht
index f6cc64a9275..262fd3ab5b7 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-006.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-006.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-extraneous-reject" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="blocks-extraneous-data-006-ref.xht" />
 		<meta name="assert" content="There are four null bytes between the metadata and the private data." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/blocks-extraneous-data-006.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-007-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-007-ref.xht
index 9b303936d77..3a3e7968bfb 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-007-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-007-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-extraneous-reject" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="There are four null bytes after the metadata and there is no private data." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-007.xht b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-007.xht
index b88c1746944..9e2589ac2c9 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-007.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-007.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-extraneous-reject" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="blocks-extraneous-data-007-ref.xht" />
 		<meta name="assert" content="There are four null bytes after the metadata and there is no private data." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/blocks-extraneous-data-007.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-008-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-008-ref.xht
index 9cc20a9b932..3e73158de75 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-008-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-008-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-extraneous-reject" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="There are four null bytes after the private data." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-008.xht b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-008.xht
index 0fbfbb6e4a7..1424ac0f0af 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-008.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-008.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-extraneous-reject" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="blocks-extraneous-data-008-ref.xht" />
 		<meta name="assert" content="There are four null bytes after the private data." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/blocks-extraneous-data-008.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-001-ref.xht
index d6af8b583da..ce2612001d0 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-001-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-overlap-reject" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The metadata offset is four bytes before the end of the table data." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-001.xht
index 6b6d54f5785..5d78f61252c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-001.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-overlap-reject" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="blocks-overlap-001-ref.xht" />
 		<meta name="assert" content="The metadata offset is four bytes before the end of the table data." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/blocks-overlap-001.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-002-ref.xht
index ebeb8697b56..9245ad88351 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-002-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-overlap-reject" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The private data offset is four bytes before the end of the table data." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-002.xht
index 213b2596ce1..e524f76cd86 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-002.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-overlap-reject" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="blocks-overlap-002-ref.xht" />
 		<meta name="assert" content="The private data offset is four bytes before the end of the table data." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/blocks-overlap-002.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-003-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-003-ref.xht
index 4097d13ca64..a45362fbc78 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-003-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-003-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-overlap-reject" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The private data offset is four bytes before the end of the metadata." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-003.xht b/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-003.xht
index a397ac96cad..16e5dccdcd9 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-003.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-003.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-overlap-reject" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="blocks-overlap-003-ref.xht" />
 		<meta name="assert" content="The private data offset is four bytes before the end of the metadata." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/blocks-overlap-003.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/datatypes-alt-255uint16-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/datatypes-alt-255uint16-001-ref.xht
index 5bdc39d0440..8f157deb9cd 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/datatypes-alt-255uint16-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/datatypes-alt-255uint16-001-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTypes" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustAccept255UInt16" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="Valid TTF flavored WOFF with different valid representation of the same 255UInt16 encoded number" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/datatypes-alt-255uint16-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/datatypes-alt-255uint16-001.xht
index 34cec5fc805..fc4eaf5a290 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/datatypes-alt-255uint16-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/datatypes-alt-255uint16-001.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTypes" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustAccept255UInt16" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="datatypes-alt-255uint16-001-ref.xht" />
 		<meta name="assert" content="Valid TTF flavored WOFF with different valid representation of the same 255UInt16 encoded number" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/datatypes-alt-255uint16-001.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-001-ref.xht
index c56c6c1a840..67dced95f87 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-001-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTypes" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustRejectInvalidBase128" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="Invalid TTF flavored WOFF that has UIntBase128 numbers with leading zeros" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-001.xht
index ee3b51e38e2..49db875bad6 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-001.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTypes" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustRejectInvalidBase128" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="datatypes-invalid-base128-001-ref.xht" />
 		<meta name="assert" content="Invalid TTF flavored WOFF that has UIntBase128 numbers with leading zeros" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/datatypes-invalid-base128-001.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-002-ref.xht
index b35288f19da..74d4b877e05 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-002-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTypes" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustRejectInvalidBase128" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="Invalid TTF flavored WOFF that has UIntBase128 numbers which exceed 2^{32}-1" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-002.xht
index e7b7f43e92a..6e47dbc0ccb 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-002.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTypes" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustRejectInvalidBase128" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="datatypes-invalid-base128-002-ref.xht" />
 		<meta name="assert" content="Invalid TTF flavored WOFF that has UIntBase128 numbers which exceed 2^{32}-1" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/datatypes-invalid-base128-002.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-003-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-003-ref.xht
index 7c74bb6d4e9..380e7fb5635 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-003-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-003-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTypes" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustRejectInvalidBase128" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="Invalid TTF flavored WOFF that has UIntBase128 numbers longer than 5 bytes" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-003.xht b/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-003.xht
index bbfb15264c3..7d59592aeaa 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-003.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-003.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTypes" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustRejectInvalidBase128" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="datatypes-invalid-base128-003-ref.xht" />
 		<meta name="assert" content="Invalid TTF flavored WOFF that has UIntBase128 numbers longer than 5 bytes" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/datatypes-invalid-base128-003.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/directory-mismatched-tables-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/directory-mismatched-tables-001-ref.xht
index f5fc01bcadb..ce5df1ecc65 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/directory-mismatched-tables-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/directory-mismatched-tables-001-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#table_dir_format" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustCheckRejectMismatchedTables" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="Invalid TTF flavored WOFF font collection with two pairs of mismatched glyf/loca tables" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/directory-mismatched-tables-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/directory-mismatched-tables-001.xht
index 3ab384ebb95..5edf31c96d7 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/directory-mismatched-tables-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/directory-mismatched-tables-001.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#table_dir_format" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustCheckRejectMismatchedTables" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="directory-mismatched-tables-001-ref.xht" />
 		<meta name="assert" content="Invalid TTF flavored WOFF font collection with two pairs of mismatched glyf/loca tables" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/directory-mismatched-tables-001.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-length-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/header-length-001-ref.xht
index c7509bceda9..83a430091ca 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/header-length-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/header-length-001-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#woff20Header" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#woff20Header" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The length field contains a value that is four bytes shorter than the actual data." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-length-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/header-length-001.xht
index 846aae63c18..0fc9b054166 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/header-length-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/header-length-001.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#woff20Header" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#woff20Header" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="header-length-001-ref.xht" />
 		<meta name="assert" content="The length field contains a value that is four bytes shorter than the actual data." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/header-length-001.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-length-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/header-length-002-ref.xht
index 5cd7847b92b..996aba0b129 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/header-length-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/header-length-002-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#woff20Header" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#woff20Header" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The length field contains a value that is four bytes longer than the actual data." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-length-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/header-length-002.xht
index 2c925e7103a..1ddba6b451d 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/header-length-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/header-length-002.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#woff20Header" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#woff20Header" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="header-length-002-ref.xht" />
 		<meta name="assert" content="The length field contains a value that is four bytes longer than the actual data." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/header-length-002.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-numTables-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/header-numTables-001-ref.xht
index 35eb5dcb6a1..00bb819fc8b 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/header-numTables-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/header-numTables-001-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#woff20Header" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#woff20Header" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The header contains 0 in the numTables field. A table directory and table data are present." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-numTables-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/header-numTables-001.xht
index fd2b6fc5099..b1f31c6321f 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/header-numTables-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/header-numTables-001.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#woff20Header" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#woff20Header" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="header-numTables-001-ref.xht" />
 		<meta name="assert" content="The header contains 0 in the numTables field. A table directory and table data are present." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/header-numTables-001.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-reserved-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/header-reserved-001-ref.xht
index 07c8038de2e..0e192fbb95e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/header-reserved-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/header-reserved-001-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#woff20Header" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustNotUseReservedValue" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The reserved field contains 1." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-reserved-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/header-reserved-001.xht
index dadaa3d1e6d..c0809249a69 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/header-reserved-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/header-reserved-001.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#woff20Header" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustNotUseReservedValue" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="header-reserved-001-ref.xht" />
 		<meta name="assert" content="The reserved field contains 1." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/header-reserved-001.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-signature-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/header-signature-001-ref.xht
index 83f6da0ed4f..1ea6ea55e6f 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/header-signature-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/header-signature-001-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#woff20Header" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-noMagicNumber-reject" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The signature field contains XXXX instead of wOFF." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-signature-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/header-signature-001.xht
index 3562411d38e..32e06d3bc09 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/header-signature-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/header-signature-001.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#woff20Header" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-noMagicNumber-reject" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="header-signature-001-ref.xht" />
 		<meta name="assert" content="The signature field contains XXXX instead of wOFF." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/header-signature-001.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-totalsfntsize-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/header-totalsfntsize-001-ref.xht
index 35084890f77..899c091b25e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/header-totalsfntsize-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/header-totalsfntsize-001-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#woff20Header" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustNotRejectIncorrectTotalSize" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The totalSfntSize field contains a too small incorrect value." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-totalsfntsize-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/header-totalsfntsize-001.xht
index 6e335856d28..f63c7fee2c4 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/header-totalsfntsize-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/header-totalsfntsize-001.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#woff20Header" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustNotRejectIncorrectTotalSize" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="header-totalsfntsize-001-ref.xht" />
 		<meta name="assert" content="The totalSfntSize field contains a too small incorrect value." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/header-totalsfntsize-001.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-totalsfntsize-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/header-totalsfntsize-002-ref.xht
index 2940036db70..4892059d6e4 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/header-totalsfntsize-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/header-totalsfntsize-002-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#woff20Header" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustNotRejectIncorrectTotalSize" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The totalSfntSize field contains a too big incorrect value." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-totalsfntsize-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/header-totalsfntsize-002.xht
index 6f9bce71555..1952d2e76bc 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/header-totalsfntsize-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/header-totalsfntsize-002.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#woff20Header" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustNotRejectIncorrectTotalSize" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="header-totalsfntsize-002-ref.xht" />
 		<meta name="assert" content="The totalSfntSize field contains a too big incorrect value." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/header-totalsfntsize-002.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadata-noeffect-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadata-noeffect-001-ref.xht
index 4e363a3df2b..6eecea6d580 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadata-noeffect-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadata-noeffect-001-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-noeffect" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The file has no metadata." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadata-noeffect-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadata-noeffect-001.xht
index 2d539ce9c63..ce104bf9d02 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadata-noeffect-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadata-noeffect-001.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-noeffect" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadata-noeffect-001-ref.xht" />
 		<meta name="assert" content="The file has no metadata." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadata-noeffect-001.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadata-noeffect-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadata-noeffect-002-ref.xht
index f6405da497c..ebc3fa8719c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadata-noeffect-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadata-noeffect-002-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-maydisplay" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The file has metadata." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadata-noeffect-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadata-noeffect-002.xht
index 4efa5dfa5b1..442464353a5 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadata-noeffect-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadata-noeffect-002.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-maydisplay" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadata-noeffect-002-ref.xht" />
 		<meta name="assert" content="The file has metadata." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadata-noeffect-002.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-authoritative-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-authoritative-001-ref.xht
index caf48c41e32..a48dac1157b 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-authoritative-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-authoritative-001-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-authoritative" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The name table and metadata fields are out of sync. The name table contains FAIL and the metadata contains PASS for unique id, vendor name, vendor url, credit name, credit url, description, license, license url, copyright and trademark." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<p>The Extended Metadata Block test fails if the word FAIL appears in the metadata display.</p>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-authoritative-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-authoritative-001.xht
index 70d4eec15c7..4af9fcd69aa 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-authoritative-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-authoritative-001.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-authoritative" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-authoritative-001-ref.xht" />
 		<meta name="assert" content="The name table and metadata fields are out of sync. The name table contains FAIL and the metadata contains PASS for unique id, vendor name, vendor url, credit name, credit url, description, license, license url, copyright and trademark." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-authoritative-001.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<p>The Extended Metadata Block test fails if the word FAIL appears in the metadata display.</p>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-compression-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-compression-001-ref.xht
index 227e873be77..289d493d2d6 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-compression-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-compression-001-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-alwayscompress" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The metadata is stored in an uncompressed state and therefore does not have the proper compression format." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-compression-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-compression-001.xht
index 54098673348..e24f15296b3 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-compression-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-compression-001.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-alwayscompress" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-compression-001-ref.xht" />
 		<meta name="assert" content="The metadata is stored in an uncompressed state and therefore does not have the proper compression format." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-compression-001.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-001-ref.xht
index 7c2b93bbb63..940171112e3 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-001-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The xml encoding is set to UTF-8." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-001.xht
index 2c49048b1b8..5690b640e33 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-001.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-encoding-001-ref.xht" />
 		<meta name="assert" content="The xml encoding is set to UTF-8." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-encoding-001.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-002-ref.xht
index 133e124893d..e8ae831be16 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-002-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The xml encoding is set to UTF-16." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-002.xht
index d6a7ca60f3c..f177440f241 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-002.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-encoding-002-ref.xht" />
 		<meta name="assert" content="The xml encoding is set to UTF-16." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-encoding-002.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-003-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-003-ref.xht
index 9c755b28cb5..c828eb31859 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-003-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-003-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The xml encoding is set to ISO-8859-1." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-003.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-003.xht
index ae09ad5f6bf..56d901c3e07 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-003.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-003.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-encoding-003-ref.xht" />
 		<meta name="assert" content="The xml encoding is set to ISO-8859-1." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-encoding-003.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-004-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-004-ref.xht
index 11dbddc9b25..2c6f1d14012 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-004-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-004-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The xml encoding is not declared and there is no BOM." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-004.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-004.xht
index 4c8b50322b7..a61fcee14e5 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-004.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-004.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-encoding-004-ref.xht" />
 		<meta name="assert" content="The xml encoding is not declared and there is no BOM." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-encoding-004.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-005-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-005-ref.xht
index 0bc66f22aa1..d5a07cfea1f 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-005-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-005-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The xml encoding is not declared and there is a UTF-8 BOM." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-005.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-005.xht
index 494b8671aa7..cc89c1522cb 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-005.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-005.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-encoding-005-ref.xht" />
 		<meta name="assert" content="The xml encoding is not declared and there is a UTF-8 BOM." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-encoding-005.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-006-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-006-ref.xht
index 94c1bdc3734..1b75c8405ac 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-006-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-006-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The xml encoding is not declared and there is a UTF-16 BOM." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-006.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-006.xht
index 48efef1d1df..a8a0e7bf5b9 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-006.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-006.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-encoding-006-ref.xht" />
 		<meta name="assert" content="The xml encoding is not declared and there is a UTF-16 BOM." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-encoding-006.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-metaOrigLength-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-metaOrigLength-001-ref.xht
index d2637a44f66..087cf5cc9b4 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-metaOrigLength-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-metaOrigLength-001-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metaOrigLength" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The metadata decompresses to a length that is 1 byte smaller than the length defined in metaOrigLength" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-metaOrigLength-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-metaOrigLength-001.xht
index 5740b964b1a..4d27d4dea3d 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-metaOrigLength-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-metaOrigLength-001.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metaOrigLength" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-metaOrigLength-001-ref.xht" />
 		<meta name="assert" content="The metadata decompresses to a length that is 1 byte smaller than the length defined in metaOrigLength" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-metaOrigLength-001.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-metaOrigLength-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-metaOrigLength-002-ref.xht
index d8a1232b6f3..af13504f5b6 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-metaOrigLength-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-metaOrigLength-002-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metaOrigLength" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The metadata decompresses to a length that is 1 byte greater than the length defined in metaOrigLength" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-metaOrigLength-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-metaOrigLength-002.xht
index ea079de2c67..c8a24dd10b3 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-metaOrigLength-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-metaOrigLength-002.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metaOrigLength" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-metaOrigLength-002-ref.xht" />
 		<meta name="assert" content="The metadata decompresses to a length that is 1 byte greater than the length defined in metaOrigLength" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-metaOrigLength-002.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-001-ref.xht
index a299459ddaf..e6181ff0681 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-001-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element matches the schema. It contains one text element that does not have a language tag." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-001.xht
index 49b0f00d747..261330db1cb 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-001.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-001-ref.xht" />
 		<meta name="assert" content="The copyright element matches the schema. It contains one text element that does not have a language tag." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-001.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-002-ref.xht
index 9bc28073984..bdb4a8ef6ab 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-002-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element matches the schema. It contains one text element that has a language tag." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-002.xht
index 1ca04ecb198..7c8f1809a0e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-002.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-002-ref.xht" />
 		<meta name="assert" content="The copyright element matches the schema. It contains one text element that has a language tag." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-002.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-003-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-003-ref.xht
index dd736104581..11d19a5e3c7 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-003-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-003-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element matches the schema. It contains one text element that has a language tag using the lang tag instead of xml:lang." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-003.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-003.xht
index b601a21676a..c7ea9b9710b 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-003.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-003.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-003-ref.xht" />
 		<meta name="assert" content="The copyright element matches the schema. It contains one text element that has a language tag using the lang tag instead of xml:lang." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-003.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-004-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-004-ref.xht
index e2912e2bdd7..65d464d9ca8 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-004-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-004-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element matches the schema. One text element does not have a language tag. One text element has a language tag." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-004.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-004.xht
index 075ff5f6372..a834d4e96f8 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-004.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-004.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-004-ref.xht" />
 		<meta name="assert" content="The copyright element matches the schema. One text element does not have a language tag. One text element has a language tag." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-004.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-005-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-005-ref.xht
index b0289318b5a..993037fde90 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-005-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-005-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element matches the schema. Two text elements have a language tags." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-005.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-005.xht
index 5fc0f959567..5467c4a21da 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-005.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-005.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-005-ref.xht" />
 		<meta name="assert" content="The copyright element matches the schema. Two text elements have a language tags." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-005.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-006-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-006-ref.xht
index 1a680307d6c..2f4a1a63baa 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-006-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-006-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element occurs more than once." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-006.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-006.xht
index c941e6d0741..01dfbe6f63e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-006.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-006.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-006-ref.xht" />
 		<meta name="assert" content="The copyright element occurs more than once." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-006.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-007-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-007-ref.xht
index 3620d6251a1..87682b97a40 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-007-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-007-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element does not contain a text child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-007.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-007.xht
index cee19962e56..39c7b30226d 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-007.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-007.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-007-ref.xht" />
 		<meta name="assert" content="The copyright element does not contain a text child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-007.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-008-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-008-ref.xht
index 1ca527d9d4b..59a81d0ab15 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-008-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-008-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-008.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-008.xht
index 5847b86d0a7..0c114ac553f 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-008.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-008.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-008-ref.xht" />
 		<meta name="assert" content="The copyright element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-008.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-009-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-009-ref.xht
index ee605fd6e9a..cf32a759016 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-009-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-009-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element contains an unknown child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-009.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-009.xht
index 82105af56da..acd6c11765d 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-009.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-009.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-009-ref.xht" />
 		<meta name="assert" content="The copyright element contains an unknown child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-009.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-010-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-010-ref.xht
index f3f2eb68e43..40c37559821 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-010-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-010-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element contains content." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-010.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-010.xht
index a2b7c0808aa..42a3d6e2182 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-010.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-010.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-010-ref.xht" />
 		<meta name="assert" content="The copyright element contains content." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-010.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-011-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-011-ref.xht
index 80660ac257c..34279bfb63b 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-011-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-011-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element contains a text element with ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-011.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-011.xht
index 46cd0647028..7cb5e4d0a32 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-011.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-011.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-011-ref.xht" />
 		<meta name="assert" content="The copyright element contains a text element with ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-011.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-012-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-012-ref.xht
index 147c52ccdd0..46d1fb6e3da 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-012-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-012-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element contains a text element with rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-012.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-012.xht
index 7ab47f1ee5c..540c7ed69fd 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-012.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-012.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-012-ref.xht" />
 		<meta name="assert" content="The copyright element contains a text element with rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-012.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-013-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-013-ref.xht
index f1c50e67ab1..de8477b960e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-013-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-013-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element contains a text element with INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-013.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-013.xht
index 3e49a4077da..24769d1919f 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-013.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-013.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-013-ref.xht" />
 		<meta name="assert" content="The copyright element contains a text element with INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-013.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-014-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-014-ref.xht
index 3ac512c985e..df5369db7ec 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-014-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-014-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element contains a text element with &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-014.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-014.xht
index 903f7174901..9d5db7d5dbf 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-014.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-014.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-014-ref.xht" />
 		<meta name="assert" content="The copyright element contains a text element with &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-014.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-015-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-015-ref.xht
index 57994e7e7a0..ee4a7b87c8e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-015-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-015-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element contains a text element with an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-015.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-015.xht
index d09f45e8bb7..13b960feab1 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-015.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-015.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-015-ref.xht" />
 		<meta name="assert" content="The copyright element contains a text element with an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-015.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-016-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-016-ref.xht
index 9af23ef895f..85445358f7a 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-016-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-016-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element contains a text element with an unknown child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-016.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-016.xht
index ec82bf12a67..a611e8b744f 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-016.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-016.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-016-ref.xht" />
 		<meta name="assert" content="The copyright element contains a text element with an unknown child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-016.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-017-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-017-ref.xht
index 8357b16412e..1e22b05ccc1 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-017-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-017-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element contains a text element that contains a div element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-017.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-017.xht
index eec790e7886..6d25ee8e003 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-017.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-017.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-017-ref.xht" />
 		<meta name="assert" content="The copyright element contains a text element that contains a div element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-017.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-018-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-018-ref.xht
index e7fbcc184de..21beb8d52c2 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-018-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-018-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element contains a text element that contains nested div elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-018.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-018.xht
index fa9a4dcbcd4..cd721951fb3 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-018.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-018.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-018-ref.xht" />
 		<meta name="assert" content="The copyright element contains a text element that contains nested div elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-018.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-019-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-019-ref.xht
index 95d7932109c..aab0f605249 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-019-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-019-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element contains a text element that contains two div elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-019.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-019.xht
index f747876ff16..f783aa1b5ab 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-019.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-019.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-019-ref.xht" />
 		<meta name="assert" content="The copyright element contains a text element that contains two div elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-019.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-020-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-020-ref.xht
index 2fecc929e32..ef3fe1c7423 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-020-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-020-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element contains a text element that contains a div element with ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-020.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-020.xht
index f43bbbeade9..92a755034cb 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-020.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-020.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-020-ref.xht" />
 		<meta name="assert" content="The copyright element contains a text element that contains a div element with ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-020.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-021-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-021-ref.xht
index d4611ff1e84..d25765da9dd 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-021-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-021-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element contains a text element that contains a div element with rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-021.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-021.xht
index 17cd8798b07..a0cc5539fd8 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-021.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-021.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-021-ref.xht" />
 		<meta name="assert" content="The copyright element contains a text element that contains a div element with rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-021.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-022-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-022-ref.xht
index 61a4901da76..9fc713f76c8 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-022-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-022-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element contains a text element that contains a div element with INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-022.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-022.xht
index 969b435a64e..acbda842f93 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-022.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-022.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-022-ref.xht" />
 		<meta name="assert" content="The copyright element contains a text element that contains a div element with INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-022.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-023-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-023-ref.xht
index 21320620870..f86e89076df 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-023-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-023-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element contains a text element that contains a div element with &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-023.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-023.xht
index 112f09236bf..446db89b751 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-023.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-023.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-023-ref.xht" />
 		<meta name="assert" content="The copyright element contains a text element that contains a div element with &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-023.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-024-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-024-ref.xht
index a45f68ca12f..623ec35f9e6 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-024-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-024-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element contains a text element that contains a span element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-024.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-024.xht
index f9dea73c9cb..6bf715ea5ff 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-024.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-024.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-024-ref.xht" />
 		<meta name="assert" content="The copyright element contains a text element that contains a span element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-024.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-025-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-025-ref.xht
index f4d24c93b0f..7de85cc9305 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-025-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-025-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element contains a text element that contains two span elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-025.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-025.xht
index bdc41b3c1d4..8c6fe95cf5d 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-025.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-025.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-025-ref.xht" />
 		<meta name="assert" content="The copyright element contains a text element that contains two span elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-025.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-026-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-026-ref.xht
index c15e94eee5d..aa25d9accd6 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-026-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-026-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element contains a text element that contains nested span elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-026.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-026.xht
index ec97f9793f6..8a310ddfd54 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-026.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-026.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-026-ref.xht" />
 		<meta name="assert" content="The copyright element contains a text element that contains nested span elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-026.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-027-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-027-ref.xht
index 88ec95c21f0..57c103e454c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-027-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-027-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element contains a text element that contains a span element with ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-027.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-027.xht
index 6cf33031282..2655dfad8db 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-027.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-027.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-027-ref.xht" />
 		<meta name="assert" content="The copyright element contains a text element that contains a span element with ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-027.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-028-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-028-ref.xht
index 878951dc986..9b9b632fa8c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-028-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-028-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element contains a text element that contains a span element with rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-028.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-028.xht
index a7f1b857a1f..d32a5117a6e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-028.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-028.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-028-ref.xht" />
 		<meta name="assert" content="The copyright element contains a text element that contains a span element with rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-028.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-029-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-029-ref.xht
index 42b3389e6b9..49e062fc4fe 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-029-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-029-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element contains a text element that contains a span element with INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-029.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-029.xht
index edabcd5ca5b..cf45a824099 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-029.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-029.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-029-ref.xht" />
 		<meta name="assert" content="The copyright element contains a text element that contains a span element with INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-029.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-030-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-030-ref.xht
index 35b7e686ca5..83c9970632c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-030-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-030-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The copyright element contains a text element that contains a span element with &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-030.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-030.xht
index 31c206a6403..6750292dac2 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-030.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-030.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-copyright-030-ref.xht" />
 		<meta name="assert" content="The copyright element contains a text element that contains a span element with &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-copyright-030.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-001-ref.xht
index a5314cf0f47..af453c90a6d 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-001-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The credit element matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-001.xht
index 8f9ec11f04d..6630b7d522c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-001.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-credit-001-ref.xht" />
 		<meta name="assert" content="The credit element matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-credit-001.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-002-ref.xht
index 90c09b691bc..482483915bb 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-002-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The credit element does not contain a url attribute but it still matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-002.xht
index e3bf3d90dbb..935cb9de099 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-002.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-credit-002-ref.xht" />
 		<meta name="assert" content="The credit element does not contain a url attribute but it still matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-credit-002.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-003-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-003-ref.xht
index 91f6a6348c1..ee0863ce48c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-003-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-003-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The credit element does not contain a role attribute but it still matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-003.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-003.xht
index ad2c361e9df..1fde7c1e100 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-003.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-003.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-credit-003-ref.xht" />
 		<meta name="assert" content="The credit element does not contain a role attribute but it still matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-credit-003.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-004-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-004-ref.xht
index 446b7002d07..73572574206 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-004-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-004-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The credit element does not contain a name attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-004.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-004.xht
index dd8f26a7f6e..4a213fd745c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-004.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-004.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-credit-004-ref.xht" />
 		<meta name="assert" content="The credit element does not contain a name attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-credit-004.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-005-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-005-ref.xht
index fe771dd94b7..c18e9203bf2 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-005-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-005-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The credit element contains ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-005.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-005.xht
index 1f750a5712c..4e7ba08d066 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-005.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-005.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-credit-005-ref.xht" />
 		<meta name="assert" content="The credit element contains ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-credit-005.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-006-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-006-ref.xht
index dcf276e5c71..a3beb8c85e0 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-006-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-006-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The credit element contains rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-006.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-006.xht
index 02daa0e3a79..84e2ebeb1c4 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-006.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-006.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-credit-006-ref.xht" />
 		<meta name="assert" content="The credit element contains rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-credit-006.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-007-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-007-ref.xht
index ed7594bed4d..dc0c6bfd090 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-007-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-007-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The credit element contains INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-007.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-007.xht
index e6f15b0e14f..7bcfbcfe5d3 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-007.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-007.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-credit-007-ref.xht" />
 		<meta name="assert" content="The credit element contains INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-credit-007.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-008-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-008-ref.xht
index 6d768bf5e2b..f09023e930a 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-008-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-008-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The credit element contains &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-008.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-008.xht
index adc874acd6b..0f9bea19d80 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-008.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-008.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-credit-008-ref.xht" />
 		<meta name="assert" content="The credit element contains &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-credit-008.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-009-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-009-ref.xht
index 6dc7d7d666f..9b80b9e7d21 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-009-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-009-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The credit element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-009.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-009.xht
index 804e51ba65f..4f1db59d015 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-009.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-009.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-credit-009-ref.xht" />
 		<meta name="assert" content="The credit element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-credit-009.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-010-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-010-ref.xht
index 4e6ce3972be..8079d02b5dd 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-010-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-010-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The credit element contains a child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-010.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-010.xht
index bb49c62a758..d5cae233d56 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-010.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-010.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-credit-010-ref.xht" />
 		<meta name="assert" content="The credit element contains a child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-credit-010.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-011-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-011-ref.xht
index 90a32d2f05a..fcc52f7d960 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-011-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-011-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The credit element contains content." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-011.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-011.xht
index 1248765ae2d..474b322d59c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-011.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-011.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-credit-011-ref.xht" />
 		<meta name="assert" content="The credit element contains content." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-credit-011.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-001-ref.xht
index b06415e9e41..4560d7413e3 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-001-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The credits element matches the schema and it contains one credit child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-001.xht
index f2b82e08be6..dda392d4d16 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-001.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-credits-001-ref.xht" />
 		<meta name="assert" content="The credits element matches the schema and it contains one credit child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-credits-001.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-002-ref.xht
index 502e1606ec2..9b6d2d2ba05 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-002-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The credits element matches the schema and it contains two credit child elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-002.xht
index dd4099593c8..8f3019ffd28 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-002.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-credits-002-ref.xht" />
 		<meta name="assert" content="The credits element matches the schema and it contains two credit child elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-credits-002.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-003-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-003-ref.xht
index e15e1b6f147..a55c73c9580 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-003-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-003-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The credits element does not contain a credit child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-003.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-003.xht
index afd6ec9d9cb..f6fc21cf08d 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-003.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-003.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-credits-003-ref.xht" />
 		<meta name="assert" content="The credits element does not contain a credit child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-credits-003.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-004-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-004-ref.xht
index e8b13a4e010..b7b10be1419 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-004-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-004-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The credits element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-004.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-004.xht
index 83019ddaa08..bf3fd02ac16 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-004.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-004.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-credits-004-ref.xht" />
 		<meta name="assert" content="The credits element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-credits-004.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-005-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-005-ref.xht
index ee89de253ab..6457d7ee2e7 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-005-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-005-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The credits element contains an unknown child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-005.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-005.xht
index b17763ff30d..5c01ab1eeae 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-005.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-005.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-credits-005-ref.xht" />
 		<meta name="assert" content="The credits element contains an unknown child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-credits-005.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-006-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-006-ref.xht
index 2bab96e2cdd..e20784a3d50 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-006-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-006-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The credits element contains an content." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-006.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-006.xht
index eeab3209bd5..80a0c0baef2 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-006.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-006.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-credits-006-ref.xht" />
 		<meta name="assert" content="The credits element contains an content." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-credits-006.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-007-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-007-ref.xht
index 61058476371..264aeed323d 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-007-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-007-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The credits element occurs more than once." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-007.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-007.xht
index 08222c3db67..63709b0fcf0 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-007.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-007.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-credits-007-ref.xht" />
 		<meta name="assert" content="The credits element occurs more than once." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-credits-007.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-001-ref.xht
index 4be453f504d..01736f80648 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-001-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-001.xht
index 88b3b4ad1a3..c882d6be7f7 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-001.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-001-ref.xht" />
 		<meta name="assert" content="The description element matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-001.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-002-ref.xht
index 9a379f40a6e..4287f7c02fb 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-002-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element does not contain a url attribute but it still matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-002.xht
index 517f9bcf549..d99e6ae5921 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-002.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-002-ref.xht" />
 		<meta name="assert" content="The description element does not contain a url attribute but it still matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-002.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-003-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-003-ref.xht
index ce55eb0615f..50e984cb80f 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-003-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-003-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element matches the schema. It contains one text element that does not have a language tag." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-003.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-003.xht
index 6fb03b88f7b..cb15795aec6 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-003.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-003.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-003-ref.xht" />
 		<meta name="assert" content="The description element matches the schema. It contains one text element that does not have a language tag." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-003.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-004-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-004-ref.xht
index 39ca392b86c..63b6f0b83ac 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-004-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-004-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element matches the schema. It contains one text element that has a language tag." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-004.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-004.xht
index 2e41158fffc..1691c1d68cb 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-004.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-004.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-004-ref.xht" />
 		<meta name="assert" content="The description element matches the schema. It contains one text element that has a language tag." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-004.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-005-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-005-ref.xht
index 3bb5cc6cc9f..3337e7454ff 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-005-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-005-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element matches the schema. It contains one text element that has a language tag using the lang tag instead of xml:lang." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-005.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-005.xht
index fa160c56219..d8a7ba460ce 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-005.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-005.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-005-ref.xht" />
 		<meta name="assert" content="The description element matches the schema. It contains one text element that has a language tag using the lang tag instead of xml:lang." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-005.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-006-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-006-ref.xht
index f04a9b9abdb..af5be58149a 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-006-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-006-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element matches the schema. One text element does not have a language tag. One text element has a language tag." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-006.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-006.xht
index a973acb496d..47c6c7ea155 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-006.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-006.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-006-ref.xht" />
 		<meta name="assert" content="The description element matches the schema. One text element does not have a language tag. One text element has a language tag." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-006.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-007-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-007-ref.xht
index 30d848c332a..e75c2e43b40 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-007-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-007-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element matches the schema. Two text elements have a language tags." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-007.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-007.xht
index a6be5affc59..d0d764ada5e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-007.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-007.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-007-ref.xht" />
 		<meta name="assert" content="The description element matches the schema. Two text elements have a language tags." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-007.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-008-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-008-ref.xht
index d8726604079..9c1842d7e2a 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-008-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-008-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element occurs more than once." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-008.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-008.xht
index 27c88c7d080..39ac21ea4f1 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-008.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-008.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-008-ref.xht" />
 		<meta name="assert" content="The description element occurs more than once." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-008.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-009-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-009-ref.xht
index ce17e22673f..773e1615007 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-009-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-009-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element does not contain a text child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-009.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-009.xht
index c7e19e9787d..3f86a7f5593 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-009.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-009.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-009-ref.xht" />
 		<meta name="assert" content="The description element does not contain a text child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-009.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-010-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-010-ref.xht
index 27b61c3d767..6cfb1235a47 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-010-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-010-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-010.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-010.xht
index 90b49681b2b..28f4839a673 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-010.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-010.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-010-ref.xht" />
 		<meta name="assert" content="The description element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-010.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-011-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-011-ref.xht
index 33322c38ad9..053d939b6de 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-011-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-011-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element contains an unknown child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-011.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-011.xht
index 97d9dd00544..50cf2e752bd 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-011.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-011.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-011-ref.xht" />
 		<meta name="assert" content="The description element contains an unknown child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-011.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-012-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-012-ref.xht
index 4eea1e022e7..2876b33921f 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-012-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-012-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element contains content." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-012.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-012.xht
index e5342e2ba47..d37b2bbd04b 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-012.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-012.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-012-ref.xht" />
 		<meta name="assert" content="The description element contains content." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-012.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-013-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-013-ref.xht
index 6c080de2af8..07d5917e3a0 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-013-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-013-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element contains a text element with ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-013.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-013.xht
index a48e8ed03c1..b42602df021 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-013.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-013.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-013-ref.xht" />
 		<meta name="assert" content="The description element contains a text element with ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-013.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-014-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-014-ref.xht
index 75a47a53d5f..8576a0f0024 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-014-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-014-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element contains a text element with rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-014.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-014.xht
index 6f37350d65d..3ded888ad03 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-014.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-014.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-014-ref.xht" />
 		<meta name="assert" content="The description element contains a text element with rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-014.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-015-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-015-ref.xht
index 84693d9ce85..fcb1df674db 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-015-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-015-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element contains a text element with INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-015.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-015.xht
index 49e1d80e244..4eefabf7b83 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-015.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-015.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-015-ref.xht" />
 		<meta name="assert" content="The description element contains a text element with INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-015.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-016-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-016-ref.xht
index 27e0679fe76..04296709ec1 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-016-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-016-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element contains a text element with &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-016.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-016.xht
index b48b52eb54f..d331354c267 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-016.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-016.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-016-ref.xht" />
 		<meta name="assert" content="The description element contains a text element with &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-016.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-017-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-017-ref.xht
index 507cfaa2bb6..b7d50d247eb 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-017-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-017-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element contains a text element with an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-017.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-017.xht
index 31124d41575..68c9c4a1b04 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-017.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-017.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-017-ref.xht" />
 		<meta name="assert" content="The description element contains a text element with an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-017.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-018-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-018-ref.xht
index 0dd174880cc..0e2b3515b05 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-018-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-018-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element contains a text element with an unknown child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-018.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-018.xht
index 25589aa5813..6ce4a916813 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-018.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-018.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-018-ref.xht" />
 		<meta name="assert" content="The description element contains a text element with an unknown child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-018.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-019-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-019-ref.xht
index 9a296709791..f462da6db8d 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-019-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-019-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element contains a text element that contains a div element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-019.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-019.xht
index 320e73deb2d..28cd0ad7a0b 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-019.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-019.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-019-ref.xht" />
 		<meta name="assert" content="The description element contains a text element that contains a div element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-019.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-020-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-020-ref.xht
index bd0e0db51f0..3e2744590a3 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-020-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-020-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element contains a text element that contains two div elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-020.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-020.xht
index dbd43483dbd..1ef2a91e284 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-020.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-020.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-020-ref.xht" />
 		<meta name="assert" content="The description element contains a text element that contains two div elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-020.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-021-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-021-ref.xht
index c126d268e9b..943a9eed4d7 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-021-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-021-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element contains a text element that contains nested div elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-021.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-021.xht
index ace6cbc4f58..f68d2a6cc44 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-021.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-021.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-021-ref.xht" />
 		<meta name="assert" content="The description element contains a text element that contains nested div elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-021.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-022-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-022-ref.xht
index cd044dc4c15..51632bc7f21 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-022-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-022-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element contains a text element that contains a div element with ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-022.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-022.xht
index 05cb5b2bacc..2be8aa9ee0b 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-022.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-022.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-022-ref.xht" />
 		<meta name="assert" content="The description element contains a text element that contains a div element with ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-022.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-023-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-023-ref.xht
index df45350ca9f..b8b0f75599e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-023-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-023-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element contains a text element that contains a div element with rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-023.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-023.xht
index 1d0772baaf0..a2bc7fcc534 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-023.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-023.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-023-ref.xht" />
 		<meta name="assert" content="The description element contains a text element that contains a div element with rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-023.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-024-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-024-ref.xht
index 079540c446d..3e0b9addf80 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-024-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-024-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element contains a text element that contains a div element with INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-024.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-024.xht
index 6278d98744e..e4588742122 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-024.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-024.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-024-ref.xht" />
 		<meta name="assert" content="The description element contains a text element that contains a div element with INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-024.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-025-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-025-ref.xht
index 746fa416eb5..4980694030e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-025-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-025-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element contains a text element that contains a div element with &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-025.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-025.xht
index ccc0e6d5772..1f43b376665 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-025.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-025.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-025-ref.xht" />
 		<meta name="assert" content="The description element contains a text element that contains a div element with &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-025.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-026-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-026-ref.xht
index 7a615341ef1..bb4f09c2bcf 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-026-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-026-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element contains a text element that contains a span element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-026.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-026.xht
index c731642573a..5c3bda68f90 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-026.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-026.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-026-ref.xht" />
 		<meta name="assert" content="The description element contains a text element that contains a span element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-026.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-027-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-027-ref.xht
index 55b8a1c3b22..6e570f129ee 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-027-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-027-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element contains a text element that contains two span elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-027.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-027.xht
index 51ab9db6731..1f5c5c8de69 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-027.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-027.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-027-ref.xht" />
 		<meta name="assert" content="The description element contains a text element that contains two span elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-027.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-028-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-028-ref.xht
index 1d804d02bda..db82781bafc 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-028-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-028-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element contains a text element that contains nested span elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-028.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-028.xht
index 8c96a8713c2..51c759d7801 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-028.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-028.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-028-ref.xht" />
 		<meta name="assert" content="The description element contains a text element that contains nested span elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-028.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-029-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-029-ref.xht
index 316a08f6e0c..9f75169215a 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-029-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-029-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element contains a text element that contains a span element with ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-029.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-029.xht
index 68235261810..867434e45f9 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-029.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-029.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-029-ref.xht" />
 		<meta name="assert" content="The description element contains a text element that contains a span element with ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-029.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-030-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-030-ref.xht
index ff5e8040c3a..40ab7a67d46 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-030-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-030-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element contains a text element that contains a span element with rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-030.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-030.xht
index e10b5f70093..a5863f16aa9 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-030.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-030.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-030-ref.xht" />
 		<meta name="assert" content="The description element contains a text element that contains a span element with rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-030.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-031-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-031-ref.xht
index 940e05efafe..8fc25efe1a6 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-031-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-031-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element contains a text element that contains a span element with INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-031.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-031.xht
index ab32aafd0bf..cf257751ef3 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-031.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-031.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-031-ref.xht" />
 		<meta name="assert" content="The description element contains a text element that contains a span element with INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-031.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-032-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-032-ref.xht
index 2e72d9c6b1f..09245fa7909 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-032-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-032-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The description element contains a text element that contains a span element with &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-032.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-032.xht
index ecdb7ae83b0..0034efa6161 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-032.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-032.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-description-032-ref.xht" />
 		<meta name="assert" content="The description element contains a text element that contains a span element with &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-description-032.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-001-ref.xht
index 1675bf48e3e..aac0f14911c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-001-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The extension element matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-001.xht
index a78ea43f970..c7d6c5a763c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-001.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-001-ref.xht" />
 		<meta name="assert" content="The extension element matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-001.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-002-ref.xht
index dbe63438568..32d8be5432f 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-002-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="Two extension elements match the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-002.xht
index 93784140be2..b21ebac2be5 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-002.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-002-ref.xht" />
 		<meta name="assert" content="Two extension elements match the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-002.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-003-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-003-ref.xht
index ef328b9b43a..7776cc5d43e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-003-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-003-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The extension element does not have an id attribute but it still matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-003.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-003.xht
index dbe0fc42e43..2b5c791db77 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-003.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-003.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-003-ref.xht" />
 		<meta name="assert" content="The extension element does not have an id attribute but it still matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-003.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-004-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-004-ref.xht
index a92c05573a4..da516b26833 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-004-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-004-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The extension element does not have a name child element but it still matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-004.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-004.xht
index f0e85adce4d..cc04dd6aa49 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-004.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-004.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-004-ref.xht" />
 		<meta name="assert" content="The extension element does not have a name child element but it still matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-004.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-005-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-005-ref.xht
index 2aac14e7899..ea8cbc4a8b4 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-005-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-005-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The extension element contains one name element without a lang attribute and another with a lang attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-005.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-005.xht
index b885b161dce..b0993fdc561 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-005.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-005.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-005-ref.xht" />
 		<meta name="assert" content="The extension element contains one name element without a lang attribute and another with a lang attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-005.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-006-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-006-ref.xht
index 119742b2f6f..9333f69052c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-006-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-006-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The extension element contains two name elements with lang attributes." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-006.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-006.xht
index e5bbdfdea15..f9822ba31d1 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-006.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-006.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-006-ref.xht" />
 		<meta name="assert" content="The extension element contains two name elements with lang attributes." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-006.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-007-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-007-ref.xht
index b64d1ca23ae..b5b400239e8 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-007-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-007-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The extension element contains two item child elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-007.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-007.xht
index 4e2bde8d72b..c9a0eb372dd 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-007.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-007.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-007-ref.xht" />
 		<meta name="assert" content="The extension element contains two item child elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-007.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-008-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-008-ref.xht
index 395c1f6a251..321520fe487 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-008-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-008-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The extension element does not contain an item child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-008.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-008.xht
index 2e27b47a915..55c995c9f7e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-008.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-008.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-008-ref.xht" />
 		<meta name="assert" content="The extension element does not contain an item child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-008.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-009-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-009-ref.xht
index 3df0479446b..589fcfd8213 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-009-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-009-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The extension element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-009.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-009.xht
index 73726a38c1b..05fdf9f3f2b 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-009.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-009.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-009-ref.xht" />
 		<meta name="assert" content="The extension element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-009.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-010-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-010-ref.xht
index 0366ada477c..77769acb065 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-010-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-010-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The extension element contains an unknown child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-010.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-010.xht
index 205cce1c07a..703d43e7e85 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-010.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-010.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-010-ref.xht" />
 		<meta name="assert" content="The extension element contains an unknown child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-010.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-011-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-011-ref.xht
index b585767f228..7ec07906bf3 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-011-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-011-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The extension element contains content." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-011.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-011.xht
index 027b9d08960..3d9b171c6ac 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-011.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-011.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-011-ref.xht" />
 		<meta name="assert" content="The extension element contains content." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-011.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-012-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-012-ref.xht
index 0a34cd18771..dbd8561c640 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-012-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-012-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The name element in the extension element matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-012.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-012.xht
index 1101dc81ab7..098cc3cc21a 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-012.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-012.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-012-ref.xht" />
 		<meta name="assert" content="The name element in the extension element matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-012.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-013-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-013-ref.xht
index 3352f2d5f47..45f258a89b3 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-013-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-013-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The name element in the extension element contains a xml:lang attribute and it matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-013.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-013.xht
index 6e2a30361bd..48ce3618408 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-013.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-013.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-013-ref.xht" />
 		<meta name="assert" content="The name element in the extension element contains a xml:lang attribute and it matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-013.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-014-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-014-ref.xht
index ad8c3538fd0..80e25bccf0a 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-014-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-014-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The name element in the extension element contains a lang attribute and it matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-014.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-014.xht
index 6121e08412c..a21cf6d1c91 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-014.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-014.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-014-ref.xht" />
 		<meta name="assert" content="The name element in the extension element contains a lang attribute and it matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-014.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-015-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-015-ref.xht
index 06d7f560aed..c2984b3fe04 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-015-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-015-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The name element in the extension element has ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-015.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-015.xht
index 160c033d304..f98847bf245 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-015.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-015.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-015-ref.xht" />
 		<meta name="assert" content="The name element in the extension element has ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-015.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-016-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-016-ref.xht
index a40c445f161..62961672c6a 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-016-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-016-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The name element in the extension element has rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-016.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-016.xht
index 431daaf3fd3..a2dda8d52a3 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-016.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-016.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-016-ref.xht" />
 		<meta name="assert" content="The name element in the extension element has rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-016.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-017-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-017-ref.xht
index ebc193c96ef..0612d8def0c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-017-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-017-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The name element in the extension element has INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-017.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-017.xht
index 92ac1ea16fd..22fd880754b 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-017.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-017.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-017-ref.xht" />
 		<meta name="assert" content="The name element in the extension element has INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-017.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-018-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-018-ref.xht
index 2647cdbac55..5840fa3b945 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-018-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-018-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The name element in the extension element has &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-018.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-018.xht
index d8fe5caf3fa..02953c9bbea 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-018.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-018.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-018-ref.xht" />
 		<meta name="assert" content="The name element in the extension element has &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-018.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-019-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-019-ref.xht
index f1a4eaeba41..be998da7472 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-019-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-019-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The name element in the extension element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-019.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-019.xht
index 68f826145b0..e810553dddf 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-019.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-019.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-019-ref.xht" />
 		<meta name="assert" content="The name element in the extension element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-019.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-020-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-020-ref.xht
index e755e6fd28c..ee1a48df9a0 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-020-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-020-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The name element in the extension element contains a child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-020.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-020.xht
index 4cc806080f6..61b80f2fbc6 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-020.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-020.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-020-ref.xht" />
 		<meta name="assert" content="The name element in the extension element contains a child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-020.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-021-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-021-ref.xht
index b8e55840bf4..142c1ae4fbc 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-021-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-021-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The item element in the extension element matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-021.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-021.xht
index 138813c4f03..8e4915f1706 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-021.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-021.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-021-ref.xht" />
 		<meta name="assert" content="The item element in the extension element matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-021.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-022-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-022-ref.xht
index bb731169ff2..c4d8acf6697 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-022-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-022-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The item element in the extension element contains a variety of languages." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-022.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-022.xht
index e4a407d4c7f..32609c4fd42 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-022.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-022.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-022-ref.xht" />
 		<meta name="assert" content="The item element in the extension element contains a variety of languages." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-022.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-023-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-023-ref.xht
index 72e889f5ab6..3204a1f60ed 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-023-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-023-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The item element in the extension element does not contain an id attribute but it still matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-023.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-023.xht
index 625b58a5fcd..6e159885b1e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-023.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-023.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-023-ref.xht" />
 		<meta name="assert" content="The item element in the extension element does not contain an id attribute but it still matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-023.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-024-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-024-ref.xht
index eda878d13a5..0ccc239539e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-024-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-024-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The item element in the extension element contains one name child element with no lang attribute and one with a lang attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-024.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-024.xht
index c738456070a..2459021acbf 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-024.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-024.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-024-ref.xht" />
 		<meta name="assert" content="The item element in the extension element contains one name child element with no lang attribute and one with a lang attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-024.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-025-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-025-ref.xht
index d6cf75b284e..62f0dc52b34 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-025-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-025-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The item element in the extension element contains two name child elements with lang attributes." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-025.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-025.xht
index 8a2c0728d49..85d34d60dfd 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-025.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-025.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-025-ref.xht" />
 		<meta name="assert" content="The item element in the extension element contains two name child elements with lang attributes." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-025.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-026-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-026-ref.xht
index 65ad94ef9c4..5c6eda4e91c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-026-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-026-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The item element in the extension element contains one value child element with no lang attribute and one with a lang attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-026.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-026.xht
index 61e1afed78c..dc6dcb8fae9 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-026.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-026.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-026-ref.xht" />
 		<meta name="assert" content="The item element in the extension element contains one value child element with no lang attribute and one with a lang attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-026.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-027-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-027-ref.xht
index 964c076624b..6f9f0d67c2d 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-027-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-027-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The item element in the extension element contains two value child elements with lang attributes." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-027.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-027.xht
index 4de5199b576..752fa43bc7e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-027.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-027.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-027-ref.xht" />
 		<meta name="assert" content="The item element in the extension element contains two value child elements with lang attributes." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-027.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-028-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-028-ref.xht
index 32cb2855f2f..586e565f707 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-028-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-028-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The item element in the extension element does not contain a name child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-028.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-028.xht
index d55b2f6d6b8..a4a0a2f2547 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-028.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-028.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-028-ref.xht" />
 		<meta name="assert" content="The item element in the extension element does not contain a name child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-028.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-029-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-029-ref.xht
index d9270b56929..e6167075090 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-029-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-029-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The item element in the extension element does not contain a value child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-029.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-029.xht
index 6633239eb29..76af99a93ff 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-029.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-029.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-029-ref.xht" />
 		<meta name="assert" content="The item element in the extension element does not contain a value child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-029.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-030-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-030-ref.xht
index 17fdc15bc10..4aa9ca71c45 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-030-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-030-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The item element in the extension element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-030.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-030.xht
index efddb5ae9b5..12d27a83902 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-030.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-030.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-030-ref.xht" />
 		<meta name="assert" content="The item element in the extension element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-030.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-031-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-031-ref.xht
index 48751f1afc1..b8148f75c4c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-031-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-031-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The item element in the extension element contains an unknown child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-031.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-031.xht
index 4659ce21931..b535747ddc0 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-031.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-031.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-031-ref.xht" />
 		<meta name="assert" content="The item element in the extension element contains an unknown child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-031.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-032-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-032-ref.xht
index 66c494b8945..463aa4f02d2 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-032-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-032-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The item element in the extension element contains content." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-032.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-032.xht
index 27dc9be4ed8..680531c7a7a 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-032.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-032.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-032-ref.xht" />
 		<meta name="assert" content="The item element in the extension element contains content." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-032.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-033-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-033-ref.xht
index 83fdb40b8b8..efacd3ee43e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-033-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-033-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The name element in the item element in the extension element matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-033.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-033.xht
index 5160934ed46..5d9a9eaac06 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-033.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-033.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-033-ref.xht" />
 		<meta name="assert" content="The name element in the item element in the extension element matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-033.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-034-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-034-ref.xht
index ac64430f23e..a4ca606f8ec 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-034-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-034-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The name element in the item element in the extension element contains a xml:lang attribute and it matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-034.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-034.xht
index 4cdd0a1bfcc..3dde169ca35 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-034.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-034.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-034-ref.xht" />
 		<meta name="assert" content="The name element in the item element in the extension element contains a xml:lang attribute and it matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-034.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-035-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-035-ref.xht
index e1152ba5808..3a6a387431a 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-035-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-035-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The name element in the item element in the extension element contains a lang attribute and it matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-035.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-035.xht
index 5a07bb9de53..93a946f989c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-035.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-035.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-035-ref.xht" />
 		<meta name="assert" content="The name element in the item element in the extension element contains a lang attribute and it matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-035.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-036-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-036-ref.xht
index c363d5f1201..bb6562f6ee3 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-036-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-036-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The name element in the item element in the extension element has ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-036.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-036.xht
index 6fb321e2565..4fa950ba6fa 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-036.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-036.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-036-ref.xht" />
 		<meta name="assert" content="The name element in the item element in the extension element has ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-036.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-037-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-037-ref.xht
index fb84033cf6e..218eebbddfb 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-037-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-037-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The name element in the item element in the extension element has rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-037.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-037.xht
index 85059950a9a..65a88c365d3 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-037.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-037.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-037-ref.xht" />
 		<meta name="assert" content="The name element in the item element in the extension element has rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-037.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-038-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-038-ref.xht
index 1a67866e838..313d0b4d21a 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-038-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-038-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The name element in the item element in the extension element has INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-038.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-038.xht
index 38871a0fe4f..cfc846fc989 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-038.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-038.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-038-ref.xht" />
 		<meta name="assert" content="The name element in the item element in the extension element has INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-038.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-039-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-039-ref.xht
index 39b32b1fb03..eb36ba92cbd 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-039-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-039-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The name element in the item element in the extension element has &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-039.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-039.xht
index 07dd77dcfa6..91ea5604f5e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-039.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-039.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-039-ref.xht" />
 		<meta name="assert" content="The name element in the item element in the extension element has &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-039.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-040-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-040-ref.xht
index 508eea620b2..b3fa8616062 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-040-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-040-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The name element in the item element in the extension element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-040.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-040.xht
index 74c36f53ac2..c721b8a5238 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-040.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-040.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-040-ref.xht" />
 		<meta name="assert" content="The name element in the item element in the extension element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-040.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-041-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-041-ref.xht
index 5b5c30a470c..af1ee744af7 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-041-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-041-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The name element in the item element in the extension element contains a child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-041.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-041.xht
index b89566ae48d..233ab66e004 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-041.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-041.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-041-ref.xht" />
 		<meta name="assert" content="The name element in the item element in the extension element contains a child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-041.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-042-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-042-ref.xht
index 27287538cd1..f652d722f2a 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-042-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-042-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The value element in the item element in the extension element matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-042.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-042.xht
index 889492a8d64..3207c42ff32 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-042.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-042.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-042-ref.xht" />
 		<meta name="assert" content="The value element in the item element in the extension element matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-042.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-043-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-043-ref.xht
index 5906a6c49df..09dea931215 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-043-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-043-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The value element in the item element in the extension element contains a xml:lang attribute and it matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-043.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-043.xht
index 1f595787fae..879f6167bac 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-043.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-043.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-043-ref.xht" />
 		<meta name="assert" content="The value element in the item element in the extension element contains a xml:lang attribute and it matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-043.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-044-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-044-ref.xht
index 26a38acadd8..3cdc15990b7 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-044-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-044-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The value element in the item element in the extension element contains a lang attribute and it matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-044.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-044.xht
index 7a955a1a5b2..75ebcb6bc90 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-044.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-044.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-044-ref.xht" />
 		<meta name="assert" content="The value element in the item element in the extension element contains a lang attribute and it matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-044.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-045-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-045-ref.xht
index 31dd65c1146..685a2010a15 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-045-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-045-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The value element in the item element in the extension element has ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-045.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-045.xht
index 69515c52e83..cf76179c64b 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-045.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-045.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-045-ref.xht" />
 		<meta name="assert" content="The value element in the item element in the extension element has ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-045.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-046-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-046-ref.xht
index b466b077c97..db00beee5ab 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-046-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-046-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The value element in the item element in the extension element has rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-046.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-046.xht
index bbd54a253f0..2ae083fb939 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-046.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-046.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-046-ref.xht" />
 		<meta name="assert" content="The value element in the item element in the extension element has rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-046.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-047-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-047-ref.xht
index 650ab239413..7c39a2fd91a 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-047-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-047-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The value element in the item element in the extension element has INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-047.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-047.xht
index 46ead1c6f5e..bab9ea2cbc0 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-047.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-047.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-047-ref.xht" />
 		<meta name="assert" content="The value element in the item element in the extension element has INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-047.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-048-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-048-ref.xht
index 311369822b5..1930716adab 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-048-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-048-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The value element in the item element in the extension element has &quot;class1 class2 class3&quot; as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-048.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-048.xht
index 27b19a5a62b..4529207cf80 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-048.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-048.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-048-ref.xht" />
 		<meta name="assert" content="The value element in the item element in the extension element has &quot;class1 class2 class3&quot; as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-048.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-049-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-049-ref.xht
index 1547c5a4930..c8ef754fd0b 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-049-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-049-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The value element in the item element in the extension element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-049.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-049.xht
index 9c57bccc080..9727ee50dcf 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-049.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-049.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-049-ref.xht" />
 		<meta name="assert" content="The value element in the item element in the extension element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-049.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-050-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-050-ref.xht
index 63b11a7df29..1aabbdeff3c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-050-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-050-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The value element in the item element in the extension element contains a child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-050.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-050.xht
index 8c98c965d4f..df20c0d62ce 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-050.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-050.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-extension-050-ref.xht" />
 		<meta name="assert" content="The value element in the item element in the extension element contains a child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-extension-050.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-001-ref.xht
index fb1fd53529a..784dac4690b 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-001-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-001.xht
index 9d8ae3e54d3..9c20244f0f7 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-001.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-001-ref.xht" />
 		<meta name="assert" content="The license element matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-001.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-002-ref.xht
index 6e982596ce9..f06ff738da8 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-002-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element does not have a url attribute but it still matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-002.xht
index a2205b9c11b..66c3f0cd670 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-002.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-002-ref.xht" />
 		<meta name="assert" content="The license element does not have a url attribute but it still matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-002.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-003-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-003-ref.xht
index 85280bfbc1d..85d78244ce9 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-003-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-003-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element does not have an id attribute but it still matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-003.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-003.xht
index 3e15972b641..e08e87053ee 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-003.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-003.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-003-ref.xht" />
 		<meta name="assert" content="The license element does not have an id attribute but it still matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-003.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-004-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-004-ref.xht
index 03ebc408788..61621ef8823 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-004-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-004-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element matches the schema. It contains one text element that does not have a language tag." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-004.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-004.xht
index cc1d244205d..7bd9dcd66a7 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-004.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-004.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-004-ref.xht" />
 		<meta name="assert" content="The license element matches the schema. It contains one text element that does not have a language tag." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-004.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-005-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-005-ref.xht
index 9a2652fd4ca..296e17424c1 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-005-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-005-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element matches the schema. It contains one text element that has a language tag." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-005.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-005.xht
index 331b9f9dca3..7d646f3a45a 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-005.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-005.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-005-ref.xht" />
 		<meta name="assert" content="The license element matches the schema. It contains one text element that has a language tag." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-005.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-006-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-006-ref.xht
index b55ca043b53..0fd406ec110 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-006-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-006-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element matches the schema. It contains one text element that has a language tag using the lang tag instead of xml:lang." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-006.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-006.xht
index 14b73d1f7e5..ea4f095d3c3 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-006.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-006.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-006-ref.xht" />
 		<meta name="assert" content="The license element matches the schema. It contains one text element that has a language tag using the lang tag instead of xml:lang." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-006.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-007-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-007-ref.xht
index ac4dbe43a7f..26e21d5a3ca 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-007-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-007-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element matches the schema. One text element does not have a language tag. One text element has a language tag." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-007.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-007.xht
index 1ee186e9c1a..92571e1df83 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-007.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-007.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-007-ref.xht" />
 		<meta name="assert" content="The license element matches the schema. One text element does not have a language tag. One text element has a language tag." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-007.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-008-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-008-ref.xht
index 95eeb5de7db..7f5fd9c7d03 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-008-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-008-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element matches the schema. Two text elements have a language tags." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-008.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-008.xht
index b38a2fd0ddb..96b922cffdf 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-008.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-008.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-008-ref.xht" />
 		<meta name="assert" content="The license element matches the schema. Two text elements have a language tags." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-008.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-009-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-009-ref.xht
index c2284994417..9ec71999fa9 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-009-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-009-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element occurs more than once." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-009.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-009.xht
index c28419c310c..39caeca289e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-009.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-009.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-009-ref.xht" />
 		<meta name="assert" content="The license element occurs more than once." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-009.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-010-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-010-ref.xht
index 300539e347f..3840f6734f6 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-010-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-010-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element does not contain a text child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-010.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-010.xht
index fbeff033fb0..0e0597de07c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-010.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-010.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-010-ref.xht" />
 		<meta name="assert" content="The license element does not contain a text child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-010.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-011-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-011-ref.xht
index 32dc8aef561..49a8603da42 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-011-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-011-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-011.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-011.xht
index c020114453c..9f3ce0ff90f 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-011.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-011.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-011-ref.xht" />
 		<meta name="assert" content="The license element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-011.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-012-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-012-ref.xht
index 05e183a42d1..89991567fd7 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-012-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-012-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element contains an unknown child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-012.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-012.xht
index 878588f7571..38035793cc2 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-012.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-012.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-012-ref.xht" />
 		<meta name="assert" content="The license element contains an unknown child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-012.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-013-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-013-ref.xht
index b321aca50ad..e575f717aa3 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-013-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-013-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element contains content." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-013.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-013.xht
index dd14c53bb11..103f916e797 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-013.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-013.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-013-ref.xht" />
 		<meta name="assert" content="The license element contains content." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-013.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-014-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-014-ref.xht
index e44eb07085f..ee0ae640327 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-014-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-014-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element contains a text element with ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-014.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-014.xht
index 55ed2bbedad..a7b1f3550c1 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-014.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-014.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-014-ref.xht" />
 		<meta name="assert" content="The license element contains a text element with ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-014.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-015-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-015-ref.xht
index 612735904b9..2e8befd1de6 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-015-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-015-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element contains a text element with rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-015.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-015.xht
index a3257c499dc..a6f78f387ee 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-015.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-015.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-015-ref.xht" />
 		<meta name="assert" content="The license element contains a text element with rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-015.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-016-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-016-ref.xht
index d29b862bbaf..fab8aad80b1 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-016-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-016-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element contains a text element with INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-016.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-016.xht
index f3e0f31b393..987b7e5a0ca 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-016.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-016.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-016-ref.xht" />
 		<meta name="assert" content="The license element contains a text element with INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-016.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-017-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-017-ref.xht
index 7420317fb2c..228dc96657f 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-017-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-017-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element contains a text element with &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-017.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-017.xht
index 35c974d87c4..d71884a9b4a 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-017.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-017.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-017-ref.xht" />
 		<meta name="assert" content="The license element contains a text element with &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-017.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-018-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-018-ref.xht
index f0b50634f6d..10ec6ef7a7f 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-018-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-018-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element contains a text element with an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-018.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-018.xht
index d6ed92488d5..745851331b8 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-018.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-018.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-018-ref.xht" />
 		<meta name="assert" content="The license element contains a text element with an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-018.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-019-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-019-ref.xht
index 7a867f1625e..bf7070b0a08 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-019-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-019-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element contains a text element with an unknown child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-019.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-019.xht
index 7bd281cccc3..d320e47e974 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-019.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-019.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-019-ref.xht" />
 		<meta name="assert" content="The license element contains a text element with an unknown child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-019.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-020-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-020-ref.xht
index 469fbe4c4c9..4ce9fd15b5d 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-020-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-020-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element contains a text element that contains a div element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-020.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-020.xht
index 7fa03b400e5..5d4c14800e0 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-020.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-020.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-020-ref.xht" />
 		<meta name="assert" content="The license element contains a text element that contains a div element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-020.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-021-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-021-ref.xht
index d318ea3f8f8..90f12dc9dff 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-021-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-021-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element contains a text element that contains two div elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-021.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-021.xht
index 605ab199b67..dbfb0a89def 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-021.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-021.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-021-ref.xht" />
 		<meta name="assert" content="The license element contains a text element that contains two div elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-021.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-022-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-022-ref.xht
index 20d3dd34a5e..91d1d7b9bcf 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-022-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-022-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element contains a text element that contains nested div elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-022.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-022.xht
index aca0b69954d..85db55a4f2c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-022.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-022.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-022-ref.xht" />
 		<meta name="assert" content="The license element contains a text element that contains nested div elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-022.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-023-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-023-ref.xht
index ca2d2a2f572..b7587d3213e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-023-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-023-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element contains a text element that contains a div element with ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-023.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-023.xht
index 707e75a5758..7a6b344782e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-023.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-023.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-023-ref.xht" />
 		<meta name="assert" content="The license element contains a text element that contains a div element with ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-023.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-024-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-024-ref.xht
index ec4ae9b49f4..84fef55d81b 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-024-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-024-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element contains a text element that contains a div element with rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-024.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-024.xht
index 9e8985e773a..16fac5603ea 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-024.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-024.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-024-ref.xht" />
 		<meta name="assert" content="The license element contains a text element that contains a div element with rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-024.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-025-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-025-ref.xht
index 14e51ae1554..0000d29195e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-025-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-025-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element contains a text element that contains a div element with INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-025.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-025.xht
index 38c725b9318..a770f28bfa9 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-025.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-025.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-025-ref.xht" />
 		<meta name="assert" content="The license element contains a text element that contains a div element with INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-025.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-026-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-026-ref.xht
index d03164325df..fd2a65f2c61 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-026-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-026-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element contains a text element that contains a div element with &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-026.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-026.xht
index 7c69f771458..99c3c073d2c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-026.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-026.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-026-ref.xht" />
 		<meta name="assert" content="The license element contains a text element that contains a div element with &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-026.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-027-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-027-ref.xht
index f7e68c748e9..7820452bf3c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-027-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-027-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element contains a text element that contains a span element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-027.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-027.xht
index 7c4b0b8f04b..35ec6def929 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-027.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-027.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-027-ref.xht" />
 		<meta name="assert" content="The license element contains a text element that contains a span element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-027.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-028-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-028-ref.xht
index 7a30c748d63..8eb30efa0bc 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-028-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-028-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element contains a text element that contains two span elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-028.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-028.xht
index 0cb04823d64..ec10c6dcb03 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-028.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-028.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-028-ref.xht" />
 		<meta name="assert" content="The license element contains a text element that contains two span elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-028.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-029-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-029-ref.xht
index b80187578d3..7b19d1a5e93 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-029-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-029-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element contains a text element that contains nested span elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-029.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-029.xht
index 55204e5a214..6c1c73908b6 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-029.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-029.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-029-ref.xht" />
 		<meta name="assert" content="The license element contains a text element that contains nested span elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-029.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-030-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-030-ref.xht
index f327db10db2..77cb9e09484 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-030-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-030-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element contains a text element that contains a span element with ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-030.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-030.xht
index 4242079ab85..a07f92ba364 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-030.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-030.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-030-ref.xht" />
 		<meta name="assert" content="The license element contains a text element that contains a span element with ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-030.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-031-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-031-ref.xht
index a8fb70d0705..06f5d0ee743 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-031-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-031-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element contains a text element that contains a span element with rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-031.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-031.xht
index 87b0636f09c..bc13b59e884 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-031.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-031.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-031-ref.xht" />
 		<meta name="assert" content="The license element contains a text element that contains a span element with rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-031.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-032-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-032-ref.xht
index 24ebb961e13..b2b06901afa 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-032-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-032-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element contains a text element that contains a span element with INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-032.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-032.xht
index f05453f0f90..ce2e1250ca8 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-032.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-032.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-032-ref.xht" />
 		<meta name="assert" content="The license element contains a text element that contains a span element with INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-032.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-033-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-033-ref.xht
index f2c18777a4e..4410d5a7dce 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-033-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-033-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The license element contains a text element that contains a span element with &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-033.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-033.xht
index 832608e5273..c9e8eae9f6a 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-033.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-033.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-license-033-ref.xht" />
 		<meta name="assert" content="The license element contains a text element that contains a span element with &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-license-033.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-001-ref.xht
index aa5023caf68..999f22153f0 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-001-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The licensee element matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-001.xht
index 099a09d3320..8eb9e69457f 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-001.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-licensee-001-ref.xht" />
 		<meta name="assert" content="The licensee element matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-licensee-001.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-002-ref.xht
index bd22bf8b581..fd6fee3c444 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-002-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The licensee element occurs more than once." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-002.xht
index d2b18fe46aa..157cfb43b2a 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-002.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-licensee-002-ref.xht" />
 		<meta name="assert" content="The licensee element occurs more than once." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-licensee-002.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-003-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-003-ref.xht
index 18695326de9..faca6c989a7 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-003-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-003-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The licensee element does not contain the required name attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-003.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-003.xht
index 96f6dbcbdb3..8b8628c9c13 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-003.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-003.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-licensee-003-ref.xht" />
 		<meta name="assert" content="The licensee element does not contain the required name attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-licensee-003.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-004-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-004-ref.xht
index 7366944e84b..58095543052 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-004-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-004-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The licensee element has ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-004.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-004.xht
index 1089ecd05f3..5dc8b95b3c6 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-004.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-004.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-licensee-004-ref.xht" />
 		<meta name="assert" content="The licensee element has ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-licensee-004.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-005-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-005-ref.xht
index f1be7838e67..688199f2807 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-005-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-005-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The licensee element has rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-005.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-005.xht
index 0e59e1e21fe..aaa01123871 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-005.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-005.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-licensee-005-ref.xht" />
 		<meta name="assert" content="The licensee element has rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-licensee-005.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-006-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-006-ref.xht
index 7fd79f31c48..bb836ec317a 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-006-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-006-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The licensee element has INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-006.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-006.xht
index 4e2a08a4ac3..f6b0a035d99 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-006.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-006.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-licensee-006-ref.xht" />
 		<meta name="assert" content="The licensee element has INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-licensee-006.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-007-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-007-ref.xht
index fd592ee833f..0a45a652d1c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-007-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-007-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The licensee element has &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-007.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-007.xht
index d3068f7fcb3..9d40be197af 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-007.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-007.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-licensee-007-ref.xht" />
 		<meta name="assert" content="The licensee element has &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-licensee-007.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-008-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-008-ref.xht
index 0d49ddfa619..f053afa9284 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-008-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-008-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The licensee element occures more than once." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-008.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-008.xht
index a7b08663456..a348dd95947 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-008.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-008.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-licensee-008-ref.xht" />
 		<meta name="assert" content="The licensee element occures more than once." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-licensee-008.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-009-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-009-ref.xht
index 8adbd46289f..4e374df81c7 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-009-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-009-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The licensee element contains a child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-009.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-009.xht
index 159f923e7bb..802704169ec 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-009.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-009.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-licensee-009-ref.xht" />
 		<meta name="assert" content="The licensee element contains a child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-licensee-009.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-010-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-010-ref.xht
index 7c52fcec5aa..4d6d71b1c6c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-010-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-010-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The licensee element contains content." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-010.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-010.xht
index aefd4addde0..08f64667e2b 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-010.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-010.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-licensee-010-ref.xht" />
 		<meta name="assert" content="The licensee element contains content." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-licensee-010.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-001-ref.xht
index f9a79b3d2bb..b3f829cbc80 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-001-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The metadata element matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-001.xht
index 88af4ed8b4f..67e87b6935f 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-001.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-metadata-001-ref.xht" />
 		<meta name="assert" content="The metadata element matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-metadata-001.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-002-ref.xht
index b65b5d96191..39f254b2c67 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-002-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The top element is &quot;INVALID&quot; instead of &quot;metadata&quot;." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-002.xht
index b2742dce6a1..cf9c689cc18 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-002.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-metadata-002-ref.xht" />
 		<meta name="assert" content="The top element is &quot;INVALID&quot; instead of &quot;metadata&quot;." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-metadata-002.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-003-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-003-ref.xht
index df308182cbe..522347d11e9 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-003-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-003-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The metadata element does not contain the required version attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-003.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-003.xht
index 2556914e08d..f0b0b754fb1 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-003.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-003.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-metadata-003-ref.xht" />
 		<meta name="assert" content="The metadata element does not contain the required version attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-metadata-003.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-004-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-004-ref.xht
index 18526a2a204..a1fb7fc66fb 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-004-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-004-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The metadata element version attribute is set to 'ABC'." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-004.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-004.xht
index 826c1a75bb7..eefb6fc7543 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-004.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-004.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-metadata-004-ref.xht" />
 		<meta name="assert" content="The metadata element version attribute is set to 'ABC'." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-metadata-004.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-005-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-005-ref.xht
index 3d69e2e1230..b00f9106e7e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-005-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-005-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The metadata element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-005.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-005.xht
index a43272f882b..645b8be9d49 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-005.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-005.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-metadata-005-ref.xht" />
 		<meta name="assert" content="The metadata element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-metadata-005.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-006-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-006-ref.xht
index eea3002d4e0..d2e41a1593c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-006-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-006-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The metadata element contains an unknown child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-006.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-006.xht
index 0d5c95a84ea..daec758edd8 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-006.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-006.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-metadata-006-ref.xht" />
 		<meta name="assert" content="The metadata element contains an unknown child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-metadata-006.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-001-ref.xht
index 8052d7b6df1..adc11615fc2 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-001-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element matches the schema. It contains one text element that does not have a language tag." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-001.xht
index 817e049fd18..888bdd51893 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-001.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-001-ref.xht" />
 		<meta name="assert" content="The trademark element matches the schema. It contains one text element that does not have a language tag." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-001.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-002-ref.xht
index 563d518518e..23ffb1ba749 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-002-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element matches the schema. It contains one text element that has a language tag." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-002.xht
index d92c24d514b..72be2c5c9fb 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-002.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-002-ref.xht" />
 		<meta name="assert" content="The trademark element matches the schema. It contains one text element that has a language tag." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-002.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-003-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-003-ref.xht
index cfdd1e5a24b..5918c6b057d 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-003-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-003-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element matches the schema. It contains one text element that has a language tag using the lang tag instead of xml:lang." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-003.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-003.xht
index 84c62633334..9d85d16fcfb 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-003.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-003.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-003-ref.xht" />
 		<meta name="assert" content="The trademark element matches the schema. It contains one text element that has a language tag using the lang tag instead of xml:lang." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-003.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-004-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-004-ref.xht
index c5ba63a5ce7..c05fb938b31 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-004-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-004-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element matches the schema. One text element does not have a language tag. One text element has a language tag." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-004.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-004.xht
index 4b8565eabe4..48f5ceb7ed2 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-004.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-004.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-004-ref.xht" />
 		<meta name="assert" content="The trademark element matches the schema. One text element does not have a language tag. One text element has a language tag." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-004.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-005-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-005-ref.xht
index 372d40d95cf..1cec3f085ce 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-005-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-005-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element matches the schema. Two text elements have a language tags." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-005.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-005.xht
index 04a1cdfb486..d71a2704bb0 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-005.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-005.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-005-ref.xht" />
 		<meta name="assert" content="The trademark element matches the schema. Two text elements have a language tags." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-005.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-006-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-006-ref.xht
index 5da81ba6050..1c3f864481d 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-006-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-006-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element occurs more than once." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-006.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-006.xht
index 93122adece8..68976d0acc8 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-006.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-006.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-006-ref.xht" />
 		<meta name="assert" content="The trademark element occurs more than once." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-006.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-007-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-007-ref.xht
index 95183897665..cb71c084866 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-007-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-007-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element does not contain a text child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-007.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-007.xht
index 2256d043788..e43b077a2bb 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-007.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-007.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-007-ref.xht" />
 		<meta name="assert" content="The trademark element does not contain a text child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-007.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-008-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-008-ref.xht
index 758be5f1a20..caa467c7e0e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-008-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-008-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-008.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-008.xht
index 9b8d855649a..e1e8d8c39e6 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-008.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-008.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-008-ref.xht" />
 		<meta name="assert" content="The trademark element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-008.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-009-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-009-ref.xht
index 5b6c6a6bc37..9d58a31a3d7 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-009-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-009-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element contains an unknown child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-009.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-009.xht
index 673ddb980ad..a90b8b57304 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-009.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-009.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-009-ref.xht" />
 		<meta name="assert" content="The trademark element contains an unknown child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-009.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-010-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-010-ref.xht
index 4fbe0934e6d..724667be8ea 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-010-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-010-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element contains content." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-010.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-010.xht
index a44b66b501b..9b9bc80e74f 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-010.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-010.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-010-ref.xht" />
 		<meta name="assert" content="The trademark element contains content." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-010.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-011-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-011-ref.xht
index 2ff5fcc817e..df2ba471368 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-011-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-011-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element contains a text element with ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-011.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-011.xht
index 3e1b487b0e4..2590f382c18 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-011.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-011.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-011-ref.xht" />
 		<meta name="assert" content="The trademark element contains a text element with ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-011.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-012-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-012-ref.xht
index 9a1015713dc..2e25d4c0c6f 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-012-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-012-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element contains a text element with rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-012.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-012.xht
index 765a9cae499..cc3cc88589e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-012.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-012.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-012-ref.xht" />
 		<meta name="assert" content="The trademark element contains a text element with rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-012.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-013-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-013-ref.xht
index 425c83785d3..3fb5253bffc 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-013-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-013-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element contains a text element with INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-013.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-013.xht
index cbf110f5288..fc3b2021676 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-013.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-013.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-013-ref.xht" />
 		<meta name="assert" content="The trademark element contains a text element with INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-013.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-014-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-014-ref.xht
index 2e62b86b36b..2e52466f09f 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-014-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-014-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element contains a text element with &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-014.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-014.xht
index 7c6efd7f01c..659d177c2dc 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-014.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-014.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-014-ref.xht" />
 		<meta name="assert" content="The trademark element contains a text element with &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-014.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-015-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-015-ref.xht
index 4533937d695..2c79b9d746e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-015-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-015-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element contains a text element with an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-015.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-015.xht
index dc873148b42..72cd4885f8b 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-015.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-015.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-015-ref.xht" />
 		<meta name="assert" content="The trademark element contains a text element with an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-015.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-016-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-016-ref.xht
index 511807b9219..bff2ac71200 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-016-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-016-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element contains a text element with an unknown child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-016.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-016.xht
index 54a8a595822..deec26caaca 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-016.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-016.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-016-ref.xht" />
 		<meta name="assert" content="The trademark element contains a text element with an unknown child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-016.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-017-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-017-ref.xht
index 5f1da82d47e..585452f378d 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-017-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-017-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element contains a text element that contains a div element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-017.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-017.xht
index 356ccba08bf..7189eeaa5a3 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-017.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-017.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-017-ref.xht" />
 		<meta name="assert" content="The trademark element contains a text element that contains a div element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-017.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-018-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-018-ref.xht
index dabccf794fb..000a22d1e8f 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-018-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-018-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element contains a text element that contains two div elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-018.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-018.xht
index 51a7edb6674..eaa600a7bf6 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-018.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-018.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-018-ref.xht" />
 		<meta name="assert" content="The trademark element contains a text element that contains two div elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-018.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-019-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-019-ref.xht
index 481506a3e20..1c8174d742e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-019-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-019-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element contains a text element that contains nested div elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-019.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-019.xht
index e6c6060884b..d977829ea99 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-019.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-019.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-019-ref.xht" />
 		<meta name="assert" content="The trademark element contains a text element that contains nested div elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-019.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-020-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-020-ref.xht
index 159badc54d8..418c72c8d6b 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-020-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-020-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element contains a text element that contains a div element with ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-020.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-020.xht
index 20f046b10b2..20e2aaaf8eb 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-020.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-020.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-020-ref.xht" />
 		<meta name="assert" content="The trademark element contains a text element that contains a div element with ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-020.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-021-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-021-ref.xht
index 29ecb4c8920..7ffcffb36c6 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-021-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-021-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element contains a text element that contains a div element with rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-021.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-021.xht
index 9aed3f4dfd6..c5a7b255962 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-021.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-021.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-021-ref.xht" />
 		<meta name="assert" content="The trademark element contains a text element that contains a div element with rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-021.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-022-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-022-ref.xht
index cca6959863e..fcba6d484ab 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-022-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-022-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element contains a text element that contains a div element with INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-022.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-022.xht
index 34926e5f733..45f45211484 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-022.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-022.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-022-ref.xht" />
 		<meta name="assert" content="The trademark element contains a text element that contains a div element with INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-022.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-023-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-023-ref.xht
index b75376e86a2..5674b896bd5 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-023-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-023-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element contains a text element that contains a div element with &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-023.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-023.xht
index cfa9a634a69..00c2be0631a 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-023.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-023.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-023-ref.xht" />
 		<meta name="assert" content="The trademark element contains a text element that contains a div element with &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-023.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-024-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-024-ref.xht
index 605527f269b..b979dcc3147 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-024-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-024-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element contains a text element that contains a span element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-024.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-024.xht
index 71ffe135395..43f49438eee 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-024.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-024.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-024-ref.xht" />
 		<meta name="assert" content="The trademark element contains a text element that contains a span element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-024.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-025-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-025-ref.xht
index a5ccbe9ecb5..4cfa297f439 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-025-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-025-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element contains a text element that contains two span elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-025.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-025.xht
index 8a95493a0b6..c8323dc07ba 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-025.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-025.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-025-ref.xht" />
 		<meta name="assert" content="The trademark element contains a text element that contains two span elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-025.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-026-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-026-ref.xht
index 49c1101e129..44268570cf6 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-026-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-026-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element contains a text element that contains nested span elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-026.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-026.xht
index d46eb962bea..e499d3c4811 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-026.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-026.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-026-ref.xht" />
 		<meta name="assert" content="The trademark element contains a text element that contains nested span elements." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-026.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-027-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-027-ref.xht
index 0da559e5866..f32252f068d 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-027-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-027-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element contains a text element that contains a span element with ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-027.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-027.xht
index 0d3f578f1c4..c1b3f0b7097 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-027.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-027.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-027-ref.xht" />
 		<meta name="assert" content="The trademark element contains a text element that contains a span element with ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-027.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-028-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-028-ref.xht
index 54856064f21..9f27e3e9810 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-028-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-028-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element contains a text element that contains a span element with rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-028.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-028.xht
index 62a64d73dea..b7496c9e98a 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-028.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-028.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-028-ref.xht" />
 		<meta name="assert" content="The trademark element contains a text element that contains a span element with rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-028.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-029-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-029-ref.xht
index 551118aa12d..8b67070e86f 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-029-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-029-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element contains a text element that contains a span element with INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-029.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-029.xht
index f9be4a8288c..f6f9247fa26 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-029.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-029.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-029-ref.xht" />
 		<meta name="assert" content="The trademark element contains a text element that contains a span element with INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-029.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-030-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-030-ref.xht
index b142618fb33..c40bd6d57e3 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-030-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-030-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The trademark element contains a text element that contains a span element with &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-030.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-030.xht
index 7b3ce187a61..f590a57ac0a 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-030.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-030.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-trademark-030-ref.xht" />
 		<meta name="assert" content="The trademark element contains a text element that contains a span element with &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-trademark-030.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-001-ref.xht
index b8d6c87c38e..84816a06fac 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-001-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The uniqueid element matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-001.xht
index cab63439458..2918abcf03d 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-001.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-uniqueid-001-ref.xht" />
 		<meta name="assert" content="The uniqueid element matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-uniqueid-001.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-002-ref.xht
index efe98c4fefc..26124e740a2 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-002-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The uniqueid element doesn't exist." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-002.xht
index 904700e1706..bed7b9243ac 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-002.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-uniqueid-002-ref.xht" />
 		<meta name="assert" content="The uniqueid element doesn't exist." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-uniqueid-002.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-003-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-003-ref.xht
index 2891c5eeffc..a1227bf26f8 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-003-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-003-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The uniqueid element occurs twice." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-003.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-003.xht
index 80b87eb22d4..34ea79b3027 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-003.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-003.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-uniqueid-003-ref.xht" />
 		<meta name="assert" content="The uniqueid element occurs twice." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-uniqueid-003.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-004-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-004-ref.xht
index e25088009df..8c85076a8e1 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-004-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-004-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-id-required" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The uniqueid element does not contain the required id attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-004.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-004.xht
index f100ea0e492..03d0f7302c9 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-004.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-004.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-id-required" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-uniqueid-004-ref.xht" />
 		<meta name="assert" content="The uniqueid element does not contain the required id attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-uniqueid-004.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-005-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-005-ref.xht
index c4135203d68..a00e513a99f 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-005-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-005-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The uniqueid element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-005.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-005.xht
index 2c689de4391..41c897af568 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-005.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-005.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-uniqueid-005-ref.xht" />
 		<meta name="assert" content="The uniqueid element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-uniqueid-005.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-006-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-006-ref.xht
index a73db4dab9e..36c2db9f892 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-006-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-006-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The uniqueid element contains a child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-006.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-006.xht
index 3855942779b..98fd0a24f0d 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-006.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-006.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-uniqueid-006-ref.xht" />
 		<meta name="assert" content="The uniqueid element contains a child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-uniqueid-006.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-007-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-007-ref.xht
index 7567affdb41..7adfa479e41 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-007-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-007-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The uniqueid element contains content." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-007.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-007.xht
index 91ad1f817fe..2293b936328 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-007.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-007.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-uniqueid-007-ref.xht" />
 		<meta name="assert" content="The uniqueid element contains content." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-uniqueid-007.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-001-ref.xht
index 4856eaac7a7..0f927b6ff3d 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-001-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The vendor element matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-001.xht
index e13ca3ef2d9..1651b31c2a9 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-001.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-vendor-001-ref.xht" />
 		<meta name="assert" content="The vendor element matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-vendor-001.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-002-ref.xht
index 8bb0eadee64..4e86ca50413 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-002-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The vendor element does not contain a url attribute but it still matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-002.xht
index cfbc5c57462..69c690b470d 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-002.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-vendor-002-ref.xht" />
 		<meta name="assert" content="The vendor element does not contain a url attribute but it still matches the schema." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-vendor-002.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-003-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-003-ref.xht
index 45fa0506ecb..f83fe7d98d9 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-003-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-003-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The vendor element doesn't exist." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-003.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-003.xht
index 3bc5ef68fea..3a6fba33130 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-003.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-003.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-vendor-003-ref.xht" />
 		<meta name="assert" content="The vendor element doesn't exist." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-vendor-003.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-004-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-004-ref.xht
index 062e5287acc..3737c28dd78 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-004-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-004-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The vendor element occurs twice." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-004.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-004.xht
index 6880d7f0a45..4c66dc3029b 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-004.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-004.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-vendor-004-ref.xht" />
 		<meta name="assert" content="The vendor element occurs twice." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-vendor-004.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-005-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-005-ref.xht
index 4dd8d1e3563..7aaf5a7e69d 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-005-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-005-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-vendor-required" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The vendor element does not contain the required name attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-005.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-005.xht
index 73e915f409c..2febf54adeb 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-005.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-005.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-vendor-required" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-vendor-005-ref.xht" />
 		<meta name="assert" content="The vendor element does not contain the required name attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-vendor-005.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-006-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-006-ref.xht
index 6368430335b..d5a5ffb7665 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-006-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-006-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The vendor element contains ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-006.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-006.xht
index 37b1b337b9e..45aa869ada9 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-006.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-006.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-vendor-006-ref.xht" />
 		<meta name="assert" content="The vendor element contains ltr as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-vendor-006.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-007-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-007-ref.xht
index 3431a79547b..bd4c76e7d74 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-007-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-007-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The vendor element contains rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-007.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-007.xht
index d541a7a869b..20f64c85c06 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-007.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-007.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-vendor-007-ref.xht" />
 		<meta name="assert" content="The vendor element contains rtl as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-vendor-007.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-008-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-008-ref.xht
index f497f2f8278..51b50e0c4a0 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-008-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-008-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The vendor element contains INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-008.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-008.xht
index 8dee1045379..7134a9d9a9a 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-008.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-008.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-vendor-008-ref.xht" />
 		<meta name="assert" content="The vendor element contains INVALID as the value for the dir attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-vendor-008.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-009-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-009-ref.xht
index bd84987e0b8..587316614c4 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-009-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-009-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The vendor element contains &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-009.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-009.xht
index 6dfa088057d..2c6831733a9 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-009.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-009.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-vendor-009-ref.xht" />
 		<meta name="assert" content="The vendor element contains &quot;class1 class2 class3&quot; as the value for the class attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-vendor-009.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-010-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-010-ref.xht
index b2931e3b7c4..8ffef130aa0 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-010-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-010-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The vendor element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-010.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-010.xht
index 6e1a3d85d0e..4cdd4a98088 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-010.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-010.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-vendor-010-ref.xht" />
 		<meta name="assert" content="The vendor element contains an unknown attribute." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-vendor-010.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-011-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-011-ref.xht
index bbe59694195..c600c4a2c9b 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-011-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-011-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The vendor element contains a child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-011.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-011.xht
index e4e18197d05..50792926603 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-011.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-011.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-vendor-011-ref.xht" />
 		<meta name="assert" content="The vendor element contains a child element." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-vendor-011.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-012-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-012-ref.xht
index d1071e8f1e8..fb93fde91c0 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-012-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-012-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The vendor element contains content." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-012.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-012.xht
index c74a1bcbc07..4afa9ab409c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-012.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-012.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-schema-vendor-012-ref.xht" />
 		<meta name="assert" content="The vendor element contains content." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-schema-vendor-012.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-001-ref.xht
index 401e701a1ae..045d6e7246d 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-001-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The text element in the description element contains an unescaped &lt;." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-001.xht
index 8ec8dac3b7e..ebdae9a039d 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-001.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-well-formed-001-ref.xht" />
 		<meta name="assert" content="The text element in the description element contains an unescaped &lt;." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-well-formed-001.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-002-ref.xht
index 6770c12acb1..f2b1dd40eea 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-002-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The text element in the description element contains an unescaped &amp;." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-002.xht
index e01f03b1e83..5fd42515d26 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-002.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-well-formed-002-ref.xht" />
 		<meta name="assert" content="The text element in the description element contains an unescaped &amp;." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-well-formed-002.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-003-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-003-ref.xht
index 2a2f20d8498..292b121d2f6 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-003-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-003-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="One element begins with &lt;description&gt; but ends with &lt;/mismatch&gt;." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-003.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-003.xht
index cc65d20ccea..d0d166bca2c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-003.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-003.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-well-formed-003-ref.xht" />
 		<meta name="assert" content="One element begins with &lt;description&gt; but ends with &lt;/mismatch&gt;." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-well-formed-003.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-004-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-004-ref.xht
index 34356a97f6b..1a3c1908163 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-004-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-004-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The text element element in the description element is not closed." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-004.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-004.xht
index f65559e8558..47ed2b572cb 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-004.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-004.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-well-formed-004-ref.xht" />
 		<meta name="assert" content="The text element element in the description element is not closed." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-well-formed-004.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-005-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-005-ref.xht
index edfb5940e9d..86e816b56b6 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-005-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-005-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The &lt;description&gt; element is closed with &lt;DESCRIPTION&gt;." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-005.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-005.xht
index 1caca2d6e2c..807759639d3 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-005.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-005.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-well-formed-005-ref.xht" />
 		<meta name="assert" content="The &lt;description&gt; element is closed with &lt;DESCRIPTION&gt;." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-well-formed-005.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-006-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-006-ref.xht
index 9d06628ba45..fe09ac17cc6 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-006-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-006-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The metadata root element occurs twice." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-006.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-006.xht
index 7cd5edb84fb..637fc85f98c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-006.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-006.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-well-formed-006-ref.xht" />
 		<meta name="assert" content="The metadata root element occurs twice." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-well-formed-006.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-007-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-007-ref.xht
index de26b0ceef1..6ee7f16e199 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-007-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-007-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The xml encoding is set to 'VSCACS-GFV-X-CQ34QTAB2Q-IS-NOT-A-VALID-ENCODING'." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-007.xht b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-007.xht
index 93bc9e42d8e..c769f213091 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-007.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-007.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Metadata" />
 		<link rel="help" href="http://www.w3.org/TR/WOFF/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-invalid-mustignore" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="metadatadisplay-well-formed-007-ref.xht" />
 		<meta name="assert" content="The xml encoding is set to 'VSCACS-GFV-X-CQ34QTAB2Q-IS-NOT-A-VALID-ENCODING'." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/metadatadisplay-well-formed-007.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>If the UA does not display WOFF metadata, the test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is not valid and must not be displayed. If the UA does display it, the test fails.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/privatedata-noeffect-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/privatedata-noeffect-001-ref.xht
index dc3f273fc48..8c231c5249e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/privatedata-noeffect-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/privatedata-noeffect-001-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Private" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-private-noeffect" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The file has no private data." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/privatedata-noeffect-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/privatedata-noeffect-001.xht
index 18506492568..b4313eed5bb 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/privatedata-noeffect-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/privatedata-noeffect-001.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Private" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-private-noeffect" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="privatedata-noeffect-001-ref.xht" />
 		<meta name="assert" content="The file has no private data." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/privatedata-noeffect-001.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/privatedata-noeffect-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/privatedata-noeffect-002-ref.xht
index c0eb9727c35..3c093c8d8a5 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/privatedata-noeffect-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/privatedata-noeffect-002-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Private" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-private-noeffect" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The file has private data." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/privatedata-noeffect-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/privatedata-noeffect-002.xht
index 0f15a64eed5..ad522776d04 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/privatedata-noeffect-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/privatedata-noeffect-002.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Tal Leming" href="http://typesupply.com" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#Private" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-private-noeffect" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="privatedata-noeffect-002-ref.xht" />
 		<meta name="assert" content="The file has private data." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/privatedata-noeffect-002.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/FontsToInstall/SFNT-CFF-Fallback.otf b/tests/wpt/web-platform-tests/css/WOFF2/support/SFNT-CFF-Fallback.otf
index 7225032d10a..7225032d10a 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/support/FontsToInstall/SFNT-CFF-Fallback.otf
+++ b/tests/wpt/web-platform-tests/css/WOFF2/support/SFNT-CFF-Fallback.otf
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/FontsToInstall/SFNT-CFF-Reference.otf b/tests/wpt/web-platform-tests/css/WOFF2/support/SFNT-CFF-Reference.otf
index a37627113fd..a37627113fd 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/support/FontsToInstall/SFNT-CFF-Reference.otf
+++ b/tests/wpt/web-platform-tests/css/WOFF2/support/SFNT-CFF-Reference.otf
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/FontsToInstall/SFNT-TTF-Fallback.ttf b/tests/wpt/web-platform-tests/css/WOFF2/support/SFNT-TTF-Fallback.ttf
index 9e1695ba4e8..9e1695ba4e8 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/support/FontsToInstall/SFNT-TTF-Fallback.ttf
+++ b/tests/wpt/web-platform-tests/css/WOFF2/support/SFNT-TTF-Fallback.ttf
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/FontsToInstall/SFNT-TTF-Reference.ttf b/tests/wpt/web-platform-tests/css/WOFF2/support/SFNT-TTF-Reference.ttf
index be8054a2162..be8054a2162 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/support/FontsToInstall/SFNT-TTF-Reference.ttf
+++ b/tests/wpt/web-platform-tests/css/WOFF2/support/SFNT-TTF-Reference.ttf
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/available-001a.xht b/tests/wpt/web-platform-tests/css/WOFF2/support/available-001a.xht
index f5308492e42..7612b2d6e79 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/support/available-001a.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/support/available-001a.xht
@@ -7,9 +7,9 @@
 		<link rel="author" title="Chris Lilley" href="http://www.w3.org/People" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#General" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-css3font-available" />
-		<meta name="flags" content="font" />
 		<meta name="assert" content="Linked fonts are only available to the documents that reference them" />
 		<style type="text/css"><![CDATA[
+			@import url("test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("valid-001.woff2") format("woff2");
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/available-001b.xht b/tests/wpt/web-platform-tests/css/WOFF2/support/available-001b.xht
index 3f3d7015267..e466eccd41f 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/support/available-001b.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/support/available-001b.xht
@@ -7,9 +7,9 @@
 		<link rel="author" title="Chris Lilley" href="http://www.w3.org/People" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#General" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-css3font-available" />
-		<meta name="flags" content="font" />
 		<meta name="assert" content="Linked fonts are only available to the documents that reference them" />
 		<style type="text/css"><![CDATA[
+			@import url("test-fonts.css");
 			body {
 				font-size: 20px;
 			}
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/index.css b/tests/wpt/web-platform-tests/css/WOFF2/support/index.css
index fbfb91442c8..f18ab134aef 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/support/index.css
+++ b/tests/wpt/web-platform-tests/css/WOFF2/support/index.css
@@ -29,17 +29,6 @@ h1 {
 	padding: 0px 0px 20px 0px;
 }
 
-p.installFontsNote {
-	font-weight: bold;
-	color: white;
-	background-color: red;
-	padding: 5px 10px 5px 10px;
-}
-
-p.installFontsNote a {
-	color: white;
-}
-
 .mainNote {
 	margin: 0px;
 	padding: 15px 0px 15px 0px;
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/test-fonts.css b/tests/wpt/web-platform-tests/css/WOFF2/support/test-fonts.css
new file mode 100644
index 00000000000..477f4428ccb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/WOFF2/support/test-fonts.css
@@ -0,0 +1,19 @@
+@font-face {
+    font-family: "WOFF Test CFF Fallback";
+    src: url("SFNT-CFF-Fallback.otf") format("opentype");
+}
+
+@font-face {
+    font-family: "WOFF Test CFF Reference";
+    src: url("SFNT-CFF-Reference.otf") format("opentype");
+}
+
+@font-face {
+    font-family: "WOFF Test TTF Fallback";
+    src: url("SFNT-TTF-Fallback.ttf") format("truetype");
+}
+
+@font-face {
+    font-family: "WOFF Test TTF Reference";
+    src: url("SFNT-TTF-Reference.ttf") format("truetype");
+}
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-bad-origlength-loca-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-bad-origlength-loca-001-ref.xht
index c7c5dc780e1..4acdc1465e2 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-bad-origlength-loca-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-bad-origlength-loca-001-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustRejectLoca" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The origLength of the loca table is 4 bytes less than the calculated size" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-bad-origlength-loca-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-bad-origlength-loca-001.xht
index 2f3199432f0..57283ebf006 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-bad-origlength-loca-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-bad-origlength-loca-001.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustRejectLoca" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="tabledata-bad-origlength-loca-001-ref.xht" />
 		<meta name="assert" content="The origLength of the loca table is 4 bytes less than the calculated size" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/tabledata-bad-origlength-loca-001.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-bad-origlength-loca-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-bad-origlength-loca-002-ref.xht
index 1b92923b6ee..f6eb8691f4e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-bad-origlength-loca-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-bad-origlength-loca-002-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustRejectLoca" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The origLength of the loca table is 4 bytes more than the calculated size" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-bad-origlength-loca-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-bad-origlength-loca-002.xht
index f9733a7cfd1..7c3f5598df0 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-bad-origlength-loca-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-bad-origlength-loca-002.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustRejectLoca" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="tabledata-bad-origlength-loca-002-ref.xht" />
 		<meta name="assert" content="The origLength of the loca table is 4 bytes more than the calculated size" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/tabledata-bad-origlength-loca-002.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-brotli-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-brotli-001-ref.xht
index 22f2df1a673..f7efe438004 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-brotli-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-brotli-001-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustBeInvalidated-FailDecompress" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="Font table data is compressed with zlib instead of Brotli." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-brotli-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-brotli-001.xht
index 49c8766edde..fd7388b513c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-brotli-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-brotli-001.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustBeInvalidated-FailDecompress" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="tabledata-brotli-001-ref.xht" />
 		<meta name="assert" content="Font table data is compressed with zlib instead of Brotli." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/tabledata-brotli-001.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-001-ref.xht
index b4d0776e8e5..5368e1d1d6a 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-001-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustBeInvalidated-FailSize" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The original length of the first table in the directory is increased by 1, making the decompressed length of the table data less than the sum of original table lengths." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-001.xht
index f26f73d9390..ae941fc3000 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-001.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustBeInvalidated-FailSize" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="tabledata-decompressed-length-001-ref.xht" />
 		<meta name="assert" content="The original length of the first table in the directory is increased by 1, making the decompressed length of the table data less than the sum of original table lengths." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/tabledata-decompressed-length-001.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-002-ref.xht
index 018fdf33870..004d61093c5 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-002-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustBeInvalidated-FailSize" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The original length of the first table in the directory is decreased by 1, making the decompressed length of the table data greater than the sum of original table lengths." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-002.xht
index bf4b59b874c..acf2ccd4193 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-002.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustBeInvalidated-FailSize" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="tabledata-decompressed-length-002-ref.xht" />
 		<meta name="assert" content="The original length of the first table in the directory is decreased by 1, making the decompressed length of the table data greater than the sum of original table lengths." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/tabledata-decompressed-length-002.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-003-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-003-ref.xht
index d7e37611910..2bbbd5aad19 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-003-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-003-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustBeInvalidated-FailSize" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The transformed length of the glyf table in the directory is increased by 1, making the decompressed length of the table data less than the sum of transformed table lengths." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-003.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-003.xht
index 1e9ca1c91a3..81a6601a051 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-003.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-003.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustBeInvalidated-FailSize" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="tabledata-decompressed-length-003-ref.xht" />
 		<meta name="assert" content="The transformed length of the glyf table in the directory is increased by 1, making the decompressed length of the table data less than the sum of transformed table lengths." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/tabledata-decompressed-length-003.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-004-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-004-ref.xht
index 26695f4587d..5a87ea20bab 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-004-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-004-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustBeInvalidated-FailSize" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The transformed length of the glyf table in the directory is decreased by 1, making the decompressed length of the table data greater than the sum of transformed table lengths." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-004.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-004.xht
index 6f258d1ca05..ec129f31251 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-004.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-004.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustBeInvalidated-FailSize" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="tabledata-decompressed-length-004-ref.xht" />
 		<meta name="assert" content="The transformed length of the glyf table in the directory is decreased by 1, making the decompressed length of the table data greater than the sum of transformed table lengths." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/tabledata-decompressed-length-004.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-extraneous-data-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-extraneous-data-001-ref.xht
index d52bb9c0c85..aa3282699d6 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-extraneous-data-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-extraneous-data-001-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustRejectExtraData" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="There is extraneous data before the last table." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-extraneous-data-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-extraneous-data-001.xht
index 9c0389a60cc..c85538c5eaf 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-extraneous-data-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-extraneous-data-001.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustRejectExtraData" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="tabledata-extraneous-data-001-ref.xht" />
 		<meta name="assert" content="There is extraneous data before the last table." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/tabledata-extraneous-data-001.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-001-ref.xht
index ba128230ee3..442724f8e9d 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-001-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustCalculateBBox" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="Valid TTF flavored WOFF with a glyph with no explicit bounding box" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-001.xht
index 2b277d3990a..56240c5a60c 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-001.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustCalculateBBox" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="tabledata-glyf-bbox-001-ref.xht" />
 		<meta name="assert" content="Valid TTF flavored WOFF with a glyph with no explicit bounding box" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/tabledata-glyf-bbox-001.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-002-ref.xht
index 0a99e4392df..adfb84c9616 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-002-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustRejectNoCompositeBBox" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="Invalid TTF flavored WOFF due to composite glyphs without bounding box" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-002.xht
index 1c6699dc76d..dde1421f96f 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-002.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustRejectNoCompositeBBox" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="tabledata-glyf-bbox-002-ref.xht" />
 		<meta name="assert" content="Invalid TTF flavored WOFF due to composite glyphs without bounding box" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/tabledata-glyf-bbox-002.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-003-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-003-ref.xht
index c7584c04a8f..9db3f3fc4d9 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-003-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-003-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustRejectNonEmptyBBox" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="Invalid TTF flavored WOFF due to empty glyph with bounding box" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-003.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-003.xht
index 88368a10025..da8cbce1bb2 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-003.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-003.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustRejectNonEmptyBBox" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="tabledata-glyf-bbox-003-ref.xht" />
 		<meta name="assert" content="Invalid TTF flavored WOFF due to empty glyph with bounding box" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/tabledata-glyf-bbox-003.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-001-ref.xht
index dc950ed00fc..cb7b6a08fc3 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-001-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustNotRejectGlyfSizeMismatch" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The origLength field of glyf table contains a too small incorrect value." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-001.xht
index eaa15a4c2aa..ebb41922b44 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-001.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustNotRejectGlyfSizeMismatch" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="tabledata-glyf-origlength-001-ref.xht" />
 		<meta name="assert" content="The origLength field of glyf table contains a too small incorrect value." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/tabledata-glyf-origlength-001.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-002-ref.xht
index de0517f0b2a..3bebeb796b9 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-002-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustNotRejectGlyfSizeMismatch" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The origLength field of glyf table contains a too big incorrect value." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-002.xht
index 706c35e9f48..43b283a9c9b 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-002.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustNotRejectGlyfSizeMismatch" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="tabledata-glyf-origlength-002-ref.xht" />
 		<meta name="assert" content="The origLength field of glyf table contains a too big incorrect value." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/tabledata-glyf-origlength-002.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-non-zero-loca-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-non-zero-loca-001-ref.xht
index 8edc6e8acd9..99995a5dcee 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-non-zero-loca-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-non-zero-loca-001-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustRejectLoca" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="The transformed loca table contains 4 zero bytes and its transformLength is 4." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-non-zero-loca-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-non-zero-loca-001.xht
index 992f4c08992..8caf96b4681 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-non-zero-loca-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-non-zero-loca-001.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustRejectLoca" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="tabledata-non-zero-loca-001-ref.xht" />
 		<meta name="assert" content="The transformed loca table contains 4 zero bytes and its transformLength is 4." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/tabledata-non-zero-loca-001.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-recontruct-loca-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-recontruct-loca-001-ref.xht
index 4b446f33718..61a9696a630 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-recontruct-loca-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-recontruct-loca-001-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustReconstructLoca" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="Valid TTF flavored WOFF with simple composite glyphs where the loca table uses the short format, to check loca reconstruction" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-recontruct-loca-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-recontruct-loca-001.xht
index e695fb2e81a..202ed1707a2 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-recontruct-loca-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-recontruct-loca-001.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustReconstructLoca" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="tabledata-recontruct-loca-001-ref.xht" />
 		<meta name="assert" content="Valid TTF flavored WOFF with simple composite glyphs where the loca table uses the short format, to check loca reconstruction" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/tabledata-recontruct-loca-001.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-bad-flag-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-bad-flag-001-ref.xht
index 723046893c6..b129f50fa12 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-bad-flag-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-bad-flag-001-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustBeRejected-FailTransform" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="Invalid CFF flavored WOFF with head table having transform version 1." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-bad-flag-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-bad-flag-001.xht
index 0e064b49565..f5f59b3324b 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-bad-flag-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-bad-flag-001.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustBeRejected-FailTransform" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="tabledata-transform-bad-flag-001-ref.xht" />
 		<meta name="assert" content="Invalid CFF flavored WOFF with head table having transform version 1." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/tabledata-transform-bad-flag-001.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-bad-flag-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-bad-flag-002-ref.xht
index 0d6c7100ad3..a0d514dcd38 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-bad-flag-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-bad-flag-002-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustBeRejected-FailTransform" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="Invalid TTF flavored WOFF with glyf table having transform version 3." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-bad-flag-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-bad-flag-002.xht
index 869756a727b..5c4a776fadf 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-bad-flag-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-bad-flag-002.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustBeRejected-FailTransform" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="tabledata-transform-bad-flag-002-ref.xht" />
 		<meta name="assert" content="Invalid TTF flavored WOFF with glyf table having transform version 3." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/tabledata-transform-bad-flag-002.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-001-ref.xht
index edbe96524e9..33eddb63c13 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-001-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustAcceptAllTransforms" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="Valid TTF flavored WOFF with transformed hmtx table." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-001.xht
index 5b71cd00a6a..a1f14627778 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-001.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustAcceptAllTransforms" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="tabledata-transform-hmtx-001-ref.xht" />
 		<meta name="assert" content="Valid TTF flavored WOFF with transformed hmtx table." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/tabledata-transform-hmtx-001.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-002-ref.xht
index fcf77794481..ddca14fef64 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-002-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustCheckLSBFlags" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="Valid TTF flavored WOFF with transformed hmtx table and correct flags field." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-002.xht
index 9f776373e86..641df19ada7 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-002.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustCheckLSBFlags" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="tabledata-transform-hmtx-002-ref.xht" />
 		<meta name="assert" content="Valid TTF flavored WOFF with transformed hmtx table and correct flags field." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/tabledata-transform-hmtx-002.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-003-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-003-ref.xht
index 1ccefae8bc4..1d05d9833ec 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-003-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-003-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustCheckLSBFlags" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="Invalid TTF flavored WOFF with transformed hmtx table with non-zero reserved bits of the flags field." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-003.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-003.xht
index a0110c38d90..66815b9e1aa 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-003.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-003.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustCheckLSBFlags" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="tabledata-transform-hmtx-003-ref.xht" />
 		<meta name="assert" content="Invalid TTF flavored WOFF with transformed hmtx table with non-zero reserved bits of the flags field." />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/tabledata-transform-hmtx-003.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-004-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-004-ref.xht
index 352d18682cd..0f071d30995 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-004-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-004-ref.xht
@@ -6,10 +6,10 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustCheckLSBFlags" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="Invalid TTF flavored WOFF with transformed hmtx table with all flags bits set to 0" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -24,7 +24,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-004.xht b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-004.xht
index 0eeac0230cf..af7392b236e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-004.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-004.xht
@@ -6,10 +6,11 @@
 		<link rel="author" title="Khaled Hosny" href="http://khaledhosny.org" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#DataTables" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-mustCheckLSBFlags" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="tabledata-transform-hmtx-004-ref.xht" />
 		<meta name="assert" content="Invalid TTF flavored WOFF with transformed hmtx table with all flags bits set to 0" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/tabledata-transform-hmtx-004.woff2") format("woff2");
@@ -28,7 +29,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">F</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/testcaseindex.xht b/tests/wpt/web-platform-tests/css/WOFF2/testcaseindex.xht
index cbedcb0cf66..b0f6c72df1d 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/testcaseindex.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/testcaseindex.xht
@@ -8,7 +8,6 @@
 	</head>
 	<body>
 		<h1>WOFF 2.0: User Agent Test Suite (303 tests)</h1>
-		<p class="installFontsNote">All of these tests require special fonts to be installed. The fonts can be obtained <a href="support/FontsToInstall">here</a>.</p>
 
 		<h2 class="testCategory">Valid WOFFs</h2>
 		<div class="testCase" id="valid-001">
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-001-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/valid-001-ref.xht
index 5eeba27b70c..35d2f71ab4e 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/valid-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/valid-001-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-private-noeffect" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="Valid CFF flavored WOFF with no metadata and no private data" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-001.xht b/tests/wpt/web-platform-tests/css/WOFF2/valid-001.xht
index cee53cdcc49..84383da0d14 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/valid-001.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/valid-001.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-private-noeffect" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="valid-001-ref.xht" />
 		<meta name="assert" content="Valid CFF flavored WOFF with no metadata and no private data" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/valid-001.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-002-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/valid-002-ref.xht
index 713fcc9455f..d9a38c0ce9d 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/valid-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/valid-002-ref.xht
@@ -8,10 +8,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-private-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-maydisplay" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="Valid CFF flavored WOFF with metadata" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -26,7 +26,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-002.xht b/tests/wpt/web-platform-tests/css/WOFF2/valid-002.xht
index e21b65aaaa6..0dc724b8767 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/valid-002.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/valid-002.xht
@@ -8,10 +8,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-private-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-maydisplay" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="valid-002-ref.xht" />
 		<meta name="assert" content="Valid CFF flavored WOFF with metadata" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/valid-002.woff2") format("woff2");
@@ -30,7 +31,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-003-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/valid-003-ref.xht
index afdb425a138..d2c9e6a1362 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/valid-003-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/valid-003-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-private-noeffect" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="Valid CFF flavored WOFF with private data" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-003.xht b/tests/wpt/web-platform-tests/css/WOFF2/valid-003.xht
index 0e4d3737ac5..a07035c774b 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/valid-003.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/valid-003.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-private-noeffect" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="valid-003-ref.xht" />
 		<meta name="assert" content="Valid CFF flavored WOFF with private data" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/valid-003.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-004-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/valid-004-ref.xht
index 620c3466974..b4b30ce7528 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/valid-004-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/valid-004-ref.xht
@@ -8,10 +8,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-private-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-maydisplay" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="Valid CFF flavored WOFF with metadata and private data" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -26,7 +26,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-004.xht b/tests/wpt/web-platform-tests/css/WOFF2/valid-004.xht
index 0009bf91867..9a704ad5a00 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/valid-004.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/valid-004.xht
@@ -8,10 +8,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-private-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-maydisplay" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="valid-004-ref.xht" />
 		<meta name="assert" content="Valid CFF flavored WOFF with metadata and private data" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/valid-004.woff2") format("woff2");
@@ -30,7 +31,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-005-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/valid-005-ref.xht
index 11bc22233b7..f504cde3bdc 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/valid-005-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/valid-005-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-private-noeffect" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="Valid TTF flavored WOFF with no metadata and no private data" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-005.xht b/tests/wpt/web-platform-tests/css/WOFF2/valid-005.xht
index 70a1751433b..0fa9f495a27 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/valid-005.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/valid-005.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-private-noeffect" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="valid-005-ref.xht" />
 		<meta name="assert" content="Valid TTF flavored WOFF with no metadata and no private data" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/valid-005.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-006-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/valid-006-ref.xht
index 6e30723bdc1..149e12d23d8 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/valid-006-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/valid-006-ref.xht
@@ -8,10 +8,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-private-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-maydisplay" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="Valid TTF flavored WOFF with metadata" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -26,7 +26,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-006.xht b/tests/wpt/web-platform-tests/css/WOFF2/valid-006.xht
index 8ac74e3675e..9fe79c94657 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/valid-006.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/valid-006.xht
@@ -8,10 +8,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-private-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-maydisplay" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="valid-006-ref.xht" />
 		<meta name="assert" content="Valid TTF flavored WOFF with metadata" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/valid-006.woff2") format("woff2");
@@ -30,7 +31,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-007-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/valid-007-ref.xht
index 9bb7531a1c8..244b0bba68a 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/valid-007-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/valid-007-ref.xht
@@ -7,10 +7,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-private-noeffect" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="Valid TTF flavored WOFF with private data" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -25,7 +25,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-007.xht b/tests/wpt/web-platform-tests/css/WOFF2/valid-007.xht
index 7144d5a6d4e..101cbcb1181 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/valid-007.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/valid-007.xht
@@ -7,10 +7,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#FileStructure" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-private-noeffect" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="valid-007-ref.xht" />
 		<meta name="assert" content="Valid TTF flavored WOFF with private data" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/valid-007.woff2") format("woff2");
@@ -29,7 +30,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<div class="test">P</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-008-ref.xht b/tests/wpt/web-platform-tests/css/WOFF2/valid-008-ref.xht
index 599cbcc42d5..e579e81ef5b 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/valid-008-ref.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/valid-008-ref.xht
@@ -8,10 +8,10 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-private-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-maydisplay" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
 		<meta name="assert" content="Valid TTF flavored WOFF with metadata and private data" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			body {
 				font-size: 20px;
 			}
@@ -26,7 +26,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-008.xht b/tests/wpt/web-platform-tests/css/WOFF2/valid-008.xht
index 56711fe7c38..5a6dba9f380 100644
--- a/tests/wpt/web-platform-tests/css/WOFF2/valid-008.xht
+++ b/tests/wpt/web-platform-tests/css/WOFF2/valid-008.xht
@@ -8,10 +8,11 @@
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-private-noeffect" />
 		<link rel="help" href="http://dev.w3.org/webfonts/WOFF2/spec/#conform-metadata-maydisplay" />
-<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
+		<link rel="match" href="valid-008-ref.xht" />
 		<meta name="assert" content="Valid TTF flavored WOFF with metadata and private data" />
 		<style type="text/css"><![CDATA[
+			@import url("support/test-fonts.css");
 			@font-face {
 				font-family: "WOFF Test";
 				src: url("support/valid-008.woff2") format("woff2");
@@ -30,7 +31,6 @@
 		]]></style>
 	</head>
 	<body>
-		<p><a href="support/FontsToInstall">Test fonts</a> must be installed for this test. The WOFF being tested will be loaded over the network so please wait until the download is complete before determing the success of this test.</p>
 		<p>Test passes if the word PASS appears below.</p>
 		<p>The Extended Metadata Block is valid and may be displayed to the user upon request.</p>
 		<div class="test">P</div>
diff --git a/tests/wpt/web-platform-tests/css/css-filter/OWNERS b/tests/wpt/web-platform-tests/css/css-filter/OWNERS
new file mode 100644
index 00000000000..e8e7c5de0bb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-filter/OWNERS
@@ -0,0 +1 @@
+@chrishtr
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-05.xht b/tests/wpt/web-platform-tests/css/css-fonts/font-variant-05.xht
index 8321a8dc44a..7ea3cd9091c 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-05.xht
+++ b/tests/wpt/web-platform-tests/css/css-fonts/font-variant-05.xht
@@ -4,9 +4,9 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title>CSS Test:  font-variant descriptor in @font-face rule is overriden by equivalent style rules</title>
 <link rel="author" title="Mike Bremford" href="mike@bfo.com" />
-<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-variant-prop" />
-<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-rend-desc" />
-<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop" />
+<link rel="help" href="https://www.w3.org/TR/css-fonts-4/#font-variant-prop" />
+<link rel="help" href="https://www.w3.org/TR/css-fonts-4/#font-rend-desc" />
+<link rel="help" href="https://www.w3.org/TR/css-fonts-4/#font-feature-settings-prop" />
 <link rel="match" href="font-variant-05-ref.xht" />
 <meta name="assert" content="Setting ‘font-variant-ligatures’ properties will override the same properties set in the @font-face rule. But properties set there and not explicitly turned off or on later remain set." />
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-descriptor-01.html b/tests/wpt/web-platform-tests/css/css-fonts/font-variant-descriptor-01.html
index ba4ba86d373..f854ca1feeb 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-descriptor-01.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts/font-variant-descriptor-01.html
@@ -3,9 +3,9 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 <title>CSS Test:  font-variant: normal; low level equivalence</title>
 <link rel="author" title="Chris Lilley" href="chris@w3.org">
-<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-variant-prop">
-<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop">
-<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-rend-desc">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-4/#font-variant-prop">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-4/#font-feature-settings-prop">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-4/#font-rend-desc">
 <link rel="match" href="font-variant-descriptor-01-ref.html">
 <meta name="assert" content="These descriptors define initial settings that apply when the font defined by an @font-face rule is rendered">
 <style>
diff --git a/tests/wpt/web-platform-tests/css/cssom/computed-style-set-property.html b/tests/wpt/web-platform-tests/css/cssom/computed-style-set-property.html
new file mode 100644
index 00000000000..a5fcc156a38
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/cssom/computed-style-set-property.html
@@ -0,0 +1,37 @@
+<!DOCTYPE>
+<title>NoModificationAllowedError when mutating read only properties</title>
+<link rel="author" title="Anders Hartvoll Ruud" href="andruud@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/cssom-1/#dom-cssstyledeclaration-setpropertyvalue">
+<meta name="assert" content="This test verifies that NoModificationAllowedError is thrown when mutating read only properties" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body></body>
+<script>
+test(function(t) {
+    assert_equals(document.defaultView.getComputedStyle(document.body, null).parentRule, null);
+}, "Computed style parent (should be null)");
+
+test(function(t) {
+    assert_throws("NoModificationAllowedError", function() {
+        document.defaultView.getComputedStyle(document.body, null).color = "blue";
+    });
+}, "Exception thrown when trying to change a computed style declaration via property");
+
+test(function(t) {
+    assert_throws("NoModificationAllowedError", function() {
+        document.defaultView.getComputedStyle(document.body, null).setProperty("color", "blue");
+    });
+}, "Exception thrown when trying to change a computed style declaration via setProperty");
+
+test(function(t) {
+    assert_throws("NoModificationAllowedError", function() {
+        document.defaultView.getComputedStyle(document.body, null).webkitTransition = "";
+    });
+}, "Exception thrown when trying to change a computed style alias via property");
+
+test(function(t) {
+    assert_throws("NoModificationAllowedError", function() {
+        document.defaultView.getComputedStyle(document.body, null).setProperty("webkitTransition", "");
+    });
+}, "Exception thrown when trying to change a computed style alias via setProperty");
+</script>
diff --git a/tests/wpt/web-platform-tests/picture-in-picture/resources/picture-in-picture-helpers.js b/tests/wpt/web-platform-tests/picture-in-picture/resources/picture-in-picture-helpers.js
index 4538c838278..ee8e1c23fc8 100644
--- a/tests/wpt/web-platform-tests/picture-in-picture/resources/picture-in-picture-helpers.js
+++ b/tests/wpt/web-platform-tests/picture-in-picture/resources/picture-in-picture-helpers.js
@@ -14,13 +14,17 @@ function callWithTrustedClick(callback) {
   });
 }
 
-function loadVideo() {
-  return new Promise(resolve => {
-    let video = document.createElement('video');
-    video.src = '/media/movie_5.ogv';
+function loadVideo(activeDocument, sourceUrl) {
+  return new Promise((resolve, reject) => {
+    const document = activeDocument || window.document;
+    const video = document.createElement('video');
+    video.src = sourceUrl || '/media/movie_5.ogv';
     video.onloadedmetadata = () => {
       resolve(video);
     };
+    video.onerror = error => {
+      reject(error);
+    };
   });
 }
 
@@ -28,4 +32,4 @@ function loadVideo() {
 function requestPictureInPictureWithTrustedClick(videoElement) {
   return callWithTrustedClick(
       () => videoElement.requestPictureInPicture());
-}
\ No newline at end of file
+}
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/dedicated-worker-service-worker-interception.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/dedicated-worker-service-worker-interception.https.html
new file mode 100644
index 00000000000..2144f482712
--- /dev/null
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/dedicated-worker-service-worker-interception.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<title>DedicatedWorker: ServiceWorker interception</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/test-helpers.sub.js"></script>
+<script>
+
+// Note that Chrome cannot pass these tests because of https://crbug.com/731599.
+
+function service_worker_interception_test(url, description) {
+  promise_test(async t => {
+    // Register a service worker whose scope includes |url|.
+    const kServiceWorkerScriptURL =
+        'resources/service-worker-interception-service-worker.js';
+    const registration = await service_worker_unregister_and_register(
+        t, kServiceWorkerScriptURL, url);
+    add_result_callback(() => registration.unregister());
+    await wait_for_state(t, registration.installing, 'activated');
+
+    // Start a dedicated worker for |url|. The top-level script request and any
+    // module imports should be intercepted by the service worker.
+    const worker = new Worker(url, { type: 'module' });
+    const msg_event = await new Promise(resolve => worker.onmessage = resolve);
+    assert_equals(msg_event.data, 'LOADED_FROM_SERVICE_WORKER');
+  }, description);
+}
+
+service_worker_interception_test(
+    'resources/service-worker-interception-network-worker.js',
+    'Top-level module loading should be intercepted by a service worker.');
+
+service_worker_interception_test(
+    'resources/service-worker-interception-static-import-worker.js',
+    'Static import should be intercepted by a service worker.');
+
+service_worker_interception_test(
+    'resources/service-worker-interception-dynamic-import-worker.js',
+    'Dynamic import should be intercepted by a service worker.');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/service-worker-interception-dynamic-import-worker.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/service-worker-interception-dynamic-import-worker.js
new file mode 100644
index 00000000000..680e07ff588
--- /dev/null
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/service-worker-interception-dynamic-import-worker.js
@@ -0,0 +1 @@
+import('./service-worker-interception-network-worker.js');
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/service-worker-interception-network-worker.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/service-worker-interception-network-worker.js
new file mode 100644
index 00000000000..5ff39001013
--- /dev/null
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/service-worker-interception-network-worker.js
@@ -0,0 +1 @@
+postMessage('LOADED_FROM_NETWORK');
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/service-worker-interception-service-worker.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/service-worker-interception-service-worker.js
new file mode 100644
index 00000000000..6b43a376963
--- /dev/null
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/service-worker-interception-service-worker.js
@@ -0,0 +1,9 @@
+const kURL = '/service-worker-interception-network-worker.js';
+const kScript = 'postMessage("LOADED_FROM_SERVICE_WORKER")';
+const kHeaders = [['content-type', 'text/javascript']];
+
+self.addEventListener('fetch', e => {
+  // Serve a generated response for kURL.
+  if (e.request.url.indexOf(kURL) != -1)
+    e.respondWith(new Response(kScript, { headers: kHeaders }));
+});
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/service-worker-interception-static-import-worker.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/service-worker-interception-static-import-worker.js
new file mode 100644
index 00000000000..e570958701d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/service-worker-interception-static-import-worker.js
@@ -0,0 +1 @@
+import './service-worker-interception-network-worker.js';
diff --git a/tests/wpt/web-platform-tests/tools/lint/lint.py b/tests/wpt/web-platform-tests/tools/lint/lint.py
index c1ffd50fb2b..058ee2bbd23 100644
--- a/tests/wpt/web-platform-tests/tools/lint/lint.py
+++ b/tests/wpt/web-platform-tests/tools/lint/lint.py
@@ -157,7 +157,7 @@ def check_git_ignore(repo_root, paths):
                 if filter_string[0] != '!':
                     errors += [("IGNORED PATH", "%s matches an ignore filter in .gitignore - "
                                 "please add a .gitignore exception" % path, path, None)]
-        except subprocess.CalledProcessError as e:
+        except subprocess.CalledProcessError:
             # Nonzero return code means that no match exists.
             pass
     return errors
diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/test_lint.py b/tests/wpt/web-platform-tests/tools/lint/tests/test_lint.py
index 2899b1dfa23..c593c849d88 100644
--- a/tests/wpt/web-platform-tests/tools/lint/tests/test_lint.py
+++ b/tests/wpt/web-platform-tests/tools/lint/tests/test_lint.py
@@ -409,7 +409,7 @@ def test_all_filesystem_paths():
                           (os.path.join('.', 'dir_a'),
                            [],
                            ['file_c', 'file_d'])]
-    ) as m:
+    ):
         got = list(lint_mod.all_filesystem_paths('.'))
         assert got == ['file_a',
                        'file_b',
@@ -438,7 +438,7 @@ def test_main_no_args():
     try:
         sys.argv = ['./lint']
         with _mock_lint('lint', return_value=True) as m:
-            with _mock_lint('changed_files', return_value=['foo', 'bar']) as m2:
+            with _mock_lint('changed_files', return_value=['foo', 'bar']):
                 lint_mod.main(**vars(create_parser().parse_args()))
                 m.assert_called_once_with(repo_root, ['foo', 'bar'], "normal")
     finally:
@@ -450,7 +450,7 @@ def test_main_all():
     try:
         sys.argv = ['./lint', '--all']
         with _mock_lint('lint', return_value=True) as m:
-            with _mock_lint('all_filesystem_paths', return_value=['foo', 'bar']) as m2:
+            with _mock_lint('all_filesystem_paths', return_value=['foo', 'bar']):
                 lint_mod.main(**vars(create_parser().parse_args()))
                 m.assert_called_once_with(repo_root, ['foo', 'bar'], "normal")
     finally:
diff --git a/tests/wpt/web-platform-tests/tools/serve/serve.py b/tests/wpt/web-platform-tests/tools/serve/serve.py
index 0fd5f907e96..d61c9f2a68a 100644
--- a/tests/wpt/web-platform-tests/tools/serve/serve.py
+++ b/tests/wpt/web-platform-tests/tools/serve/serve.py
@@ -434,7 +434,7 @@ def check_subdomains(config):
 
         try:
             urllib2.urlopen("http://%s:%d/" % (domain, port))
-        except Exception as e:
+        except Exception:
             logger.critical("Failed probing domain %s. "
                             "You may need to edit /etc/hosts or similar, see README.md." % domain)
             sys.exit(1)
diff --git a/tests/wpt/web-platform-tests/tools/tox.ini b/tests/wpt/web-platform-tests/tools/tox.ini
index 1db1b4ebb7a..732dab8bc5c 100644
--- a/tests/wpt/web-platform-tests/tools/tox.ini
+++ b/tests/wpt/web-platform-tests/tools/tox.ini
@@ -42,9 +42,8 @@ select = E,W,F,N
 # F401: module imported but unused
 # F403: ‘from module import *’ used; unable to detect undefined names
 # F405: name may be undefined, or defined from star imports: module
-# F841: local variable name is assigned to but never used
 # N801: class names should use CapWords convention
 # N802: function name should be lowercase
-ignore = E128,E129,E221,E226,E231,E251,E265,E302,E303,E305,E402,E731,E901,W601,F401,F403,F405,F841,N801,N802
+ignore = E128,E129,E221,E226,E231,E251,E265,E302,E303,E305,E402,E731,E901,W601,F401,F403,F405,N801,N802
 max-line-length = 141
 exclude = .tox,html5lib,third_party/py,third_party/pytest,third_party/funcsigs,third_party/attrs,third_party/pluggy/,pywebsocket,six,_venv,webencodings,wptserve/docs,wptserve/tests/functional/docroot/,wpt,wptrunner
diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
index a8abda0b2fc..45c4845e094 100644
--- a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
+++ b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
@@ -39,7 +39,7 @@ class Timeouts(object):
 
     def _set(self, key, secs):
         body = {key: secs * 1000}
-        timeouts = self.session.send_session_command("POST", "timeouts", body)
+        self.session.send_session_command("POST", "timeouts", body)
         return None
 
     @property
diff --git a/tests/wpt/web-platform-tests/tools/wpt/browser.py b/tests/wpt/web-platform-tests/tools/wpt/browser.py
index 1932cf4f4ba..de9f92989bc 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/browser.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/browser.py
@@ -112,7 +112,7 @@ class Firefox(Browser):
 
         try:
             mozinstall.install(filename, dest)
-        except mozinstall.mozinstall.InstallError as e:
+        except mozinstall.mozinstall.InstallError:
             if platform == "mac" and os.path.exists(os.path.join(dest, "Firefox Nightly.app")):
                 # mozinstall will fail if nightly is already installed in the venv because
                 # mac installation uses shutil.copy_tree
diff --git a/tests/wpt/web-platform-tests/tools/wpt/tox.ini b/tests/wpt/web-platform-tests/tools/wpt/tox.ini
index 229bc4bfc5c..6426f6fb55b 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/tox.ini
+++ b/tests/wpt/web-platform-tests/tools/wpt/tox.ini
@@ -45,8 +45,7 @@ select = E,W,F,N
 # F401: module imported but unused
 # F403: ‘from module import *’ used; unable to detect undefined names
 # F405: name may be undefined, or defined from star imports: module
-# F841: local variable name is assigned to but never used
 # N801: class names should use CapWords convention
 # N802: function name should be lowercase
-ignore = E128,E129,E221,E226,E231,E251,E265,E302,E303,E305,E402,E731,E901,W601,F401,F403,F405,F841,N801,N802
+ignore = E128,E129,E221,E226,E231,E251,E265,E302,E303,E305,E402,E731,E901,W601,F401,F403,F405,N801,N802
 max-line-length = 141
diff --git a/tests/wpt/web-platform-tests/tools/wpt/wpt.py b/tests/wpt/web-platform-tests/tools/wpt/wpt.py
index 49f463d2a9e..882d5ab2ac9 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/wpt.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/wpt.py
@@ -46,7 +46,7 @@ def parse_args(argv, commands):
     parser.add_argument("--debug", action="store_true", help="Run the debugger in case of an exception")
     subparsers = parser.add_subparsers(dest="command")
     for command, props in iteritems(commands):
-        sub_parser = subparsers.add_parser(command, help=props["help"], add_help=False)
+        subparsers.add_parser(command, help=props["help"], add_help=False)
 
     args, extra = parser.parse_known_args(argv)
 
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/test/test.py b/tests/wpt/web-platform-tests/tools/wptrunner/test/test.py
index 622934a42b0..3e82a9813d5 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/test/test.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/test/test.py
@@ -73,7 +73,7 @@ def read_config():
     # This only allows one product per whatever for now
     for product in parser.sections():
         if product != "general":
-            dest = rv["products"][product] = {}
+            rv["products"][product] = {}
             for key, value in parser.items(product):
                 rv["products"][product][key] = value
 
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/tox.ini b/tests/wpt/web-platform-tests/tools/wptrunner/tox.ini
index f63e2c0cea0..a9761e80d8b 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/tox.ini
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/tox.ini
@@ -55,8 +55,7 @@ select = E,W,F,N
 # F401: module imported but unused
 # F403: ‘from module import *’ used; unable to detect undefined names
 # F405: name may be undefined, or defined from star imports: module
-# F841: local variable name is assigned to but never used
 # N801: class names should use CapWords convention
 # N802: function name should be lowercase
-ignore = E128,E129,E221,E226,E231,E251,E265,E302,E303,E305,E402,E731,E901,W601,F401,F403,F405,F841,N801,N802
+ignore = E128,E129,E221,E226,E231,E251,E265,E302,E303,E305,E402,E731,E901,W601,F401,F403,F405,N801,N802
 max-line-length = 141
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py
index 08030b3f5f9..1e662b0330a 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py
@@ -243,7 +243,6 @@ class RefTestImplementation(object):
         return self.executor.logger
 
     def get_hash(self, test, viewport_size, dpi):
-        timeout = test.timeout * self.timeout_multiplier
         key = (test.url, viewport_size, dpi)
 
         if key not in self.screenshot_cache:
@@ -391,7 +390,7 @@ class WdspecRun(object):
         executor = threading.Thread(target=self._run)
         executor.start()
 
-        flag = self.result_flag.wait(self.timeout)
+        self.result_flag.wait(self.timeout)
         if self.result[1] is None:
             self.result = False, ("EXTERNAL-TIMEOUT", None)
 
@@ -533,7 +532,7 @@ class CallbackHandler(object):
                 raise ValueError("Unknown action %s" % action)
             try:
                 action_handler(payload)
-            except Exception as e:
+            except Exception:
                 self.logger.warning("Action %s failed" % action)
                 self.logger.warning(traceback.format_exc())
                 self._send_message("complete", "failure")
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
index bff509c53c6..f04f0b58284 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
@@ -445,7 +445,7 @@ class ExecuteAsyncScriptRun(object):
         else:
             wait_timeout = None
 
-        flag = self.result_flag.wait(wait_timeout)
+        self.result_flag.wait(wait_timeout)
 
         if self.result == (None, None):
             self.logger.debug("Timed out waiting for a result")
@@ -675,9 +675,6 @@ class InternalRefTestImplementation(object):
         self.executor.protocol.marionette._send_message("reftest:setup", data)
 
     def run_test(self, test):
-        viewport_size = test.viewport_size
-        dpi = test.dpi
-
         references = self.get_references(test)
         rv = self.executor.protocol.marionette._send_message("reftest:run",
                                                              {"test": self.executor.test_url(test),
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservodriver.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservodriver.py
index 626c987f26e..f649a75cd93 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservodriver.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservodriver.py
@@ -35,7 +35,6 @@ class ServoWebDriverProtocol(Protocol):
 
     def connect(self):
         """Connect to browser via WebDriver."""
-        url = "http://%s:%d" % (self.host, self.port)
         self.session = webdriver.Session(self.host, self.port,
                                          extension=webdriver.servo.ServoCommandExtensions)
         self.session.start()
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/manifestexpected.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/manifestexpected.py
index 5d57b70e517..eaab26081bd 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/manifestexpected.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/manifestexpected.py
@@ -53,8 +53,6 @@ def prefs(node):
 
     try:
         node_prefs = node.get("prefs")
-        if type(node_prefs) in (str, unicode):
-            prefs = {value(node_prefs)}
         rv = dict(value(item) for item in node_prefs)
     except KeyError:
         rv = {}
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/metadata.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/metadata.py
index 92d77ba8d94..195671ca564 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/metadata.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/metadata.py
@@ -119,8 +119,6 @@ def unexpected_changes(manifests, change_data, files_changed):
     else:
         return []
 
-    rv = []
-
     return [fn for _, fn, _ in root_manifest if fn in files_changed and change_data.get(fn) != "M"]
 
 # For each testrun
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/products.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/products.py
index c077f95dfd9..4f2273743ec 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/products.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/products.py
@@ -12,9 +12,6 @@ def products_enabled(config):
         return names
 
 def product_module(config, product):
-    here = os.path.join(os.path.split(__file__)[0])
-    product_dir = os.path.join(here, "browsers")
-
     if product not in products_enabled(config):
         raise ValueError("Unknown product %s" % product)
 
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_products.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_products.py
index 8ece29b8294..f5d490de25c 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_products.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_products.py
@@ -52,7 +52,7 @@ def test_server_start_config(product):
                                          False,
                                          None,
                                          env_options,
-                                         env_extras) as test_environment:
+                                         env_extras):
             start.assert_called_once()
             args = start.call_args
             config = args[0][0]
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
index bd2b3ad23bd..3ee4480a530 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
@@ -110,8 +110,6 @@ def list_disabled(test_paths, product, **kwargs):
 def list_tests(test_paths, product, **kwargs):
     env.do_delayed_imports(logger, test_paths)
 
-    rv = []
-
     ssl_env = env.ssl_env(logger, **kwargs)
 
     run_info_extras = products.load_product(kwargs["config"], product)[-1](**kwargs)
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_server.py b/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_server.py
index 26c34c31002..7ae31be7130 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_server.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_server.py
@@ -10,7 +10,7 @@ from .base import TestUsingServer
 class TestFileHandler(TestUsingServer):
     def test_not_handled(self):
         with self.assertRaises(HTTPError) as cm:
-            resp = self.request("/not_existing")
+            self.request("/not_existing")
 
         self.assertEqual(cm.exception.code, 404)
 
@@ -36,7 +36,7 @@ class TestRequestHandler(TestUsingServer):
         route = ("GET", "/test/raises", handler)
         self.server.router.register(*route)
         with self.assertRaises(HTTPError) as cm:
-            resp = self.request("/test/raises")
+            self.request("/test/raises")
 
         self.assertEqual(cm.exception.code, 500)