Auto merge of #20851 - servo-wpt-sync:wpt_update_22-05-2018, r=jdm

Sync WPT with upstream (22-05-2018)

Automated downstream sync of changes from upstream as of 22-05-2018.
[no-wpt-sync]

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20851)
<!-- Reviewable:end -->

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
 

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

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
 

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
 

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

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
+

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
 

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
-

tests/wpt/mozilla/meta/css/iframe/hide_after_load.html.ini

@@ -0,0 +1,2 @@
+[hide_after_load.html]
+  expected: TIMEOUT

tests/wpt/mozilla/meta/mozilla/img_find_non_sibling_map.html.ini

@@ -0,0 +1,2 @@
+[img_find_non_sibling_map.html]
+  expected: TIMEOUT

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
+

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
+

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>

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

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" />

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
 		<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>

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" />
+		<link  rel="reviewer" title="Chris Lilley" href="mailto:chris@w3.org" />
-		<meta name="flags" content="font" />
+		<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>