diff --git a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
index dd4ffcf4345..76b398963ae 100644
--- a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -1,4 +1,5 @@
 [url-in-tags-revoke.window.html]
+  expected: TIMEOUT
   [Fetching a blob URL immediately before revoking it works in an iframe.]
     expected: FAIL
 
@@ -14,3 +15,6 @@
   [Opening a blob URL in a new window by clicking an <a> tag works immediately before revoking the URL.]
     expected: FAIL
 
+  [Fetching a blob URL immediately before revoking it works in <script> tags.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 0b70fecad0f..47e0039577c 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -138073,72 +138073,240 @@
      {}
     ]
    ], 
-   "css/css-text/line-break/line-break-normal-021.xht": [
+   "css/css-text/line-break/line-break-loose-011.xht": [
     [
-     "/css/css-text/line-break/line-break-normal-021.xht", 
+     "/css/css-text/line-break/line-break-loose-011.xht", 
      [
       [
-       "/css/css-text/line-break/reference/line-break-normal-021-ref.xht", 
+       "/css/css-text/line-break/reference/line-break-loose-011-ref.xht", 
        "=="
       ]
      ], 
      {}
     ]
    ], 
-   "css/css-text/line-break/line-break-normal-022.xht": [
+   "css/css-text/line-break/line-break-loose-012.xht": [
     [
-     "/css/css-text/line-break/line-break-normal-022.xht", 
+     "/css/css-text/line-break/line-break-loose-012.xht", 
      [
       [
-       "/css/css-text/line-break/reference/line-break-normal-022-ref.xht", 
+       "/css/css-text/line-break/reference/line-break-loose-012-ref.xht", 
        "=="
       ]
      ], 
      {}
     ]
    ], 
-   "css/css-text/line-break/line-break-normal-023a.xht": [
+   "css/css-text/line-break/line-break-loose-013.xht": [
     [
-     "/css/css-text/line-break/line-break-normal-023a.xht", 
+     "/css/css-text/line-break/line-break-loose-013.xht", 
      [
       [
-       "/css/css-text/line-break/reference/line-break-normal-023a-ref.xht", 
+       "/css/css-text/line-break/reference/line-break-loose-013-ref.xht", 
        "=="
       ]
      ], 
      {}
     ]
    ], 
-   "css/css-text/line-break/line-break-normal-023b.xht": [
+   "css/css-text/line-break/line-break-loose-014.xht": [
     [
-     "/css/css-text/line-break/line-break-normal-023b.xht", 
+     "/css/css-text/line-break/line-break-loose-014.xht", 
      [
       [
-       "/css/css-text/line-break/reference/line-break-normal-023b-ref.xht", 
+       "/css/css-text/line-break/reference/line-break-loose-014-ref.xht", 
        "=="
       ]
      ], 
      {}
     ]
    ], 
-   "css/css-text/line-break/line-break-normal-024a.xht": [
+   "css/css-text/line-break/line-break-loose-015.xht": [
     [
-     "/css/css-text/line-break/line-break-normal-024a.xht", 
+     "/css/css-text/line-break/line-break-loose-015.xht", 
      [
       [
-       "/css/css-text/line-break/reference/line-break-normal-024a-ref.xht", 
+       "/css/css-text/line-break/reference/line-break-loose-015-ref.xht", 
        "=="
       ]
      ], 
      {}
     ]
    ], 
-   "css/css-text/line-break/line-break-normal-024b.xht": [
+   "css/css-text/line-break/line-break-loose-016a.xht": [
     [
-     "/css/css-text/line-break/line-break-normal-024b.xht", 
+     "/css/css-text/line-break/line-break-loose-016a.xht", 
      [
       [
-       "/css/css-text/line-break/reference/line-break-normal-024b-ref.xht", 
+       "/css/css-text/line-break/reference/line-break-loose-016a-ref.xht", 
+       "=="
+      ]
+     ], 
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/line-break-loose-016b.xht": [
+    [
+     "/css/css-text/line-break/line-break-loose-016b.xht", 
+     [
+      [
+       "/css/css-text/line-break/reference/line-break-loose-016b-ref.xht", 
+       "=="
+      ]
+     ], 
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/line-break-loose-017a.xht": [
+    [
+     "/css/css-text/line-break/line-break-loose-017a.xht", 
+     [
+      [
+       "/css/css-text/line-break/reference/line-break-loose-017a-ref.xht", 
+       "=="
+      ]
+     ], 
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/line-break-loose-017b.xht": [
+    [
+     "/css/css-text/line-break/line-break-loose-017b.xht", 
+     [
+      [
+       "/css/css-text/line-break/reference/line-break-loose-017b-ref.xht", 
+       "=="
+      ]
+     ], 
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/line-break-loose-018.xht": [
+    [
+     "/css/css-text/line-break/line-break-loose-018.xht", 
+     [
+      [
+       "/css/css-text/line-break/reference/line-break-loose-018-ref.xht", 
+       "=="
+      ]
+     ], 
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/line-break-normal-011.xht": [
+    [
+     "/css/css-text/line-break/line-break-normal-011.xht", 
+     [
+      [
+       "/css/css-text/line-break/reference/line-break-normal-011-ref.xht", 
+       "=="
+      ]
+     ], 
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/line-break-normal-012.xht": [
+    [
+     "/css/css-text/line-break/line-break-normal-012.xht", 
+     [
+      [
+       "/css/css-text/line-break/reference/line-break-normal-012-ref.xht", 
+       "=="
+      ]
+     ], 
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/line-break-normal-013.xht": [
+    [
+     "/css/css-text/line-break/line-break-normal-013.xht", 
+     [
+      [
+       "/css/css-text/line-break/reference/line-break-normal-013-ref.xht", 
+       "=="
+      ]
+     ], 
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/line-break-normal-014.xht": [
+    [
+     "/css/css-text/line-break/line-break-normal-014.xht", 
+     [
+      [
+       "/css/css-text/line-break/reference/line-break-normal-014-ref.xht", 
+       "=="
+      ]
+     ], 
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/line-break-normal-015.xht": [
+    [
+     "/css/css-text/line-break/line-break-normal-015.xht", 
+     [
+      [
+       "/css/css-text/line-break/reference/line-break-normal-015-ref.xht", 
+       "=="
+      ]
+     ], 
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/line-break-normal-016a.xht": [
+    [
+     "/css/css-text/line-break/line-break-normal-016a.xht", 
+     [
+      [
+       "/css/css-text/line-break/reference/line-break-normal-016a-ref.xht", 
+       "=="
+      ]
+     ], 
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/line-break-normal-016b.xht": [
+    [
+     "/css/css-text/line-break/line-break-normal-016b.xht", 
+     [
+      [
+       "/css/css-text/line-break/reference/line-break-normal-016b-ref.xht", 
+       "=="
+      ]
+     ], 
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/line-break-normal-017a.xht": [
+    [
+     "/css/css-text/line-break/line-break-normal-017a.xht", 
+     [
+      [
+       "/css/css-text/line-break/reference/line-break-normal-017a-ref.xht", 
+       "=="
+      ]
+     ], 
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/line-break-normal-017b.xht": [
+    [
+     "/css/css-text/line-break/line-break-normal-017b.xht", 
+     [
+      [
+       "/css/css-text/line-break/reference/line-break-normal-017b-ref.xht", 
+       "=="
+      ]
+     ], 
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/line-break-normal-018.xht": [
+    [
+     "/css/css-text/line-break/line-break-normal-018.xht", 
+     [
+      [
+       "/css/css-text/line-break/reference/line-break-normal-018-ref.xht", 
        "=="
       ]
      ], 
@@ -138253,6 +138421,18 @@
      {}
     ]
    ], 
+   "css/css-text/line-break/line-break-strict-018.xht": [
+    [
+     "/css/css-text/line-break/line-break-strict-018.xht", 
+     [
+      [
+       "/css/css-text/line-break/reference/line-break-strict-018-ref.xht", 
+       "=="
+      ]
+     ], 
+     {}
+    ]
+   ], 
    "css/css-text/line-breaking/line-breaking-001.html": [
     [
      "/css/css-text/line-breaking/line-breaking-001.html", 
@@ -224606,6 +224786,16 @@
      {}
     ]
    ], 
+   "content-security-policy/inheritance/sandboxed-blob-scheme.html.sub.headers": [
+    [
+     {}
+    ]
+   ], 
+   "content-security-policy/inheritance/sandboxed-data-scheme.html.sub.headers": [
+    [
+     {}
+    ]
+   ], 
    "content-security-policy/inheritance/support/navigate-self-to-blob.html": [
     [
      {}
@@ -224621,6 +224811,16 @@
      {}
     ]
    ], 
+   "content-security-policy/inheritance/unsandboxed-blob-scheme.html.sub.headers": [
+    [
+     {}
+    ]
+   ], 
+   "content-security-policy/inheritance/unsandboxed-data-scheme.html.sub.headers": [
+    [
+     {}
+    ]
+   ], 
    "content-security-policy/inside-worker/support/connect-src-allow.sub.js": [
     [
      {}
@@ -224821,6 +225021,11 @@
      {}
     ]
    ], 
+   "content-security-policy/plugin-types/plugintypes-nourl-allowed.html.sub.headers": [
+    [
+     {}
+    ]
+   ], 
    "content-security-policy/prefetch-src/prefetch-header-allowed.html.headers": [
     [
      {}
@@ -268126,32 +268331,102 @@
      {}
     ]
    ], 
-   "css/css-text/line-break/reference/line-break-normal-021-ref.xht": [
+   "css/css-text/line-break/reference/line-break-loose-011-ref.xht": [
     [
      {}
     ]
    ], 
-   "css/css-text/line-break/reference/line-break-normal-022-ref.xht": [
+   "css/css-text/line-break/reference/line-break-loose-012-ref.xht": [
     [
      {}
     ]
    ], 
-   "css/css-text/line-break/reference/line-break-normal-023a-ref.xht": [
+   "css/css-text/line-break/reference/line-break-loose-013-ref.xht": [
     [
      {}
     ]
    ], 
-   "css/css-text/line-break/reference/line-break-normal-023b-ref.xht": [
+   "css/css-text/line-break/reference/line-break-loose-014-ref.xht": [
     [
      {}
     ]
    ], 
-   "css/css-text/line-break/reference/line-break-normal-024a-ref.xht": [
+   "css/css-text/line-break/reference/line-break-loose-015-ref.xht": [
     [
      {}
     ]
    ], 
-   "css/css-text/line-break/reference/line-break-normal-024b-ref.xht": [
+   "css/css-text/line-break/reference/line-break-loose-016a-ref.xht": [
+    [
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/reference/line-break-loose-016b-ref.xht": [
+    [
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/reference/line-break-loose-017a-ref.xht": [
+    [
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/reference/line-break-loose-017b-ref.xht": [
+    [
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/reference/line-break-loose-018-ref.xht": [
+    [
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/reference/line-break-normal-011-ref.xht": [
+    [
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/reference/line-break-normal-012-ref.xht": [
+    [
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/reference/line-break-normal-013-ref.xht": [
+    [
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/reference/line-break-normal-014-ref.xht": [
+    [
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/reference/line-break-normal-015-ref.xht": [
+    [
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/reference/line-break-normal-016a-ref.xht": [
+    [
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/reference/line-break-normal-016b-ref.xht": [
+    [
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/reference/line-break-normal-017a-ref.xht": [
+    [
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/reference/line-break-normal-017b-ref.xht": [
+    [
+     {}
+    ]
+   ], 
+   "css/css-text/line-break/reference/line-break-normal-018-ref.xht": [
     [
      {}
     ]
@@ -268201,6 +268476,11 @@
      {}
     ]
    ], 
+   "css/css-text/line-break/reference/line-break-strict-018-ref.xht": [
+    [
+     {}
+    ]
+   ], 
    "css/css-text/line-breaking/reference/line-breaking-001-ref.html": [
     [
      {}
@@ -317231,11 +317511,26 @@
      {}
     ]
    ], 
+   "trusted-types/WorkerGlobalScope-importScripts.https.js": [
+    [
+     {}
+    ]
+   ], 
+   "trusted-types/WorkerGlobalScope-importScripts.https.js.headers": [
+    [
+     {}
+    ]
+   ], 
    "trusted-types/support/helper.sub.js": [
     [
      {}
     ]
    ], 
+   "trusted-types/support/worker.js": [
+    [
+     {}
+    ]
+   ], 
    "uievents/META.yml": [
     [
      {}
@@ -334208,9 +334503,27 @@
      {}
     ]
    ], 
-   "content-security-policy/inheritance/blob-url-self-navigate-inherits.sub.html": [
+   "content-security-policy/inheritance/blob-url-in-child-frame-self-navigate-inherits.sub.html": [
     [
-     "/content-security-policy/inheritance/blob-url-self-navigate-inherits.sub.html", 
+     "/content-security-policy/inheritance/blob-url-in-child-frame-self-navigate-inherits.sub.html", 
+     {}
+    ]
+   ], 
+   "content-security-policy/inheritance/blob-url-in-main-window-self-navigate-inherits.sub.html": [
+    [
+     "/content-security-policy/inheritance/blob-url-in-main-window-self-navigate-inherits.sub.html", 
+     {}
+    ]
+   ], 
+   "content-security-policy/inheritance/iframe-all-local-schemes-inherit-self.sub.html": [
+    [
+     "/content-security-policy/inheritance/iframe-all-local-schemes-inherit-self.sub.html", 
+     {}
+    ]
+   ], 
+   "content-security-policy/inheritance/iframe-all-local-schemes.sub.html": [
+    [
+     "/content-security-policy/inheritance/iframe-all-local-schemes.sub.html", 
      {}
     ]
    ], 
@@ -334220,18 +334533,36 @@
      {}
     ]
    ], 
-   "content-security-policy/inheritance/iframe.html": [
-    [
-     "/content-security-policy/inheritance/iframe.html", 
-     {}
-    ]
-   ], 
    "content-security-policy/inheritance/inherited-csp-list-modifications-are-local.html": [
     [
      "/content-security-policy/inheritance/inherited-csp-list-modifications-are-local.html", 
      {}
     ]
    ], 
+   "content-security-policy/inheritance/sandboxed-blob-scheme.html": [
+    [
+     "/content-security-policy/inheritance/sandboxed-blob-scheme.html", 
+     {}
+    ]
+   ], 
+   "content-security-policy/inheritance/sandboxed-data-scheme.html": [
+    [
+     "/content-security-policy/inheritance/sandboxed-data-scheme.html", 
+     {}
+    ]
+   ], 
+   "content-security-policy/inheritance/unsandboxed-blob-scheme.html": [
+    [
+     "/content-security-policy/inheritance/unsandboxed-blob-scheme.html", 
+     {}
+    ]
+   ], 
+   "content-security-policy/inheritance/unsandboxed-data-scheme.html": [
+    [
+     "/content-security-policy/inheritance/unsandboxed-data-scheme.html", 
+     {}
+    ]
+   ], 
    "content-security-policy/inheritance/window.html": [
     [
      "/content-security-policy/inheritance/window.html", 
@@ -334658,39 +334989,45 @@
      {}
     ]
    ], 
-   "content-security-policy/plugin-types/plugintypes-mismatched-data.sub.html": [
+   "content-security-policy/plugin-types/plugintypes-empty.sub.html": [
     [
-     "/content-security-policy/plugin-types/plugintypes-mismatched-data.sub.html", 
+     "/content-security-policy/plugin-types/plugintypes-empty.sub.html", 
      {}
     ]
    ], 
-   "content-security-policy/plugin-types/plugintypes-mismatched-url.sub.html": [
+   "content-security-policy/plugin-types/plugintypes-mismatched-data.html": [
     [
-     "/content-security-policy/plugin-types/plugintypes-mismatched-url.sub.html", 
+     "/content-security-policy/plugin-types/plugintypes-mismatched-data.html", 
      {}
     ]
    ], 
-   "content-security-policy/plugin-types/plugintypes-notype-data.sub.html": [
+   "content-security-policy/plugin-types/plugintypes-mismatched-url.html": [
     [
-     "/content-security-policy/plugin-types/plugintypes-notype-data.sub.html", 
+     "/content-security-policy/plugin-types/plugintypes-mismatched-url.html", 
      {}
     ]
    ], 
-   "content-security-policy/plugin-types/plugintypes-notype-url.sub.html": [
+   "content-security-policy/plugin-types/plugintypes-notype-data.html": [
     [
-     "/content-security-policy/plugin-types/plugintypes-notype-url.sub.html", 
+     "/content-security-policy/plugin-types/plugintypes-notype-data.html", 
      {}
     ]
    ], 
-   "content-security-policy/plugin-types/plugintypes-nourl-allowed.sub.html": [
+   "content-security-policy/plugin-types/plugintypes-notype-url.html": [
     [
-     "/content-security-policy/plugin-types/plugintypes-nourl-allowed.sub.html", 
+     "/content-security-policy/plugin-types/plugintypes-notype-url.html", 
      {}
     ]
    ], 
-   "content-security-policy/plugin-types/plugintypes-nourl-blocked.sub.html": [
+   "content-security-policy/plugin-types/plugintypes-nourl-allowed.html": [
     [
-     "/content-security-policy/plugin-types/plugintypes-nourl-blocked.sub.html", 
+     "/content-security-policy/plugin-types/plugintypes-nourl-allowed.html", 
+     {}
+    ]
+   ], 
+   "content-security-policy/plugin-types/plugintypes-nourl-blocked.html": [
+    [
+     "/content-security-policy/plugin-types/plugintypes-nourl-blocked.html", 
      {}
     ]
    ], 
@@ -404090,6 +404427,18 @@
      {}
     ]
    ], 
+   "scroll-animations/constructor-no-document.html": [
+    [
+     "/scroll-animations/constructor-no-document.html", 
+     {}
+    ]
+   ], 
+   "scroll-animations/constructor.html": [
+    [
+     "/scroll-animations/constructor.html", 
+     {}
+    ]
+   ], 
    "scroll-animations/idlharness.window.js": [
     [
      "/scroll-animations/idlharness.window.html", 
@@ -409036,6 +409385,12 @@
      {}
     ]
    ], 
+   "trusted-types/WorkerGlobalScope-importScripts.https.html": [
+    [
+     "/trusted-types/WorkerGlobalScope-importScripts.https.html", 
+     {}
+    ]
+   ], 
    "trusted-types/block-string-assignment-to-DOMParser-parseFromString.tentative.html": [
     [
      "/trusted-types/block-string-assignment-to-DOMParser-parseFromString.tentative.html", 
@@ -471239,22 +471594,46 @@
    "7ef1e978fedc83e92b17384d7462793a83011791", 
    "testharness"
   ], 
-  "content-security-policy/inheritance/blob-url-self-navigate-inherits.sub.html": [
+  "content-security-policy/inheritance/blob-url-in-child-frame-self-navigate-inherits.sub.html": [
+   "f2b3d063e91fd344787f1208f96250381745c27e", 
+   "testharness"
+  ], 
+  "content-security-policy/inheritance/blob-url-in-main-window-self-navigate-inherits.sub.html": [
    "3b54528d56a445e6ef723371f5bb7a858ee016c8", 
    "testharness"
   ], 
+  "content-security-policy/inheritance/iframe-all-local-schemes-inherit-self.sub.html": [
+   "73e974e51a87dc80eab797ad3a4ddee20759aa7b", 
+   "testharness"
+  ], 
+  "content-security-policy/inheritance/iframe-all-local-schemes.sub.html": [
+   "cd38c902f05f7871fdec0eafe5481e5eba1928ae", 
+   "testharness"
+  ], 
   "content-security-policy/inheritance/iframe-srcdoc-inheritance.html": [
    "e05150762faa6affa644876961f004723ab2806a", 
    "testharness"
   ], 
-  "content-security-policy/inheritance/iframe.html": [
-   "6f5d0f75260113a4d565a6320996345972d9e38c", 
-   "testharness"
-  ], 
   "content-security-policy/inheritance/inherited-csp-list-modifications-are-local.html": [
    "c473b3f4262230f6e052d149d6461b7c0cabeff7", 
    "testharness"
   ], 
+  "content-security-policy/inheritance/sandboxed-blob-scheme.html": [
+   "590fa7ec1a9caafc6f18e6821f100629688bd300", 
+   "testharness"
+  ], 
+  "content-security-policy/inheritance/sandboxed-blob-scheme.html.sub.headers": [
+   "cd80b326ff7395bef1d84e9d90d857d2ef757612", 
+   "support"
+  ], 
+  "content-security-policy/inheritance/sandboxed-data-scheme.html": [
+   "b97bfb0c05aeb129fc35a5bdfa1f9346b33d6d21", 
+   "testharness"
+  ], 
+  "content-security-policy/inheritance/sandboxed-data-scheme.html.sub.headers": [
+   "766d3e0e050328a2365cc1660d62fbbc13b552e4", 
+   "support"
+  ], 
   "content-security-policy/inheritance/support/navigate-self-to-blob.html": [
    "9ea069969cafff022e94fef3de535feafaca1de7", 
    "support"
@@ -471267,6 +471646,22 @@
    "9148be203d30ea043a56b38305877142735a4c49", 
    "support"
   ], 
+  "content-security-policy/inheritance/unsandboxed-blob-scheme.html": [
+   "cab192f836831dbc6618726ea764249f2d835e0a", 
+   "testharness"
+  ], 
+  "content-security-policy/inheritance/unsandboxed-blob-scheme.html.sub.headers": [
+   "4cf3e34ce9764ef79ce0cd041de822535678a8c6", 
+   "support"
+  ], 
+  "content-security-policy/inheritance/unsandboxed-data-scheme.html": [
+   "a9d8e207dcec48a9ee34f2f294f440dd8ba6c233", 
+   "testharness"
+  ], 
+  "content-security-policy/inheritance/unsandboxed-data-scheme.html.sub.headers": [
+   "9cfb8aaa819489c76ee612ba20d3aeccaec51c65", 
+   "support"
+  ], 
   "content-security-policy/inheritance/window.html": [
    "86f2e4bc13f7fe811810d74550174a6acba57c68", 
    "testharness"
@@ -471711,28 +472106,36 @@
    "c79c9938e1ce9045b4772b48f5670be6319bf550", 
    "testharness"
   ], 
-  "content-security-policy/plugin-types/plugintypes-mismatched-data.sub.html": [
-   "947a9174d88712d6dbdd2cdbaa2a30269e886263", 
+  "content-security-policy/plugin-types/plugintypes-empty.sub.html": [
+   "0cd1a70a1dd9325d98040f3afad1b0b01c9305fd", 
    "testharness"
   ], 
-  "content-security-policy/plugin-types/plugintypes-mismatched-url.sub.html": [
-   "08e09b95063c12af9567d31ad14aec07eea7ba05", 
+  "content-security-policy/plugin-types/plugintypes-mismatched-data.html": [
+   "430a3a1eb9febec2e034f784cf0dee7ae25cac76", 
    "testharness"
   ], 
-  "content-security-policy/plugin-types/plugintypes-notype-data.sub.html": [
-   "46b1816b792319728ba9aa0612f49fdc6c3ca338", 
+  "content-security-policy/plugin-types/plugintypes-mismatched-url.html": [
+   "306d08f79e16632aefa2a900e9e460e0a0aefe02", 
    "testharness"
   ], 
-  "content-security-policy/plugin-types/plugintypes-notype-url.sub.html": [
-   "3191f9c93b85cbae344618ea1a3b896490142bf4", 
+  "content-security-policy/plugin-types/plugintypes-notype-data.html": [
+   "e10d5335772dae788f8a1e146b6e5794c31a4579", 
    "testharness"
   ], 
-  "content-security-policy/plugin-types/plugintypes-nourl-allowed.sub.html": [
-   "cc30b0d9c80c92371927e90c625bf5c6d5e34fda", 
+  "content-security-policy/plugin-types/plugintypes-notype-url.html": [
+   "73ff7366e01e44e48b8c55b715054dbac7937a77", 
    "testharness"
   ], 
-  "content-security-policy/plugin-types/plugintypes-nourl-blocked.sub.html": [
-   "40054d53336307f549baccdcdd3441f4a2d478cd", 
+  "content-security-policy/plugin-types/plugintypes-nourl-allowed.html": [
+   "cd50086761ffec96e84ae59e8407f95daba1b125", 
+   "testharness"
+  ], 
+  "content-security-policy/plugin-types/plugintypes-nourl-allowed.html.sub.headers": [
+   "95cc52be322fbd1ebd53734868f12d63478497ec", 
+   "support"
+  ], 
+  "content-security-policy/plugin-types/plugintypes-nourl-blocked.html": [
+   "02da1e0d1e6a20314dcc21ecc5cc977ed34d2e6e", 
    "testharness"
   ], 
   "content-security-policy/prefetch-src/prefetch-allowed.html": [
@@ -569675,128 +570078,248 @@
    "79d9daba1ccef1363ec92e03e95448ec9da8509a", 
    "reftest"
   ], 
-  "css/css-text/line-break/line-break-normal-021.xht": [
-   "a956d3009ce93ede42671c8c3ff1d135261721dc", 
+  "css/css-text/line-break/line-break-loose-011.xht": [
+   "604466a1f4723f5da0e74682643b4fcd746852d0", 
    "reftest"
   ], 
-  "css/css-text/line-break/line-break-normal-022.xht": [
-   "22a2a8a2646e1b682224d60531787ad15d640fb7", 
+  "css/css-text/line-break/line-break-loose-012.xht": [
+   "0deab610cf8369cd1585e409145ebba248de9384", 
    "reftest"
   ], 
-  "css/css-text/line-break/line-break-normal-023a.xht": [
-   "7723250e947080f4e7b9322c579d24f2a11f6528", 
+  "css/css-text/line-break/line-break-loose-013.xht": [
+   "586732aeb66aef35f7f2432986b1b64a18c967d3", 
    "reftest"
   ], 
-  "css/css-text/line-break/line-break-normal-023b.xht": [
-   "6f867c87ec3e569f98298b62ddefa1baa3e25445", 
+  "css/css-text/line-break/line-break-loose-014.xht": [
+   "90cf3c769c011c653dd090f5578ac196f47db2c8", 
    "reftest"
   ], 
-  "css/css-text/line-break/line-break-normal-024a.xht": [
-   "cbbeff8d1f2c61d7eb8f84f6ce19ffeaad8e8326", 
+  "css/css-text/line-break/line-break-loose-015.xht": [
+   "6384d8c14eec3e95027da40da46a6521c0efa3fd", 
    "reftest"
   ], 
-  "css/css-text/line-break/line-break-normal-024b.xht": [
-   "e0da4088832299187c2edc73ea3f8176f2c3357c", 
+  "css/css-text/line-break/line-break-loose-016a.xht": [
+   "6397c0318229a37df9efe208636399dc5b1697a3", 
+   "reftest"
+  ], 
+  "css/css-text/line-break/line-break-loose-016b.xht": [
+   "261cce5f67b04a3e0743ed84137301a155db6e2c", 
+   "reftest"
+  ], 
+  "css/css-text/line-break/line-break-loose-017a.xht": [
+   "59b0af7b3fdec1bf2a49aefbc4c09b4670e01d4f", 
+   "reftest"
+  ], 
+  "css/css-text/line-break/line-break-loose-017b.xht": [
+   "6b89d125f543db92135ea1e434bb5c65e074eea6", 
+   "reftest"
+  ], 
+  "css/css-text/line-break/line-break-loose-018.xht": [
+   "d5df229cf77cc9e41035a979153d03bb62f01419", 
+   "reftest"
+  ], 
+  "css/css-text/line-break/line-break-normal-011.xht": [
+   "692468c527aff2c4e0caaec1d2fae7eab043454f", 
+   "reftest"
+  ], 
+  "css/css-text/line-break/line-break-normal-012.xht": [
+   "a4b794f0f800c4009e4e0844f81788b6fb41685d", 
+   "reftest"
+  ], 
+  "css/css-text/line-break/line-break-normal-013.xht": [
+   "80dae58932a9ad190f75ad4e68d27a832e7580b2", 
+   "reftest"
+  ], 
+  "css/css-text/line-break/line-break-normal-014.xht": [
+   "86a35bfb6b309e45dbb52bca3f23f6ce72f5ec13", 
+   "reftest"
+  ], 
+  "css/css-text/line-break/line-break-normal-015.xht": [
+   "6debeedc35a72115f1abaf48034eabf3edf213ca", 
+   "reftest"
+  ], 
+  "css/css-text/line-break/line-break-normal-016a.xht": [
+   "c3b103ab7aa07fffc94d10c57853e915e20b6428", 
+   "reftest"
+  ], 
+  "css/css-text/line-break/line-break-normal-016b.xht": [
+   "c73bb159d08e6e447b125e2985594f508e92d7c9", 
+   "reftest"
+  ], 
+  "css/css-text/line-break/line-break-normal-017a.xht": [
+   "e9637b55827e5ab817c2e250ed761c6ce2215f64", 
+   "reftest"
+  ], 
+  "css/css-text/line-break/line-break-normal-017b.xht": [
+   "124ece3189f1e525ecb41b3e7cb3b26ddbd9a531", 
+   "reftest"
+  ], 
+  "css/css-text/line-break/line-break-normal-018.xht": [
+   "a1042e858aaa64cf04b1538567c1071df6fdf551", 
    "reftest"
   ], 
   "css/css-text/line-break/line-break-strict-011.xht": [
-   "3ba2e885bdfca9cb0b66745bb7cf583affe33bf3", 
+   "d9cecc788ab1d5132a5a69453b715d4145a325ff", 
    "reftest"
   ], 
   "css/css-text/line-break/line-break-strict-012.xht": [
-   "28358b8ca79165bcf53cdeaef05a3805573c92ad", 
+   "d01b53f6224b8438518549e58af8990a470a2af4", 
    "reftest"
   ], 
   "css/css-text/line-break/line-break-strict-013.xht": [
-   "b946883448305ed73783c39698d9c77d3b1a4155", 
+   "0ae49fb5ac0ce6a1654838e06b9b374981829884", 
    "reftest"
   ], 
   "css/css-text/line-break/line-break-strict-014.xht": [
-   "8cb4660e770358d1233c2f75512944646982c4dd", 
+   "90710cbdbe4eace92c480c8c68262b9f2319b2f0", 
    "reftest"
   ], 
   "css/css-text/line-break/line-break-strict-015.xht": [
-   "8549f73a4bcefa9ad55d0b7460841846085dc160", 
+   "ec3d6520f6b5b6c64e2cfb61fb92284894a7dad9", 
    "reftest"
   ], 
   "css/css-text/line-break/line-break-strict-016a.xht": [
-   "55e5434079e293b8c47a191617ed37e803530a0c", 
+   "9e6e8b8690d86ce12a607b65c825ad15bea7a990", 
    "reftest"
   ], 
   "css/css-text/line-break/line-break-strict-016b.xht": [
-   "66ed3de155d62599295dfaf72239e5dcfd0cfe93", 
+   "9a4a3c22ed75de3171cec7df7deb0fb827adbe48", 
    "reftest"
   ], 
   "css/css-text/line-break/line-break-strict-017a.xht": [
-   "4c8f9ce7b041ad9d7861d1ae258011e61c31264c", 
+   "1c0e91fd63e95307c41630894845ee4ecad02e23", 
    "reftest"
   ], 
   "css/css-text/line-break/line-break-strict-017b.xht": [
-   "95629cbef3e7fc7f87948cd40f05ec530801df7e", 
+   "c41b3afae2671fe15651e96570979665a41be7e0", 
+   "reftest"
+  ], 
+  "css/css-text/line-break/line-break-strict-018.xht": [
+   "85a92d1688ea42039102610bdb4cb8b4f4d9a82c", 
    "reftest"
   ], 
   "css/css-text/line-break/reference/line-break-anywhere-001-ref.html": [
    "ff74b3bce2d5ece698b404ecd30b53538c0eb420", 
    "support"
   ], 
-  "css/css-text/line-break/reference/line-break-normal-021-ref.xht": [
-   "13937468d808570d9ed4b790791cb76f1f25e594", 
+  "css/css-text/line-break/reference/line-break-loose-011-ref.xht": [
+   "cc6d9023c0843f126ce179674127ead69abb2076", 
    "support"
   ], 
-  "css/css-text/line-break/reference/line-break-normal-022-ref.xht": [
-   "c9508ab67f96ace5c81b0665a01fdf872a7ef529", 
+  "css/css-text/line-break/reference/line-break-loose-012-ref.xht": [
+   "4ffd2f90ecc7d463ededf2344e56bff7eb070362", 
    "support"
   ], 
-  "css/css-text/line-break/reference/line-break-normal-023a-ref.xht": [
-   "07fb2028a7e8fdd7917332e3acb5b0f2b9b917f7", 
+  "css/css-text/line-break/reference/line-break-loose-013-ref.xht": [
+   "fa97005132df4f4918e6bbc029b032ccfe4d1926", 
    "support"
   ], 
-  "css/css-text/line-break/reference/line-break-normal-023b-ref.xht": [
-   "302ddd6d1d87deea86933f18c67e41ce5c91d94a", 
+  "css/css-text/line-break/reference/line-break-loose-014-ref.xht": [
+   "bc8090819cd2391d98ff61221fde45c380d3eae5", 
    "support"
   ], 
-  "css/css-text/line-break/reference/line-break-normal-024a-ref.xht": [
-   "63580b20b34b3aa3eb83510e96d8d29d60f82aa7", 
+  "css/css-text/line-break/reference/line-break-loose-015-ref.xht": [
+   "c59d5af50462ce788ffa8a2d6305498cfe25cef6", 
    "support"
   ], 
-  "css/css-text/line-break/reference/line-break-normal-024b-ref.xht": [
-   "1c63f173daad3426357607cc3e6b755e99d95bad", 
+  "css/css-text/line-break/reference/line-break-loose-016a-ref.xht": [
+   "4338d02bab42a8aeb1a9eeebfe0dc1ab259cb702", 
+   "support"
+  ], 
+  "css/css-text/line-break/reference/line-break-loose-016b-ref.xht": [
+   "0c80df6ec467c04b103074f054fc97749c6e150d", 
+   "support"
+  ], 
+  "css/css-text/line-break/reference/line-break-loose-017a-ref.xht": [
+   "09a18a2396fa1510703ab198684dbd614ddd865a", 
+   "support"
+  ], 
+  "css/css-text/line-break/reference/line-break-loose-017b-ref.xht": [
+   "7148339b05e088d0edf6b9c5976ce95bd3ee265e", 
+   "support"
+  ], 
+  "css/css-text/line-break/reference/line-break-loose-018-ref.xht": [
+   "c8f6b561240add44b5c8b346a1a830644ab001d7", 
+   "support"
+  ], 
+  "css/css-text/line-break/reference/line-break-normal-011-ref.xht": [
+   "dc37069bad4c9bd250f1cb684c875d191f323c17", 
+   "support"
+  ], 
+  "css/css-text/line-break/reference/line-break-normal-012-ref.xht": [
+   "ecb86a902c7ab0ad7937655fbc664b3c0070975e", 
+   "support"
+  ], 
+  "css/css-text/line-break/reference/line-break-normal-013-ref.xht": [
+   "f6b670f90a7eee7a4ad14cb9a9eb38d000c0bb2e", 
+   "support"
+  ], 
+  "css/css-text/line-break/reference/line-break-normal-014-ref.xht": [
+   "577bf29a5181640a49169cb53b3fdc093d8affcc", 
+   "support"
+  ], 
+  "css/css-text/line-break/reference/line-break-normal-015-ref.xht": [
+   "886c4a30a03e392524a0a23a4c8c64b9064927ae", 
+   "support"
+  ], 
+  "css/css-text/line-break/reference/line-break-normal-016a-ref.xht": [
+   "4ebe678bd4094acfe2484eaaa0c3f59e4867785c", 
+   "support"
+  ], 
+  "css/css-text/line-break/reference/line-break-normal-016b-ref.xht": [
+   "4ee234b4cbab80f69f382a7d61729158c04bb9ae", 
+   "support"
+  ], 
+  "css/css-text/line-break/reference/line-break-normal-017a-ref.xht": [
+   "cd9710014efe913b99b1646989b1dc73bce890ae", 
+   "support"
+  ], 
+  "css/css-text/line-break/reference/line-break-normal-017b-ref.xht": [
+   "7efb5296b057b38ce3e74848bea3a6821df9523f", 
+   "support"
+  ], 
+  "css/css-text/line-break/reference/line-break-normal-018-ref.xht": [
+   "9b23b57dfe62551c90df892b1f297802eaf3517c", 
    "support"
   ], 
   "css/css-text/line-break/reference/line-break-strict-011-ref.xht": [
-   "1a2841bc01ebca19c3f34f08e3020f27f3d1766d", 
+   "ec17a31ec55e5c95aed8a7423ba0bcbff2edfa7d", 
    "support"
   ], 
   "css/css-text/line-break/reference/line-break-strict-012-ref.xht": [
-   "0deeb9f569419febb97260db08ad488ca882b3dc", 
+   "fbe2222c72d65946298cfb1bdb280f4d3356240a", 
    "support"
   ], 
   "css/css-text/line-break/reference/line-break-strict-013-ref.xht": [
-   "40e5b1d940c48340b171af4e136ef1ceaee7f290", 
+   "44a33c588db07971449fc48b9371b52b1f99465c", 
    "support"
   ], 
   "css/css-text/line-break/reference/line-break-strict-014-ref.xht": [
-   "2676a3b4bfa5f58ca0dd1e3a9865f5cfe4ec71b6", 
+   "2af0a903eb6776ff7b0ccaf1297dfc8a94d501ed", 
    "support"
   ], 
   "css/css-text/line-break/reference/line-break-strict-015-ref.xht": [
-   "5bcd3c2cfd440c75f14d220f1157000aef937739", 
+   "320870299d2adb5458283e6bdcb77c2625b55616", 
    "support"
   ], 
   "css/css-text/line-break/reference/line-break-strict-016a-ref.xht": [
-   "b95368ff7ffa4302277d023bcb85bb044591aa1f", 
+   "9c2d497a039dff479820690a5da8c737bee92d5d", 
    "support"
   ], 
   "css/css-text/line-break/reference/line-break-strict-016b-ref.xht": [
-   "57698e5a55867600a3809fb98049b760630aa30d", 
+   "d000b8087b8f34b781c40b7d29ea09c7ce700b95", 
    "support"
   ], 
   "css/css-text/line-break/reference/line-break-strict-017a-ref.xht": [
-   "7234804a08d2365daefab3c2795162a257ca2a96", 
+   "87f9f322c11a986d7a232ad6303c334d3bffb8bc", 
    "support"
   ], 
   "css/css-text/line-break/reference/line-break-strict-017b-ref.xht": [
-   "3960275176a67e129c1edcaf6b37df32a327144d", 
+   "c4b5c89b201ef2d4eb4f21c8fad1d415e0896a27", 
+   "support"
+  ], 
+  "css/css-text/line-break/reference/line-break-strict-018-ref.xht": [
+   "c0c236a9276ee64efcd2919c1ffdb5ecfa1eb3ac", 
    "support"
   ], 
   "css/css-text/line-breaking/line-breaking-001.html": [
@@ -571896,7 +572419,7 @@
    "support"
   ], 
   "css/css-text/word-break/reference/word-break-break-all-020-ref.html": [
-   "635bd024bf4cdb4bee1dcb432c794a317dc8442f", 
+   "32b85542a7760d9757c4cd958f42de05336d1a41", 
    "support"
   ], 
   "css/css-text/word-break/reference/word-break-break-all-ref-000.html": [
@@ -572080,11 +572603,11 @@
    "manual"
   ], 
   "css/css-text/word-break/word-break-break-all-010.html": [
-   "1ab97fb146a984da98a2400af0392187531edadc", 
+   "7d3bc056d822ca15b523f332c6c23ed22a85b340", 
    "reftest"
   ], 
   "css/css-text/word-break/word-break-break-all-011.html": [
-   "ed07aeb7368da2273e394011f426c1ee65fe2b25", 
+   "531c68d8cea3f3496e34b26ae51e1138385acbb8", 
    "reftest"
   ], 
   "css/css-text/word-break/word-break-break-all-014.html": [
@@ -572092,7 +572615,7 @@
    "reftest"
   ], 
   "css/css-text/word-break/word-break-break-all-020.html": [
-   "6c86749263a93eb277781377ccde6e89b2a3790e", 
+   "ac1840131c3f214b993ffd58dcd2124523f89b6b", 
    "reftest"
   ], 
   "css/css-text/word-break/word-break-keep-all-000.html": [
@@ -615712,7 +616235,7 @@
    "testharness"
   ], 
   "html/dom/usvstring-reflection.html": [
-   "b9c06d824eccfc2e66e77a65d71b1eea115d40cb", 
+   "b9cafd1fb352cf619141420cbb68aca1483ca8e4", 
    "testharness"
   ], 
   "html/editing/activation/click-manual.html": [
@@ -631180,7 +631703,7 @@
    "support"
   ], 
   "interfaces/DOM-Parsing.idl": [
-   "94d437977afac4a1c09bd5588909cec02862694f", 
+   "f3a13342f5eb24b92523683ccc86b46d15ddbfb0", 
    "support"
   ], 
   "interfaces/FileAPI.idl": [
@@ -631240,7 +631763,7 @@
    "support"
   ], 
   "interfaces/audio-output.idl": [
-   "c8efd4ea05161b06a3995fb29f19941452ec6b10", 
+   "2a86188565fd3412ce2f6518b05f913309a90a47", 
    "support"
   ], 
   "interfaces/background-fetch.idl": [
@@ -631276,7 +631799,7 @@
    "support"
   ], 
   "interfaces/credential-management.idl": [
-   "c60fa4ec669a1d93acc0a5afc7a53a7eb49dcd90", 
+   "da1b9dfca6909eab1e3c7fd5e16f1391d69f9dcb", 
    "support"
   ], 
   "interfaces/csp-embedded-enforcement.idl": [
@@ -631432,7 +631955,7 @@
    "support"
   ], 
   "interfaces/input-events.idl": [
-   "3bcb0dd78cdccb39d23b29f33a803622aab125c7", 
+   "bd4024856b5be0483f32f65f33ef9cebe81a4521", 
    "support"
   ], 
   "interfaces/intersection-observer.idl": [
@@ -631472,7 +631995,7 @@
    "support"
   ], 
   "interfaces/mediacapture-streams.idl": [
-   "b2dc9904fde1d0e02e9060470a7f0ecdce8fe3a3", 
+   "a66e473493ede9d5de50005718cabe9b837830a0", 
    "support"
   ], 
   "interfaces/mediasession.idl": [
@@ -631520,7 +632043,7 @@
    "support"
   ], 
   "interfaces/payment-method-basic-card.idl": [
-   "2019aa1166935b9bf8f1ad3a5d62183d18b0a682", 
+   "25cb62170dc71714ec13120c50dd3b32bd067857", 
    "support"
   ], 
   "interfaces/payment-request.idl": [
@@ -631528,7 +632051,7 @@
    "support"
   ], 
   "interfaces/performance-timeline.idl": [
-   "2ec82476b598d1fa3e892c688d046750eeb5051e", 
+   "0cd2830b2ea2f751691703eaa1c4c356af328e48", 
    "support"
   ], 
   "interfaces/permissions.idl": [
@@ -631628,7 +632151,7 @@
    "support"
   ], 
   "interfaces/trusted-types.tentative.idl": [
-   "564200133b7015fb9b03094b71b3ce7ee3ee8c57", 
+   "6ff45e7050c90feda36f99a422a243c01ff51156", 
    "support"
   ], 
   "interfaces/uievents.idl": [
@@ -656183,6 +656706,14 @@
    "20f3c7e6c930193207c6cbcd329e36f85a993dc9", 
    "support"
   ], 
+  "scroll-animations/constructor-no-document.html": [
+   "63c0665a8be485d1f3e95fe556b5eb44fefa1ee4", 
+   "testharness"
+  ], 
+  "scroll-animations/constructor.html": [
+   "a449b32d2be4bfe9e825ff3b3637a5ddb609b93e", 
+   "testharness"
+  ], 
   "scroll-animations/idlharness.window.js": [
    "90157580ce00716403346f369b1e25bba8db23c2", 
    "testharness"
@@ -664872,7 +665403,7 @@
    "support"
   ], 
   "tools/lint/lint.py": [
-   "3973dda3b943427c9be0b20de4ac7cd06b0f84d8", 
+   "9976314c8fb2eaa202ad0ad418cfe22b8b3d6353", 
    "support"
   ], 
   "tools/lint/tests/__init__.py": [
@@ -665016,7 +665547,7 @@
    "support"
   ], 
   "tools/lint/tests/test_lint.py": [
-   "6b484ea24b59828375b6e999ef407220de0c5bd8", 
+   "dbd4708cdc969da6824ba377dcf9f33a326b9863", 
    "support"
   ], 
   "tools/lint/tests/test_path_lints.py": [
@@ -665060,7 +665591,7 @@
    "support"
   ], 
   "tools/manifest/sourcefile.py": [
-   "1f08088eb4666158b5fbece0c2727a9f41b7d907", 
+   "d2e5df85526311f5503ff451a0ad4217eeb21865", 
    "support"
   ], 
   "tools/manifest/tests/__init__.py": [
@@ -665088,7 +665619,7 @@
    "support"
   ], 
   "tools/manifest/utils.py": [
-   "d9be750e416935550e4442812b52531c709190bd", 
+   "9da79f6deb42e6d5f98bb4052b3586017acb54e0", 
    "support"
   ], 
   "tools/manifest/vcs.py": [
@@ -669832,7 +670363,7 @@
    "support"
   ], 
   "tools/wptrunner/wptrunner/browsers/fennec.py": [
-   "457565e84d8a3306e5035e00ac3d2f0f5daa6637", 
+   "a7009dd26b302564def593fb02a2ce1a2776a240", 
    "support"
   ], 
   "tools/wptrunner/wptrunner/browsers/firefox.py": [
@@ -670667,6 +671198,18 @@
    "172d566e57fc635b551b5d355661db690869b220", 
    "testharness"
   ], 
+  "trusted-types/WorkerGlobalScope-importScripts.https.html": [
+   "30dea82077c59d8bd9b95985dd1383ea47733534", 
+   "testharness"
+  ], 
+  "trusted-types/WorkerGlobalScope-importScripts.https.js": [
+   "4e491b9fe601b2dba1f1acafbbec9f502f2e6671", 
+   "support"
+  ], 
+  "trusted-types/WorkerGlobalScope-importScripts.https.js.headers": [
+   "1bc33add09b4b34ce2cba21f488f8ed53345a27a", 
+   "support"
+  ], 
   "trusted-types/block-string-assignment-to-DOMParser-parseFromString.tentative.html": [
    "4446a58836695355efd0fbf3f9f5a0bd6c60c8a3", 
    "testharness"
@@ -670727,6 +671270,10 @@
    "9ad605975555df539e6444d3b8935197c7925aef", 
    "support"
   ], 
+  "trusted-types/support/worker.js": [
+   "4079f7e9c7933cf9ee195fe0e7a54e0f56f184ab", 
+   "support"
+  ], 
   "uievents/META.yml": [
    "2f1ec58efec10e0dd6374aac05cb926c8cffa3f1", 
    "support"
diff --git a/tests/wpt/metadata/css/css-text/line-break/line-break-loose-011.xht.ini b/tests/wpt/metadata/css/css-text/line-break/line-break-loose-011.xht.ini
new file mode 100644
index 00000000000..4c95f99d1c5
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/line-break/line-break-loose-011.xht.ini
@@ -0,0 +1,2 @@
+[line-break-loose-011.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/line-break/line-break-loose-012.xht.ini b/tests/wpt/metadata/css/css-text/line-break/line-break-loose-012.xht.ini
new file mode 100644
index 00000000000..26fe79ee1a7
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/line-break/line-break-loose-012.xht.ini
@@ -0,0 +1,2 @@
+[line-break-loose-012.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/line-break/line-break-loose-013.xht.ini b/tests/wpt/metadata/css/css-text/line-break/line-break-loose-013.xht.ini
new file mode 100644
index 00000000000..fdc2c363014
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/line-break/line-break-loose-013.xht.ini
@@ -0,0 +1,2 @@
+[line-break-loose-013.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/line-break/line-break-loose-014.xht.ini b/tests/wpt/metadata/css/css-text/line-break/line-break-loose-014.xht.ini
new file mode 100644
index 00000000000..4b5d323daa1
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/line-break/line-break-loose-014.xht.ini
@@ -0,0 +1,2 @@
+[line-break-loose-014.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/line-break/line-break-loose-015.xht.ini b/tests/wpt/metadata/css/css-text/line-break/line-break-loose-015.xht.ini
new file mode 100644
index 00000000000..a35228429f9
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/line-break/line-break-loose-015.xht.ini
@@ -0,0 +1,2 @@
+[line-break-loose-015.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/line-break/line-break-loose-016a.xht.ini b/tests/wpt/metadata/css/css-text/line-break/line-break-loose-016a.xht.ini
new file mode 100644
index 00000000000..10cdf226e88
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/line-break/line-break-loose-016a.xht.ini
@@ -0,0 +1,2 @@
+[line-break-loose-016a.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/line-break/line-break-loose-016b.xht.ini b/tests/wpt/metadata/css/css-text/line-break/line-break-loose-016b.xht.ini
new file mode 100644
index 00000000000..4149619c2f0
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/line-break/line-break-loose-016b.xht.ini
@@ -0,0 +1,2 @@
+[line-break-loose-016b.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/line-break/line-break-loose-017a.xht.ini b/tests/wpt/metadata/css/css-text/line-break/line-break-loose-017a.xht.ini
new file mode 100644
index 00000000000..73d616f9327
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/line-break/line-break-loose-017a.xht.ini
@@ -0,0 +1,2 @@
+[line-break-loose-017a.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/line-break/line-break-loose-017b.xht.ini b/tests/wpt/metadata/css/css-text/line-break/line-break-loose-017b.xht.ini
new file mode 100644
index 00000000000..757d63998d2
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/line-break/line-break-loose-017b.xht.ini
@@ -0,0 +1,2 @@
+[line-break-loose-017b.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/line-break/line-break-loose-018.xht.ini b/tests/wpt/metadata/css/css-text/line-break/line-break-loose-018.xht.ini
new file mode 100644
index 00000000000..4b9be52268f
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/line-break/line-break-loose-018.xht.ini
@@ -0,0 +1,2 @@
+[line-break-loose-018.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/line-break/line-break-normal-011.xht.ini b/tests/wpt/metadata/css/css-text/line-break/line-break-normal-011.xht.ini
new file mode 100644
index 00000000000..2efce4a7118
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/line-break/line-break-normal-011.xht.ini
@@ -0,0 +1,2 @@
+[line-break-normal-011.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/line-break/line-break-normal-012.xht.ini b/tests/wpt/metadata/css/css-text/line-break/line-break-normal-012.xht.ini
new file mode 100644
index 00000000000..46982f363ba
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/line-break/line-break-normal-012.xht.ini
@@ -0,0 +1,2 @@
+[line-break-normal-012.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/line-break/line-break-normal-013.xht.ini b/tests/wpt/metadata/css/css-text/line-break/line-break-normal-013.xht.ini
new file mode 100644
index 00000000000..2de271314d1
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/line-break/line-break-normal-013.xht.ini
@@ -0,0 +1,2 @@
+[line-break-normal-013.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/line-break/line-break-normal-018.xht.ini b/tests/wpt/metadata/css/css-text/line-break/line-break-normal-018.xht.ini
new file mode 100644
index 00000000000..693999d7f9d
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/line-break/line-break-normal-018.xht.ini
@@ -0,0 +1,2 @@
+[line-break-normal-018.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/line-break/line-break-strict-018.xht.ini b/tests/wpt/metadata/css/css-text/line-break/line-break-strict-018.xht.ini
new file mode 100644
index 00000000000..bd79bd226f9
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/line-break/line-break-strict-018.xht.ini
@@ -0,0 +1,2 @@
+[line-break-strict-018.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/word-break/word-break-break-all-020.html.ini b/tests/wpt/metadata/css/css-text/word-break/word-break-break-all-020.html.ini
new file mode 100644
index 00000000000..f83f0f26ad5
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/word-break/word-break-break-all-020.html.ini
@@ -0,0 +1,2 @@
+[word-break-break-all-020.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/encoding/single-byte-decoder.html.ini b/tests/wpt/metadata/encoding/single-byte-decoder.html.ini
index 8bbe53eafea..6a14d55c4bf 100644
--- a/tests/wpt/metadata/encoding/single-byte-decoder.html.ini
+++ b/tests/wpt/metadata/encoding/single-byte-decoder.html.ini
@@ -532,7 +532,7 @@
     expected: FAIL
 
   [windows-1252: iso_8859-1:1987 (XMLHttpRequest)]
-    expected: TIMEOUT
+    expected: FAIL
 
   [windows-1254: iso_8859-9:1989 (XMLHttpRequest)]
     expected: TIMEOUT
@@ -540,9 +540,6 @@
   [windows-1258: cp1258 (XMLHttpRequest)]
     expected: TIMEOUT
 
-  [windows-1253: x-cp1253 (XMLHttpRequest)]
-    expected: TIMEOUT
-
   [windows-1256: cp1256 (XMLHttpRequest)]
     expected: TIMEOUT
 
@@ -579,15 +576,9 @@
   [windows-1257: x-cp1257 (XMLHttpRequest)]
     expected: TIMEOUT
 
-  [windows-1254: cp1254 (XMLHttpRequest)]
-    expected: TIMEOUT
-
   [windows-1253: windows-1253 (XMLHttpRequest)]
     expected: TIMEOUT
 
-  [windows-1253: cp1253 (XMLHttpRequest)]
-    expected: TIMEOUT
-
   [windows-1254: l5 (XMLHttpRequest)]
     expected: TIMEOUT
 
@@ -597,9 +588,6 @@
   [windows-1254: latin5 (XMLHttpRequest)]
     expected: TIMEOUT
 
-  [windows-1252: x-cp1252 (XMLHttpRequest)]
-    expected: TIMEOUT
-
   [windows-1255: cp1255 (XMLHttpRequest)]
     expected: TIMEOUT
 
@@ -618,25 +606,10 @@
   [windows-1256: windows-1256 (XMLHttpRequest)]
     expected: TIMEOUT
 
-  [windows-1252: iso88591 (XMLHttpRequest)]
-    expected: TIMEOUT
-
-  [windows-1252: iso_8859-1 (XMLHttpRequest)]
-    expected: TIMEOUT
-
-  [windows-1252: latin1 (XMLHttpRequest)]
-    expected: TIMEOUT
-
-  [windows-1252: l1 (XMLHttpRequest)]
-    expected: TIMEOUT
-
   [windows-1256: x-cp1256 (XMLHttpRequest)]
     expected: TIMEOUT
 
-  [windows-1252: windows-1252 (XMLHttpRequest)]
-    expected: TIMEOUT
-
-  [windows-1252: us-ascii (XMLHttpRequest)]
+  [windows-1254: iso8859-9 (XMLHttpRequest)]
     expected: TIMEOUT
 
 
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/006.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/006.html.ini
new file mode 100644
index 00000000000..c8544361068
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/006.html.ini
@@ -0,0 +1,4 @@
+[006.html]
+  [Link with onclick form submit and href navigation ]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/dom/usvstring-reflection.html.ini b/tests/wpt/metadata/html/dom/usvstring-reflection.html.ini
index 37bb450ceb9..b69fefe57b4 100644
--- a/tests/wpt/metadata/html/dom/usvstring-reflection.html.ini
+++ b/tests/wpt/metadata/html/dom/usvstring-reflection.html.ini
@@ -26,3 +26,6 @@
   [USVString test relate to url]
     expected: FAIL
 
+  [UnregisterPtotocolHandler URL: unpaired surrogate codepoint should not make any exceptions.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html.ini
index 0f1a214d0ee..6b57ca778ee 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html.ini
@@ -5,7 +5,7 @@
     expected: TIMEOUT
 
   [picture: source (max-width:500px) valid image, img valid image, resize to wide]
-    expected: FAIL
+    expected: TIMEOUT
 
   [picture: source (max-width:500px) valid image, img broken image, resize to narrow]
     expected: TIMEOUT
@@ -16,18 +16,9 @@
   [picture: source (max-width:500px) broken image, img valid image, resize to narrow]
     expected: FAIL
 
-  [img (srcset 1 cand) valid image, resize to wide]
-    expected: FAIL
-
-  [picture: same URL in source (max-width:500px) and img, resize to wide]
-    expected: FAIL
-
   [img (srcset 1 cand) valid image, resize to narrow]
     expected: FAIL
 
-  [picture: source (max-width:500px) valid image, img broken image, resize to wide]
-    expected: FAIL
-
   [picture: same URL in source (max-width:500px) and img, resize to narrow]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini b/tests/wpt/metadata/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini
new file mode 100644
index 00000000000..9e522297c94
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini
@@ -0,0 +1,7 @@
+[toggleEvent.html]
+  [Calling open twice on 'details' fires only one toggle event]
+    expected: FAIL
+
+  [Setting open=true to opened 'details' element should not fire a toggle event at the 'details' element]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/performance-timeline/idlharness.any.js.ini b/tests/wpt/metadata/performance-timeline/idlharness.any.js.ini
index 803dbf7eeaf..948bb9b38b8 100644
--- a/tests/wpt/metadata/performance-timeline/idlharness.any.js.ini
+++ b/tests/wpt/metadata/performance-timeline/idlharness.any.js.ini
@@ -22,6 +22,9 @@
   [Test default toJSON operation of PerformanceMark]
     expected: FAIL
 
+  [PerformanceObserver interface: attribute supportedEntryTypes]
+    expected: FAIL
+
 
 [idlharness.any.html]
   [Untitled]
@@ -42,6 +45,9 @@
   [Test default toJSON operation of PerformanceMark]
     expected: FAIL
 
+  [PerformanceObserver interface: attribute supportedEntryTypes]
+    expected: FAIL
+
 
 [idlharness.https.any.serviceworker.html]
   type: testharness
diff --git a/tests/wpt/metadata/performance-timeline/webtiming-resolution.any.js.ini b/tests/wpt/metadata/performance-timeline/webtiming-resolution.any.js.ini
index 7725b118e9d..99a24216c88 100644
--- a/tests/wpt/metadata/performance-timeline/webtiming-resolution.any.js.ini
+++ b/tests/wpt/metadata/performance-timeline/webtiming-resolution.any.js.ini
@@ -12,6 +12,3 @@
   [Verifies the resolution of entry.startTime is at least 5 microseconds.]
     expected: TIMEOUT
 
-  [Verifies the resolution of performance.now() is at least 5 microseconds.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/quirks/unitless-length/limited-quirks.html.ini b/tests/wpt/metadata/quirks/unitless-length/limited-quirks.html.ini
new file mode 100644
index 00000000000..c7e9c7434f5
--- /dev/null
+++ b/tests/wpt/metadata/quirks/unitless-length/limited-quirks.html.ini
@@ -0,0 +1,283 @@
+[limited-quirks.html]
+  [top: -\\31 .5]
+    expected: FAIL
+
+  [bottom: -1A]
+    expected: FAIL
+
+  [bottom: -1a]
+    expected: FAIL
+
+  [top: @1]
+    expected: FAIL
+
+  [top: "1a"]
+    expected: FAIL
+
+  [top: @a]
+    expected: FAIL
+
+  [bottom: "1"]
+    expected: FAIL
+
+  [bottom: -/**/1]
+    expected: FAIL
+
+  [top: +/**/1]
+    expected: FAIL
+
+  [bottom: @1a]
+    expected: FAIL
+
+  [top: 1\\31 ]
+    expected: FAIL
+
+  [top: url('1')]
+    expected: FAIL
+
+  [bottom: -\\31 ]
+    expected: FAIL
+
+  [top: calc(1)]
+    expected: FAIL
+
+  [top: \\31 ]
+    expected: FAIL
+
+  [bottom: +1\\31 ]
+    expected: FAIL
+
+  [bottom: 1\\31 .5]
+    expected: FAIL
+
+  [bottom: #0001]
+    expected: FAIL
+
+  [top: calc(2 * 2px)]
+    expected: FAIL
+
+  [bottom: 1a]
+    expected: FAIL
+
+  [bottom: A]
+    expected: FAIL
+
+  [bottom: #01]
+    expected: FAIL
+
+  [top: +\\31 .5]
+    expected: FAIL
+
+  [bottom: #1]
+    expected: FAIL
+
+  [top: -/**/1]
+    expected: FAIL
+
+  [bottom: +\\31 .5]
+    expected: FAIL
+
+  [bottom: \\31 ]
+    expected: FAIL
+
+  [bottom: calc(1)]
+    expected: FAIL
+
+  [top: #001]
+    expected: FAIL
+
+  [top: +\\31 ]
+    expected: FAIL
+
+  [bottom: +\\31 ]
+    expected: FAIL
+
+  [top: +1.5]
+    expected: FAIL
+
+  [top: +1\\31 ]
+    expected: FAIL
+
+  [bottom: @a]
+    expected: FAIL
+
+  [bottom: @1]
+    expected: FAIL
+
+  [top: #1]
+    expected: FAIL
+
+  [top: 1a]
+    expected: FAIL
+
+  [bottom: +1a]
+    expected: FAIL
+
+  [bottom: +1A]
+    expected: FAIL
+
+  [bottom: "a"]
+    expected: FAIL
+
+  [top: #00001]
+    expected: FAIL
+
+  [bottom: -1\\31 .5]
+    expected: FAIL
+
+  [top: "1"]
+    expected: FAIL
+
+  [bottom: 1.5]
+    expected: FAIL
+
+  [bottom: -\\31 .5]
+    expected: FAIL
+
+  [bottom: url('1')]
+    expected: FAIL
+
+  [bottom: -1.5]
+    expected: FAIL
+
+  [top: \\31 .5]
+    expected: FAIL
+
+  [bottom: "1a"]
+    expected: FAIL
+
+  [bottom: calc(2 * 2px)]
+    expected: FAIL
+
+  [bottom: +1\\31 .5]
+    expected: FAIL
+
+  [bottom: 1\\31 ]
+    expected: FAIL
+
+  [bottom: +/**/1]
+    expected: FAIL
+
+  [bottom: #00001]
+    expected: FAIL
+
+  [top: url(1)]
+    expected: FAIL
+
+  [bottom: #001]
+    expected: FAIL
+
+  [top: +1\\31 .5]
+    expected: FAIL
+
+  [top: -1a]
+    expected: FAIL
+
+  [top: -1A]
+    expected: FAIL
+
+  [bottom: url(1)]
+    expected: FAIL
+
+  [top: a]
+    expected: FAIL
+
+  [top: A]
+    expected: FAIL
+
+  [top: #000001]
+    expected: FAIL
+
+  [top: 1]
+    expected: FAIL
+
+  [top: 1\\31 .5]
+    expected: FAIL
+
+  [bottom: a]
+    expected: FAIL
+
+  [bottom: 1]
+    expected: FAIL
+
+  [bottom: +1]
+    expected: FAIL
+
+  [bottom: #000001]
+    expected: FAIL
+
+  [bottom: +a]
+    expected: FAIL
+
+  [bottom: +A]
+    expected: FAIL
+
+  [top: 1.5]
+    expected: FAIL
+
+  [top: +A]
+    expected: FAIL
+
+  [top: +a]
+    expected: FAIL
+
+  [top: +1]
+    expected: FAIL
+
+  [top: -1.5]
+    expected: FAIL
+
+  [top: -1\\31 .5]
+    expected: FAIL
+
+  [top: +1a]
+    expected: FAIL
+
+  [top: +1A]
+    expected: FAIL
+
+  [top: @1a]
+    expected: FAIL
+
+  [bottom: \\31 .5]
+    expected: FAIL
+
+  [top: "a"]
+    expected: FAIL
+
+  [top: #01]
+    expected: FAIL
+
+  [bottom: +1.5]
+    expected: FAIL
+
+  [bottom: -A]
+    expected: FAIL
+
+  [bottom: -a]
+    expected: FAIL
+
+  [bottom: -1\\31 ]
+    expected: FAIL
+
+  [top: #0001]
+    expected: FAIL
+
+  [bottom: -1]
+    expected: FAIL
+
+  [top: -\\31 ]
+    expected: FAIL
+
+  [top: -A]
+    expected: FAIL
+
+  [top: -a]
+    expected: FAIL
+
+  [top: -1]
+    expected: FAIL
+
+  [top: -1\\31 ]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/quirks/unitless-length/no-quirks.html.ini b/tests/wpt/metadata/quirks/unitless-length/no-quirks.html.ini
new file mode 100644
index 00000000000..818a429ed39
--- /dev/null
+++ b/tests/wpt/metadata/quirks/unitless-length/no-quirks.html.ini
@@ -0,0 +1,283 @@
+[no-quirks.html]
+  [top: -\\31 .5]
+    expected: FAIL
+
+  [bottom: -1A]
+    expected: FAIL
+
+  [bottom: -1a]
+    expected: FAIL
+
+  [top: @1]
+    expected: FAIL
+
+  [top: "1a"]
+    expected: FAIL
+
+  [top: @a]
+    expected: FAIL
+
+  [bottom: "1"]
+    expected: FAIL
+
+  [bottom: -/**/1]
+    expected: FAIL
+
+  [top: +/**/1]
+    expected: FAIL
+
+  [bottom: @1a]
+    expected: FAIL
+
+  [top: 1\\31 ]
+    expected: FAIL
+
+  [top: url('1')]
+    expected: FAIL
+
+  [bottom: -\\31 ]
+    expected: FAIL
+
+  [top: calc(1)]
+    expected: FAIL
+
+  [top: \\31 ]
+    expected: FAIL
+
+  [bottom: +1\\31 ]
+    expected: FAIL
+
+  [bottom: 1\\31 .5]
+    expected: FAIL
+
+  [bottom: #0001]
+    expected: FAIL
+
+  [top: calc(2 * 2px)]
+    expected: FAIL
+
+  [bottom: 1a]
+    expected: FAIL
+
+  [bottom: A]
+    expected: FAIL
+
+  [bottom: #01]
+    expected: FAIL
+
+  [top: +\\31 .5]
+    expected: FAIL
+
+  [bottom: #1]
+    expected: FAIL
+
+  [top: -/**/1]
+    expected: FAIL
+
+  [bottom: +\\31 .5]
+    expected: FAIL
+
+  [bottom: \\31 ]
+    expected: FAIL
+
+  [bottom: calc(1)]
+    expected: FAIL
+
+  [top: #001]
+    expected: FAIL
+
+  [top: +\\31 ]
+    expected: FAIL
+
+  [bottom: +\\31 ]
+    expected: FAIL
+
+  [top: +1.5]
+    expected: FAIL
+
+  [top: +1\\31 ]
+    expected: FAIL
+
+  [bottom: @a]
+    expected: FAIL
+
+  [bottom: @1]
+    expected: FAIL
+
+  [top: #1]
+    expected: FAIL
+
+  [top: 1a]
+    expected: FAIL
+
+  [bottom: +1a]
+    expected: FAIL
+
+  [bottom: +1A]
+    expected: FAIL
+
+  [bottom: "a"]
+    expected: FAIL
+
+  [top: #00001]
+    expected: FAIL
+
+  [bottom: -1\\31 .5]
+    expected: FAIL
+
+  [top: "1"]
+    expected: FAIL
+
+  [bottom: 1.5]
+    expected: FAIL
+
+  [bottom: -\\31 .5]
+    expected: FAIL
+
+  [bottom: url('1')]
+    expected: FAIL
+
+  [bottom: -1.5]
+    expected: FAIL
+
+  [top: \\31 .5]
+    expected: FAIL
+
+  [bottom: "1a"]
+    expected: FAIL
+
+  [bottom: calc(2 * 2px)]
+    expected: FAIL
+
+  [bottom: +1\\31 .5]
+    expected: FAIL
+
+  [bottom: 1\\31 ]
+    expected: FAIL
+
+  [bottom: +/**/1]
+    expected: FAIL
+
+  [bottom: #00001]
+    expected: FAIL
+
+  [top: url(1)]
+    expected: FAIL
+
+  [bottom: #001]
+    expected: FAIL
+
+  [top: +1\\31 .5]
+    expected: FAIL
+
+  [top: -1a]
+    expected: FAIL
+
+  [top: -1A]
+    expected: FAIL
+
+  [bottom: url(1)]
+    expected: FAIL
+
+  [top: a]
+    expected: FAIL
+
+  [top: A]
+    expected: FAIL
+
+  [top: #000001]
+    expected: FAIL
+
+  [top: 1]
+    expected: FAIL
+
+  [top: 1\\31 .5]
+    expected: FAIL
+
+  [bottom: a]
+    expected: FAIL
+
+  [bottom: 1]
+    expected: FAIL
+
+  [bottom: +1]
+    expected: FAIL
+
+  [bottom: #000001]
+    expected: FAIL
+
+  [bottom: +a]
+    expected: FAIL
+
+  [bottom: +A]
+    expected: FAIL
+
+  [top: 1.5]
+    expected: FAIL
+
+  [top: +A]
+    expected: FAIL
+
+  [top: +a]
+    expected: FAIL
+
+  [top: +1]
+    expected: FAIL
+
+  [top: -1.5]
+    expected: FAIL
+
+  [top: -1\\31 .5]
+    expected: FAIL
+
+  [top: +1a]
+    expected: FAIL
+
+  [top: +1A]
+    expected: FAIL
+
+  [top: @1a]
+    expected: FAIL
+
+  [bottom: \\31 .5]
+    expected: FAIL
+
+  [top: "a"]
+    expected: FAIL
+
+  [top: #01]
+    expected: FAIL
+
+  [bottom: +1.5]
+    expected: FAIL
+
+  [bottom: -A]
+    expected: FAIL
+
+  [bottom: -a]
+    expected: FAIL
+
+  [bottom: -1\\31 ]
+    expected: FAIL
+
+  [top: #0001]
+    expected: FAIL
+
+  [bottom: -1]
+    expected: FAIL
+
+  [top: -\\31 ]
+    expected: FAIL
+
+  [top: -A]
+    expected: FAIL
+
+  [top: -a]
+    expected: FAIL
+
+  [top: -1]
+    expected: FAIL
+
+  [top: -1\\31 ]
+    expected: FAIL
+
diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/blob-url-in-child-frame-self-navigate-inherits.sub.html b/tests/wpt/web-platform-tests/content-security-policy/inheritance/blob-url-in-child-frame-self-navigate-inherits.sub.html
new file mode 100644
index 00000000000..f2b3d063e91
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/inheritance/blob-url-in-child-frame-self-navigate-inherits.sub.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <script nonce="abc" src="/resources/testharness.js"></script>
+    <script nonce="abc" src="/resources/testharnessreport.js"></script>
+</head>
+
+<!-- This tests that navigating a main window to a local scheme preserves the current CSP.
+     We need to test this in a main window with no parent/opener so we use
+     a link with target=_blank and rel=noopener. -->
+<body>
+    <iframe src="support/navigate-self-to-blob.html?csp=script-src%20%27nonce-abc%27&report_id={{$id:uuid()}}"></iframe>
+    <script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=script-src%20%27nonce-abc%27&reportID={{$id}}'></script>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/blob-url-self-navigate-inherits.sub.html b/tests/wpt/web-platform-tests/content-security-policy/inheritance/blob-url-in-main-window-self-navigate-inherits.sub.html
similarity index 100%
rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/blob-url-self-navigate-inherits.sub.html
rename to tests/wpt/web-platform-tests/content-security-policy/inheritance/blob-url-in-main-window-self-navigate-inherits.sub.html
diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/iframe-all-local-schemes-inherit-self.sub.html b/tests/wpt/web-platform-tests/content-security-policy/inheritance/iframe-all-local-schemes-inherit-self.sub.html
new file mode 100644
index 00000000000..73e974e51a8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/inheritance/iframe-all-local-schemes-inherit-self.sub.html
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<meta http-equiv="Content-Security-Policy" content="img-src 'self'">
+
+<body>
+
+<script>
+  function wait_for_error_from_frame(frame, test) {
+    window.addEventListener('message', test.step_func(e => {
+      if (e.source != frame.contentWindow)
+        return;
+      assert_equals(e.data, "load");
+      frame.remove();
+      test.done();
+    }));
+  }
+
+  async_test(t => {
+    var i = document.createElement('iframe');
+    document.body.appendChild(i);
+
+    var img = document.createElement('img');
+    img.onload = t.step_func_done(_ => i.remove());
+    img.onerror = t.unreached_func();
+    i.contentDocument.body.appendChild(img);
+    img.src = "{{location[server]}}/images/red-16x16.png";
+  }, "<iframe>'s about:blank inherits policy.");
+
+  async_test(t => {
+    var i = document.createElement('iframe');
+    i.srcdoc = `
+      <img src='{{location[server]}}/images/red-16x16.png'
+        onload='window.top.postMessage("load", "*");'
+        onerror='window.top.postMessage("error", "*");'
+      >
+    `;
+
+    wait_for_error_from_frame(i, t);
+
+    document.body.appendChild(i);
+  }, "<iframe srcdoc>'s inherits policy.");
+
+  async_test(t => {
+    var i = document.createElement('iframe');
+    var b = new Blob(
+      [`
+        <img src='{{location[server]}}/images/red-16x16.png'
+          onload='window.top.postMessage("load", "*");'
+          onerror='window.top.postMessage("error", "*");'
+        >
+      `], {type:"text/html"});
+    i.src = URL.createObjectURL(b);
+
+    wait_for_error_from_frame(i, t);
+
+    document.body.appendChild(i);
+  }, "<iframe src='blob:...'>'s inherits policy.");
+
+  async_test(t => {
+    var i = document.createElement('iframe');
+    i.src = `data:text/html,<img src='{{location[server]}}/images/red-16x16.png'
+      onload='window.top.postMessage("load", "*");'
+      onerror='window.top.postMessage("error", "*");'
+    >`;
+
+    wait_for_error_from_frame(i, t);
+
+    document.body.appendChild(i);
+  }, "<iframe src='data:...'>'s inherits policy.");
+
+  async_test(t => {
+    var i = document.createElement('iframe');
+    i.src = `javascript:"<img src='{{location[server]}}/images/red-16x16.png'
+      onload='window.top.postMessage(\\"load\\", \\"*\\");'
+      onerror='window.top.postMessage(\\"error\\", \\"*\\");'
+    >"`;
+
+    wait_for_error_from_frame(i, t);
+
+    document.body.appendChild(i);
+  }, "<iframe src='javascript:...'>'s inherits policy.");
+
+  async_test(t => {
+    var i = document.createElement('iframe');
+    var b = new Blob(
+      [`
+        <img src='{{location[server]}}/images/red-16x16.png'
+          onload='window.top.postMessage("load", "*");'
+          onerror='window.top.postMessage("error", "*");'
+        >
+      `], {type:"text/html"});
+    i.src = URL.createObjectURL(b);
+    i.sandbox = 'allow-scripts';
+
+    wait_for_error_from_frame(i, t);
+
+    document.body.appendChild(i);
+  }, "<iframe sandbox src='blob:...'>'s inherits policy. (opaque origin sandbox)");
+
+</script>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/iframe.html b/tests/wpt/web-platform-tests/content-security-policy/inheritance/iframe-all-local-schemes.sub.html
similarity index 71%
rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/iframe.html
rename to tests/wpt/web-platform-tests/content-security-policy/inheritance/iframe-all-local-schemes.sub.html
index 6f5d0f75260..cd38c902f05 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/inheritance/iframe.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/inheritance/iframe-all-local-schemes.sub.html
@@ -25,13 +25,13 @@
     img.onerror = t.step_func_done(_ => i.remove());
     img.onload = t.unreached_func();
     i.contentDocument.body.appendChild(img);
-    img.src = "/images/red-16x16.png";
+    img.src = "{{location[server]}}/images/red-16x16.png";
   }, "<iframe>'s about:blank inherits policy.");
 
   async_test(t => {
     var i = document.createElement('iframe');
     i.srcdoc = `
-      <img src='/images/red-16x16.png'
+      <img src='{{location[server]}}/images/red-16x16.png'
         onload='window.top.postMessage("load", "*");'
         onerror='window.top.postMessage("error", "*");'
       >
@@ -46,7 +46,7 @@
     var i = document.createElement('iframe');
     var b = new Blob(
       [`
-        <img src='${window.origin}/images/red-16x16.png'
+        <img src='{{location[server]}}/images/red-16x16.png'
           onload='window.top.postMessage("load", "*");'
           onerror='window.top.postMessage("error", "*");'
         >
@@ -60,7 +60,7 @@
 
   async_test(t => {
     var i = document.createElement('iframe');
-    i.src = `data:text/html,<img src='${window.origin}/images/red-16x16.png'
+    i.src = `data:text/html,<img src='{{location[server]}}/images/red-16x16.png'
       onload='window.top.postMessage("load", "*");'
       onerror='window.top.postMessage("error", "*");'
     >`;
@@ -72,7 +72,7 @@
 
   async_test(t => {
     var i = document.createElement('iframe');
-    i.src = `javascript:"<img src='${window.origin}/images/red-16x16.png'
+    i.src = `javascript:"<img src='{{location[server]}}/images/red-16x16.png'
       onload='window.top.postMessage(\\"load\\", \\"*\\");'
       onerror='window.top.postMessage(\\"error\\", \\"*\\");'
     >"`;
@@ -81,4 +81,22 @@
 
     document.body.appendChild(i);
   }, "<iframe src='javascript:...'>'s inherits policy.");
+
+  async_test(t => {
+    var i = document.createElement('iframe');
+    var b = new Blob(
+      [`
+        <img src='{{location[server]}}/images/red-16x16.png'
+          onload='window.top.postMessage("load", "*");'
+          onerror='window.top.postMessage("error", "*");'
+        >
+      `], {type:"text/html"});
+    i.src = URL.createObjectURL(b);
+    i.sandbox = 'allow-scripts';
+
+    wait_for_error_from_frame(i, t);
+
+    document.body.appendChild(i);
+  }, "<iframe sandbox src='blob:...'>'s inherits policy. (opaque origin sandbox)");
+
 </script>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/sandboxed-blob-scheme.html b/tests/wpt/web-platform-tests/content-security-policy/inheritance/sandboxed-blob-scheme.html
new file mode 100644
index 00000000000..590fa7ec1a9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/inheritance/sandboxed-blob-scheme.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <script nonce="abc" src="/resources/testharness.js"></script>
+    <script nonce="abc" src="/resources/testharnessreport.js"></script>
+</head>
+
+<body>
+    <script nonce='abc'>
+      var blob_string = "<script>alert(document.domain)<\/scr"+"ipt>";
+      var blob = new Blob([blob_string], {type : 'text/html'});
+      var url = URL.createObjectURL(blob);
+
+      var i = document.createElement('iframe');
+      i.src = url;
+      i.sandbox = "allow-scripts";
+      document.body.appendChild(i);
+    </script>
+    <script nonce='abc' async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=script-src%20%27nonce-abc%27'></script>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/sandboxed-blob-scheme.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/inheritance/sandboxed-blob-scheme.html.sub.headers
new file mode 100644
index 00000000000..cd80b326ff7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/inheritance/sandboxed-blob-scheme.html.sub.headers
@@ -0,0 +1,5 @@
+Expires: Mon, 26 Jul 1997 05:00:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate
+Pragma: no-cache
+Set-Cookie: sandboxed-blob-scheme={{$id:uuid()}}; Path=/content-security-policy/inheritance/
+Content-Security-Policy: script-src 'nonce-abc'; report-uri http://{{host}}:{{ports[http][0]}}/content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/sandboxed-data-scheme.html b/tests/wpt/web-platform-tests/content-security-policy/inheritance/sandboxed-data-scheme.html
new file mode 100644
index 00000000000..b97bfb0c05a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/inheritance/sandboxed-data-scheme.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <script nonce="abc" src="/resources/testharness.js"></script>
+    <script nonce="abc" src="/resources/testharnessreport.js"></script>
+</head>
+
+<body>
+    <script nonce='abc'>
+      var url = "data:text/html,<script>alert(document.domain)<\/scr"+"ipt>";
+
+      var i = document.createElement('iframe');
+      i.src = url;
+      i.sandbox = "allow-scripts";
+      document.body.appendChild(i);
+    </script>
+    <script nonce='abc' async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=script-src%20%27nonce-abc%27'></script>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/sandboxed-data-scheme.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/inheritance/sandboxed-data-scheme.html.sub.headers
new file mode 100644
index 00000000000..766d3e0e050
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/inheritance/sandboxed-data-scheme.html.sub.headers
@@ -0,0 +1,5 @@
+Expires: Mon, 26 Jul 1997 05:00:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate
+Pragma: no-cache
+Set-Cookie: sandboxed-data-scheme={{$id:uuid()}}; Path=/content-security-policy/inheritance/
+Content-Security-Policy: script-src 'nonce-abc'; report-uri http://{{host}}:{{ports[http][0]}}/content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/unsandboxed-blob-scheme.html b/tests/wpt/web-platform-tests/content-security-policy/inheritance/unsandboxed-blob-scheme.html
new file mode 100644
index 00000000000..cab192f8368
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/inheritance/unsandboxed-blob-scheme.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <script nonce="abc" src="/resources/testharness.js"></script>
+    <script nonce="abc" src="/resources/testharnessreport.js"></script>
+</head>
+
+<body>
+    <script nonce='abc'>
+      var blob_string = "<script>alert(document.domain)<\/scr"+"ipt>";
+      var blob = new Blob([blob_string], {type : 'text/html'});
+      var url = URL.createObjectURL(blob);
+
+      var i = document.createElement('iframe');
+      i.src = url;
+      document.body.appendChild(i);
+    </script>
+    <script nonce='abc' async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=script-src%20%27nonce-abc%27'></script>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/unsandboxed-blob-scheme.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/inheritance/unsandboxed-blob-scheme.html.sub.headers
new file mode 100644
index 00000000000..4cf3e34ce97
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/inheritance/unsandboxed-blob-scheme.html.sub.headers
@@ -0,0 +1,5 @@
+Expires: Mon, 26 Jul 1997 05:00:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate
+Pragma: no-cache
+Set-Cookie: unsandboxed-blob-scheme={{$id:uuid()}}; Path=/content-security-policy/inheritance/
+Content-Security-Policy: script-src 'nonce-abc'; report-uri http://{{host}}:{{ports[http][0]}}/content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/unsandboxed-data-scheme.html b/tests/wpt/web-platform-tests/content-security-policy/inheritance/unsandboxed-data-scheme.html
new file mode 100644
index 00000000000..a9d8e207dce
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/inheritance/unsandboxed-data-scheme.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <script nonce="abc" src="/resources/testharness.js"></script>
+    <script nonce="abc" src="/resources/testharnessreport.js"></script>
+</head>
+
+<body>
+    <script nonce='abc'>
+      var url = "data:text/html,<script>alert(document.domain)<\/scri"+"pt>";
+
+      var i = document.createElement('iframe');
+      i.src = url;
+      document.body.appendChild(i);
+    </script>
+    <script nonce='abc' async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=script-src%20%27nonce-abc%27'></script>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/unsandboxed-data-scheme.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/inheritance/unsandboxed-data-scheme.html.sub.headers
new file mode 100644
index 00000000000..9cfb8aaa819
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/inheritance/unsandboxed-data-scheme.html.sub.headers
@@ -0,0 +1,5 @@
+Expires: Mon, 26 Jul 1997 05:00:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate
+Pragma: no-cache
+Set-Cookie: unsandboxed-data-scheme={{$id:uuid()}}; Path=/content-security-policy/inheritance/
+Content-Security-Policy: script-src 'nonce-abc'; report-uri http://{{host}}:{{ports[http][0]}}/content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-empty.sub.html b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-empty.sub.html
new file mode 100644
index 00000000000..0cd1a70a1dd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-empty.sub.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta http-equiv="Content-Security-Policy" content="plugin-types ;">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+
+<body>
+  <script>
+    var t = async_test('Should not load the object because plugin-types allows no plugins');
+    window.addEventListener('securitypolicyviolation', t.step_func_done(function(e) {
+      assert_equals(e.violatedDirective, "plugin-types");
+      assert_equals(e.blockedURI, "");
+    }));
+  </script>
+
+  <object type="application/x-shockwave-flash" data="/content-security-policy/support/media/flash.swf"></object>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-mismatched-data.html b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-mismatched-data.html
new file mode 100644
index 00000000000..430a3a1eb9f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-mismatched-data.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta http-equiv="Content-Security-Policy" content="plugin-types application/pdf;">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+
+<body>
+  <script>
+    var t = async_test('Should not load the object because its declared type does not match its actual type');
+    window.addEventListener('securitypolicyviolation', t.step_func_done(function(e) {
+      assert_equals(e.violatedDirective, "plugin-types");
+      assert_equals(e.blockedURI, "");
+    }));
+  </script>
+
+  <object type="application/pdf" data="data:application/x-shockwave-flash,asdf"></object>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-mismatched-data.sub.html b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-mismatched-data.sub.html
deleted file mode 100644
index 947a9174d88..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-mismatched-data.sub.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <meta http-equiv="Content-Security-Policy" content="plugin-types application/x-invalid-type; script-src 'self' 'unsafe-inline'; connect-src 'self';">
-    <title>plugintypes-mismatched-data</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["After object"]'></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-</head>
-
-<body>
-    <script>
-        window.addEventListener('securitypolicyviolation', function(e) {
-            log("Fail");
-        });
-    </script>    
-
-    This tests that plugin content that doesn&apos;t match the declared type doesn&apos;t load, even if the document&apos;s CSP would allow it. This test passes if &quot;FAIL!&quot; isn&apos;t logged.
-    <object type="application/x-invalid-type" data="data:application/x-webkit-test-netscape,logifloaded" log="FAIL!"></object>
-    <script>
-        log("After object");
-    </script>
-    <div id="log"></div>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-mismatched-url.html b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-mismatched-url.html
new file mode 100644
index 00000000000..306d08f79e1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-mismatched-url.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta http-equiv="Content-Security-Policy" content="plugin-types application/pdf;">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+
+<body>
+  <script>
+    var t = async_test('Should not load the object because its declared type does not match its actual type');
+    window.addEventListener('securitypolicyviolation', t.step_func_done(function(e) {
+      assert_equals(e.violatedDirective, "plugin-types");
+      assert_equals(e.blockedURI, "");
+    }));
+  </script>
+
+  <object type="application/pdf" data="/content-security-policy/support/media/flash.swf"></object>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-mismatched-url.sub.html b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-mismatched-url.sub.html
deleted file mode 100644
index 08e09b95063..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-mismatched-url.sub.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <meta http-equiv="Content-Security-Policy" content="plugin-types application/x-invalid-type; script-src 'self' 'unsafe-inline'; connect-src 'self';">
-    <title>plugintypes-mismatched-url</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["After object"]'></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-</head>
-
-<body>
-    <script>
-        window.addEventListener('securitypolicyviolation', function(e) {
-            log("Fail");
-        });
-    </script>    
-
-    This tests that plugin content that doesn&apos;t match the declared type doesn&apos;t load, even if the document&apos;s CSP would allow it. This test passes if no iframe is dumped (meaning that no PluginDocument was created).
-    <object type="application/x-invalid-type" data="/plugins/resources/mock-plugin.pl" log="FAIL!"></object>
-    <script>
-        log("After object");
-    </script>
-    <div id="log"></div>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-notype-data.html b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-notype-data.html
new file mode 100644
index 00000000000..e10d5335772
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-notype-data.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta http-equiv="Content-Security-Policy" content="plugin-types application/pdf;">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+
+<body>
+  <script>
+    var t = async_test('Should not load the object because it does not have a declared type');
+    window.addEventListener('securitypolicyviolation', t.step_func_done(function(e) {
+      assert_equals(e.violatedDirective, "plugin-types");
+      assert_equals(e.blockedURI, "");
+    }));
+  </script>
+
+  <!-- Objects need to declare an explicit type -->
+  <object data="data:application/x-shockwave-flash,asdf"></object>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-notype-data.sub.html b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-notype-data.sub.html
deleted file mode 100644
index 46b1816b792..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-notype-data.sub.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <meta http-equiv="Content-Security-Policy" content="plugin-types application/x-invalid-type; script-src 'self' 'unsafe-inline'; connect-src 'self';">
-    <title>plugintypes-notype-data</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["PASS: object tag onerror handler fired","violated-directive=plugin-types"]'></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-</head>
-
-<body>
-    <script>
-        window.addEventListener('securitypolicyviolation', function(e) {
-            log("violated-directive=" + e.violatedDirective);
-        });
-    </script>    
-
-    Given a `plugin-types` directive, plugins have to declare a type explicitly. No declared type, no load. This test passes if there&apos;s a CSP report and &quot;FAIL!&quot; isn&apos;t logged.
-    <object data="data:application/x-webkit-test-netscape" onload="log('FAIL');" onerror="log('PASS: object tag onerror handler fired');"></object>
-    <div id="log"></div>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-notype-url.html b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-notype-url.html
new file mode 100644
index 00000000000..73ff7366e01
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-notype-url.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta http-equiv="Content-Security-Policy" content="plugin-types application/pdf;">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+
+<body>
+  <script>
+    var t = async_test('Should not load the object because it does not have a declared type');
+    window.addEventListener('securitypolicyviolation', t.step_func_done(function(e) {
+      assert_equals(e.violatedDirective, "plugin-types");
+      assert_equals(e.blockedURI, "");
+    }));
+  </script>
+
+  <!-- Objects need to declare an explicit type -->
+  <object data="/content-security-policy/support/media/flash.swf"></object>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-notype-url.sub.html b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-notype-url.sub.html
deleted file mode 100644
index 3191f9c93b8..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-notype-url.sub.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <meta http-equiv="Content-Security-Policy" content="plugin-types application/x-invalid-type; script-src 'self' 'unsafe-inline'; connect-src 'self';">
-    <title>plugintypes-notype-url</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["violated-directive=plugin-types"]'></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-</head>
-
-<body>
-    <script>
-        window.addEventListener('securitypolicyviolation', function(e) {
-            log("violated-directive=" + e.violatedDirective);
-        });
-    </script>    
-
-    Given a `plugin-types` directive, plugins have to declare a type explicitly. No declared type, no load. This test passes if there&apos;s an error report is sent.
-    <object data="/plugins/resources/mock-plugin.pl" log="FAIL!"></object>
-    <div id="log"></div>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-nourl-allowed.html b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-nourl-allowed.html
new file mode 100644
index 00000000000..cd50086761f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-nourl-allowed.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+
+<body>
+  <object type="application/x-shockwave-flash"></object>
+  <!-- we rely on the report because we can't rely on the onload event for
+         "allowed" tests as it is not fired for object and embed -->
+   <script async defer src='../support/checkReport.sub.js?reportExists=false'></script>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-nourl-allowed.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-nourl-allowed.html.sub.headers
new file mode 100644
index 00000000000..95cc52be322
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-nourl-allowed.html.sub.headers
@@ -0,0 +1,2 @@
+Set-Cookie: plugintypes-nourl-allowed={{$id:uuid()}}; Path=/content-security-policy/plugin-types/
+Content-Security-Policy: plugin-types application/x-shockwave-flash;  report-uri ../support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-nourl-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-nourl-allowed.sub.html
deleted file mode 100644
index cc30b0d9c80..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-nourl-allowed.sub.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <meta http-equiv="Content-Security-Policy" content="plugin-types application/x-webkit-test-netscape; script-src 'self' 'unsafe-inline'; connect-src 'self';">
-    <title>plugintypes-nourl-allowed</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["After object"]'></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-</head>
-
-<body>
-    <script>
-        window.addEventListener('securitypolicyviolation', function(e) {
-            log("Fail");
-        });
-    </script>    
-
-    This test passes if there isn&apos;t a CSP violation sayingthe plugin was blocked.
-    <object type="application/x-webkit-test-netscape"></object>
-    <script>
-        log("After object");
-    </script>
-    <div id="log"></div>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-nourl-blocked.html b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-nourl-blocked.html
new file mode 100644
index 00000000000..02da1e0d1e6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-nourl-blocked.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta http-equiv="Content-Security-Policy" content="plugin-types application/pdf;">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+
+<body>
+  <script>
+    var t = async_test('Should not load the object because it does not match plugin-types');
+    window.addEventListener('securitypolicyviolation', t.step_func_done(function(e) {
+      assert_equals(e.violatedDirective, "plugin-types");
+      assert_equals(e.blockedURI, "");
+    }));
+  </script>
+
+  <object type="application/x-shockwave-flash"></object>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-nourl-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-nourl-blocked.sub.html
deleted file mode 100644
index 40054d53336..00000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugintypes-nourl-blocked.sub.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
-    <meta http-equiv="Content-Security-Policy" content="plugin-types text/plain; script-src 'self' 'unsafe-inline'; connect-src 'self';">
-    <title>plugintypes-nourl-blocked</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["violated-directive=plugin-types"]'></script>
-    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
-</head>
-
-<body>
-    <script>
-        window.addEventListener('securitypolicyviolation', function(e) {
-            log("violated-directive=" + e.violatedDirective);
-        });
-    </script>    
-
-    This test passes if there is a CSP violation saying the plugin was blocked.
-    <object type="application/x-webkit-test-netscape"></object>
-    <div id="log"></div>
-</body>
-
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-011.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-011.xht
new file mode 100644
index 00000000000..604466a1f47
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-011.xht
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Text Test: line-break - loose and Japanese small kana</title>
+		<!-- Japanese small kana -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
+		<link rel="match" href="reference/line-break-loose-011-ref.xht" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<meta name="assert" content="This test verifies that 'line-break: loose' allows line breaking before Japanese small kana such as 'Japanese small kana a (U+3041)' and  'Japanese small kana i (U+3043)'." />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			.test span {
+				line-break: loose;						/* The property to be tested */
+			}
+			p.test, p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 10px;
+				padding: 10px;
+			}
+		</style>
+	</head>
+	<body lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<div class="wrapper">
+			<!-- Japanese small kana: HIRAGANA LETTER SMALL A -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x3041;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3041;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- Japanese small kana: HIRAGANA LETTER SMALL I -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x3043;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3043;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- Japanese small kana: HIRAGANA LETTER SMALL U -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x3045;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3045;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- Japanese small kana: HIRAGANA LETTER SMALL E -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x3047;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3047;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- Japanese small kana: HIRAGANA LETTER SMALL O -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x3049;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3049;</span>サンプル文</span>
+			</p>
+		</div>
+	</body>
+</html>
+
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-012.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-012.xht
new file mode 100644
index 00000000000..0deab610cf8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-012.xht
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Text Test: line-break - loose and  Katakana-Hiragana prolonged sound marks</title>
+		<!-- Katakana-Hiragana prolonged sound marks -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
+		<link rel="match" href="reference/line-break-loose-012-ref.xht" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<meta name="assert" content="This test verifies that 'line-break: loose' allows line breaking before Katakana-Hiragana prolonged sound marks such as (U+30FC) and (U+FF70)." />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			.test span {
+				line-break: loose;						/* The property to be tested */
+			}
+			p.test, p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 10px;
+				padding: 10px;
+			}
+		</style>
+	</head>
+	<body lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<div class="wrapper">
+			<!-- Katakana-Hiragana prolonged sound mark - fullwidth -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x30FC;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x30FC;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- Katakana-Hiragana prolonged sound mark - halfwidth -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#xff70;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#xff70;</span>サンプル文</span>
+			</p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-013.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-013.xht
new file mode 100644
index 00000000000..586732aeb66
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-013.xht
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Text Test: line-break - loose and hyphens</title>
+		<!-- hyphens -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
+		<link rel="match" href="reference/line-break-loose-013-ref.xht" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<meta name="assert" content="This test verifies that 'line-break: loose' allows line breaking before hyphens such as HYPHEN (U+2010) and ENDASH (U+2013)." />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			.test span {
+				line-break: loose;						/* The property to be tested */
+			}
+			p.test, p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 10px;
+				padding: 10px;
+			}
+		</style>
+	</head>
+	<body lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<!-- hyphens -->
+		<div class="wrapper">
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x2010;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2010;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x2013;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2013;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x301c;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x301c;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x30a0;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x30a0;</span>サンプル文</span>
+			</p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-014.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-014.xht
new file mode 100644
index 00000000000..90cf3c769c0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-014.xht
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Text Test: line-break - loose and iteration marks</title>
+		<!-- iteration marks -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
+		<link rel="match" href="reference/line-break-loose-014-ref.xht" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<meta name="assert" content="This test verifies that 'line-break: loose' allows line breaking before iteration marks such as IDEOGRAPHIC ITERATION MARK (U+3005) and VERTICAL IDEOGRAPHIC ITERATION MARK (U+303B)." />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			.test span {
+				line-break: loose;						/* The property to be tested */
+			}
+			p.test, p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 10px;
+				padding: 10px;
+			}
+		</style>
+	</head>
+	<body lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<!-- iteration marks -->
+		<div class="wrapper">
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x3005;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3005;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x303b;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x303b;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x309d;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x309d;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x309e;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x309e;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x30fd;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x30fd;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x30fe;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x30fe;</span>サンプル文</span>
+			</p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-015.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-015.xht
new file mode 100644
index 00000000000..6384d8c14ee
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-015.xht
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Text Test: line-break - loose and  inseparable characters</title>
+		<!-- inseparable characters -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
+		<link rel="match" href="reference/line-break-loose-015-ref.xht" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<meta name="assert" content="This test verifies that 'line-break: loose' allows line breaking between inseparable characters such as TWO DOT LEADER (U+2025) and HORIZONTAL ELLIPSIS (U+2026)." />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			.test span {
+				line-break: loose;						/* The property to be tested */
+			}
+			p.test, p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 10px;
+				padding: 10px;
+			}
+		</style>
+	</head>
+	<body lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<div class="wrapper">
+			<!-- inseparable characters TWO DOT LEADER -->
+			<p class="test" lang="ja">
+				<span>サンプルサンプル。<span class="target">&#x2025;&#x2025;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプルサンプル。<span class="target">&#x2025;<br />&#x2025;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- inseparable characters HORIZONTAL ELLIPSIS -->
+			<p class="test" lang="ja">
+				<span>サンプルサンプル。<span class="target">&#x2026;&#x2026;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプルサンプル。<span class="target">&#x2026;<br />&#x2026;</span>サンプル文</span>
+			</p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-016a.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-016a.xht
new file mode 100644
index 00000000000..6397c031822
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-016a.xht
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Text Test: line-break - loose and centered punctuation marks</title>
+		<!-- centered punctuation marks -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
+		<link rel="match" href="reference/line-break-loose-016a-ref.xht" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<meta name="assert" content="This test verifies that 'line-break: loose' allows line breaking before centered punctuation marks." />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			.test span {
+				line-break: loose;						/* The property to be tested */
+			}
+			p.test, p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 5px;
+				padding: 5px;
+			}
+		</style>
+	</head>
+	<body lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<div class="wrapper">
+			<!-- centered punctuation marks KATAKANA MIDDLE DOT -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x30fb;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x30fb;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- centered punctuation marks FULLWIDTH COLON -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#xff1a;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#xff1a;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- centered punctuation marks FULLWIDTH SEMICOLON -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#xff1b;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#xff1b;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- centered punctuation marks HALFWIDTH KATAKANA MIDDLE DOT -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#xff65;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#xff65;</span>サンプル文</span>
+			</p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-016b.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-016b.xht
new file mode 100644
index 00000000000..261cce5f67b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-016b.xht
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Text Test: line-break - loose and centered punctuation marks</title>
+		<!-- centered punctuation marks -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
+		<link rel="match" href="reference/line-break-loose-016b-ref.xht" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<meta name="assert" content="This test verifies that 'line-break: loose' allows line breaking before centered punctuation marks." />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			.test span {
+				line-break: loose;						/* The property to be tested */
+			}
+			p.test, p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 5px;
+				padding: 5px;
+			}
+		</style>
+	</head>
+	<body lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<div class="wrapper">
+			<!-- centered punctuation marks DOUBLE EXCLAMATION MARK -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x203c;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x203c;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- centered punctuation marks DOUBLE QUESTION MARK -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x2047;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2047;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- centered punctuation marks QUESTION EXCLAMATION MARK -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x2048;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2048;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- centered punctuation marks EXCLAMATION QUESTION MARK -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x2049;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2049;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- centered punctuation marks FULLWIDTH EXCLAMATION MARK -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#xff01;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#xff01;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- centered punctuation marks FULLWIDTH QUESTION MARK -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#xff1f;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#xff1f;</span>サンプル文</span>
+			</p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-017a.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-017a.xht
new file mode 100644
index 00000000000..59b0af7b3fd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-017a.xht
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Text Test: line-break - loose and postfixes</title>
+		<!-- postfixes -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
+		<link rel="match" href="reference/line-break-loose-017a-ref.xht" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<meta name="assert" content="This test verifies that 'line-break: loose' allows line breaking before postfixes." />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			.test span {
+				line-break: loose;						/* The property to be tested */
+			}
+			p.test, p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 10px;
+				padding: 10px;
+			}
+		</style>
+	</head>
+	<body lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<div class="wrapper">
+			<!-- postfixes DEGREE SIGN -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x00b0;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x00b0;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- postfixes PER MILLE SIGN -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x2030;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2030;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- postfixes PRIME -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x2032;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2032;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- postfixes DOUBLE PRIME -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x2033;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2033;</span>サンプル文</span>
+			</p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-017b.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-017b.xht
new file mode 100644
index 00000000000..6b89d125f54
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-017b.xht
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Text Test: line-break - loose and postfixes</title>
+		<!-- postfixes -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
+		<link rel="match" href="reference/line-break-loose-017b-ref.xht" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<meta name="assert" content="This test verifies that 'line-break: loose' allows line breaking before postfixes." />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			.test span {
+				line-break: loose;						/* The property to be tested */
+			}
+			p.test, p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 10px;
+				padding: 10px;
+			}
+		</style>
+	</head>
+	<body lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<div class="wrapper">
+			<!-- postfixes DEGREE CELSIUS -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x2103;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2103;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- postfixes FULLWIDTH PERCENT SIGN -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#xff05;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#xff05;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- postfixes FULLWIDTH CENT SIGN -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#xffe0;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#xffe0;</span>サンプル文</span>
+			</p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-018.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-018.xht
new file mode 100644
index 00000000000..d5df229cf77
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-018.xht
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Text Test: line-break - loose and prefixes</title>
+		<!-- prefixes -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
+		<link rel="match" href="reference/line-break-loose-018-ref.xht" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<meta name="assert" content="This test verifies that 'line-break: loose' allows line breaking after prefixes." />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			.test span {
+				line-break: loose;						/* The property to be tested */
+			}
+			p.test, p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 10px;
+				padding: 10px;
+			}
+		</style>
+	</head>
+	<body lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<div class="wrapper">
+            <!-- prefixes EURO SIGN -->
+            <p class="test" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#x20ac;</span>サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#x20ac;</span><br />サンプル文</span>
+            </p>
+		</div>
+		<div class="wrapper">
+            <!-- prefixes NUMERO SIGN -->
+            <p class="test" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#x2116;</span>サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#x2116;</span><br />サンプル文</span>
+            </p>
+		</div>
+		<div class="wrapper">
+            <!-- prefixes FULLWIDTH DOLLAR SIGN -->
+            <p class="test" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#xff04;</span>サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#xff04;</span><br />サンプル文</span>
+            </p>
+		</div>
+		<div class="wrapper">
+            <!-- prefixes FULLWIDTH POUND SIGN -->
+            <p class="test" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#xffe1;</span>サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#xffe1;</span><br />サンプル文</span>
+            </p>
+		</div>
+		<div class="wrapper">
+            <!-- prefixes FULLWIDTH YEN SIGN -->
+            <p class="test" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#xffe5;</span>サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#xffe5;</span><br />サンプル文</span>
+            </p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-011.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-011.xht
new file mode 100644
index 00000000000..692468c527a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-011.xht
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Text Test: line-break - normal and Japanese small kana</title>
+		<!-- Japanese small kana -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
+		<link rel="match" href="reference/line-break-normal-011-ref.xht" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<meta name="assert" content="This test verifies that 'line-break: normal' allows line breaking before Japanese small kana such as 'Japanese small kana a (U+3041)' and  'Japanese small kana i (U+3043)'." />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			.test span {
+				line-break: normal;						/* The property to be tested */
+			}
+			p.test, p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 10px;
+				padding: 10px;
+			}
+		</style>
+	</head>
+	<body lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<div class="wrapper">
+			<!-- Japanese small kana: HIRAGANA LETTER SMALL A -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x3041;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3041;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- Japanese small kana: HIRAGANA LETTER SMALL I -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x3043;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3043;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- Japanese small kana: HIRAGANA LETTER SMALL U -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x3045;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3045;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- Japanese small kana: HIRAGANA LETTER SMALL E -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x3047;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3047;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- Japanese small kana: HIRAGANA LETTER SMALL O -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x3049;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3049;</span>サンプル文</span>
+			</p>
+		</div>
+	</body>
+</html>
+
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-012.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-012.xht
new file mode 100644
index 00000000000..a4b794f0f80
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-012.xht
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Text Test: line-break - normal and  Katakana-Hiragana prolonged sound marks</title>
+		<!-- Katakana-Hiragana prolonged sound marks -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
+		<link rel="match" href="reference/line-break-normal-012-ref.xht" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<meta name="assert" content="This test verifies that 'line-break: normal' allows line breaking before Katakana-Hiragana prolonged sound marks such as (U+30FC) and (U+FF70)." />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			.test span {
+				line-break: normal;						/* The property to be tested */
+			}
+			p.test, p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 10px;
+				padding: 10px;
+			}
+		</style>
+	</head>
+	<body lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<div class="wrapper">
+			<!-- Katakana-Hiragana prolonged sound mark - fullwidth -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x30FC;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x30FC;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- Katakana-Hiragana prolonged sound mark - halfwidth -->
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#xff70;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#xff70;</span>サンプル文</span>
+			</p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-013.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-013.xht
new file mode 100644
index 00000000000..80dae58932a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-013.xht
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Text Test: line-break - normal and hyphens</title>
+		<!-- hyphens -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
+		<link rel="match" href="reference/line-break-normal-013-ref.xht" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<meta name="assert" content="This test verifies that 'line-break: normal' allows line breaking before hyphens such as HYPHEN (U+2010) and ENDASH (U+2013)." />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			.test span {
+				line-break: normal;						/* The property to be tested */
+			}
+			p.test, p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 10px;
+				padding: 10px;
+			}
+		</style>
+	</head>
+	<body lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<!-- hyphens -->
+		<div class="wrapper">
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x2010;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2010;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x2013;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2013;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x301c;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x301c;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<p class="test" lang="ja">
+				<span>サンプル文サンプル文<span class="target">&#x30a0;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x30a0;</span>サンプル文</span>
+			</p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-021.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-014.xht
similarity index 87%
rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-021.xht
rename to tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-014.xht
index a956d3009ce..86a35bfb6b3 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-021.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-014.xht
@@ -5,10 +5,11 @@
 		<title>CSS Text Test: line-break - normal and iteration marks</title>
 		<!-- iteration marks -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
-		<link rel="help" title="5.2. Breaking Rules for Punctuation: the 'line-break' property" href="http://www.w3.org/TR/css-text-3/#line-break" />
-		<link rel="match" href="reference/line-break-normal-021-ref.xht" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
+		<link rel="match" href="reference/line-break-normal-014-ref.xht" />
 		<meta http-equiv="content-language" content="en, ja" />
-		<meta name="assert" content="This test verifies that 'line-break: normal' does not allow line breaking before iteration marks such as IDEOGRAPHIC ITERATION MARK (U+3005) and VERTICAL IDEOGRAPHIC ITERATION MARK (U+3B)." />
+		<meta name="assert" content="This test verifies that 'line-break: normal' does not allow line breaking before iteration marks such as IDEOGRAPHIC ITERATION MARK (U+3005) and VERTICAL IDEOGRAPHIC ITERATION MARK (U+303B)." />
 		<style type="text/css">
 			@font-face
 			{
@@ -20,13 +21,13 @@
 				*/
 			}
 			.test span {
-				line-break: normal;						// The property to be tested
+				line-break: normal;						/* The property to be tested */
 			}
 			p.test, p.control {
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-022.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-015.xht
similarity index 61%
rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-022.xht
rename to tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-015.xht
index 22a2a8a2646..6debeedc35a 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-022.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-015.xht
@@ -5,10 +5,11 @@
 		<title>CSS Text Test: line-break - normal and  inseparable characters</title>
 		<!-- inseparable characters -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
-		<link rel="help" title="5.2. Breaking Rules for Punctuation: the 'line-break' property" href="http://www.w3.org/TR/css-text-3/#line-break" />
-		<link rel="match" href="reference/line-break-normal-022-ref.xht" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
+		<link rel="match" href="reference/line-break-normal-015-ref.xht" />
 		<meta http-equiv="content-language" content="en, ja" />
-		<meta name="assert" content="This test verifies that 'line-break: normal' does not allow line breaking before inseparable characters such as TWO DOT LEADER (U+2025) and HORIZONTAL ELLIPSIS (U+2026)." />
+		<meta name="assert" content="This test verifies that 'line-break: normal' does not allow line breaking between inseparable characters such as TWO DOT LEADER (U+2025) and HORIZONTAL ELLIPSIS (U+2026)." />
 		<style type="text/css">
 			@font-face
 			{
@@ -20,13 +21,13 @@
 				*/
 			}
 			.test span {
-				line-break: normal;						// The property to be tested
+				line-break: normal;						/* The property to be tested */
 			}
 			p.test, p.control {
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
@@ -46,19 +47,19 @@
 		<div class="wrapper">
 			<!-- inseparable characters TWO DOT LEADER -->
 			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#x2025;</span>サンプル文</span>
+				<span>サンプルサンプル。<span class="target">&#x2025;&#x2025;</span>サンプル文</span>
 			</p>
 			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x2025;</span>サンプル文</span>
+				<span>サンプルサンプル。<br /><span class="target">&#x2025;&#x2025;</span>サンプル文</span>
 			</p>
 		</div>
 		<div class="wrapper">
 			<!-- inseparable characters HORIZONTAL ELLIPSIS -->
 			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#x2026;</span>サンプル文</span>
+				<span>サンプルサンプル。<span class="target">&#x2026;&#x2026;</span>サンプル文</span>
 			</p>
 			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x2026;</span>サンプル文</span>
+				<span>サンプルサンプル。<br /><span class="target">&#x2026;&#x2026;</span>サンプル文</span>
 			</p>
 		</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-023a.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-016a.xht
similarity index 62%
rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-023a.xht
rename to tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-016a.xht
index 7723250e947..c3b103ab7aa 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-023a.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-016a.xht
@@ -5,8 +5,9 @@
 		<title>CSS Text Test: line-break - normal and centered punctuation marks</title>
 		<!-- centered punctuation marks -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
-		<link rel="help" title="5.2. Breaking Rules for Punctuation: the 'line-break' property" href="http://www.w3.org/TR/css-text-3/#line-break" />
-		<link rel="match" href="reference/line-break-normal-023a-ref.xht" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
+		<link rel="match" href="reference/line-break-normal-016a-ref.xht" />
 		<meta http-equiv="content-language" content="en, ja" />
 		<meta name="assert" content="This test verifies that 'line-break: normal' does not allow line breaking before centered punctuation marks such as COLON (U+003A) and SEMICOLON (U+003B)." />
 		<style type="text/css">
@@ -20,13 +21,13 @@
 				*/
 			}
 			.test span {
-				line-break: normal;						// The property to be tested
+				line-break: normal;						/* The property to be tested */
 			}
 			p.test, p.control {
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
@@ -43,24 +44,6 @@
 		<p>
 			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
 		</p>
-		<div class="wrapper">
-			<!-- centered punctuation marks COLON -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#x003a;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x003a;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- centered punctuation marks SEMICOLON -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#x003b;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x003b;</span>サンプル文</span>
-			</p>
-		</div>
 		<div class="wrapper">
 			<!-- centered punctuation marks KATAKANA MIDDLE DOT -->
 			<p class="test" lang="ja">
@@ -97,23 +80,5 @@
 				<span>サンプル文サンプル<br />文<span class="target">&#xff65;</span>サンプル文</span>
 			</p>
 		</div>
-		<div class="wrapper">
-			<!-- centered punctuation marks EXCLAMATION MARK -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#x0021;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x0021;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- centered punctuation marks QUESTION MARK -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#x003f;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x003f;</span>サンプル文</span>
-			</p>
-		</div>
 	</body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-023b.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-016b.xht
similarity index 89%
rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-023b.xht
rename to tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-016b.xht
index 6f867c87ec3..c73bb159d08 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-023b.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-016b.xht
@@ -5,8 +5,9 @@
 		<title>CSS Text Test: line-break - normal and centered punctuation marks</title>
 		<!-- centered punctuation marks -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
-		<link rel="help" title="5.2. Breaking Rules for Punctuation: the 'line-break' property" href="http://www.w3.org/TR/css-text-3/#line-break" />
-		<link rel="match" href="reference/line-break-normal-023b-ref.xht" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
+		<link rel="match" href="reference/line-break-normal-016b-ref.xht" />
 		<meta http-equiv="content-language" content="en, ja" />
 		<meta name="assert" content="This test verifies that 'line-break: normal' does not allow line breaking before centered punctuation marks such as COLON (U+003A) and SEMICOLON (U+003B)." />
 		<style type="text/css">
@@ -20,13 +21,13 @@
 				*/
 			}
 			.test span {
-				line-break: normal;						// The property to be tested
+				line-break: normal;						/* The property to be tested */
 			}
 			p.test, p.control {
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-024a.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-017a.xht
similarity index 73%
rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-024a.xht
rename to tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-017a.xht
index cbbeff8d1f2..e9637b55827 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-024a.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-017a.xht
@@ -5,8 +5,9 @@
 		<title>CSS Text Test: line-break - normal and postfixes</title>
 		<!-- postfixes -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
-		<link rel="help" title="5.2. Breaking Rules for Punctuation: the 'line-break' property" href="http://www.w3.org/TR/css-text-3/#line-break" />
-		<link rel="match" href="reference/line-break-normal-024a-ref.xht" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
+		<link rel="match" href="reference/line-break-normal-017a-ref.xht" />
 		<meta http-equiv="content-language" content="en, ja" />
 		<meta name="assert" content="This test verifies that 'line-break: normal' does not allow line breaking before postfixes such as PERCENT SIGN (U+0025) and CENT SIGN (U+00A2)." />
 		<style type="text/css">
@@ -20,13 +21,13 @@
 				*/
 			}
 			.test span {
-				line-break: normal;						// The property to be tested
+				line-break: normal;						/* The property to be tested */
 			}
 			p.test, p.control {
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
@@ -43,24 +44,6 @@
 		<p>
 			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
 		</p>
-		<div class="wrapper">
-			<!-- postfixes PERCENT SIGN -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#x0025;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x0025;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- postfixes CENT SIGN -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#x00a2;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x00a2;</span>サンプル文</span>
-			</p>
-		</div>
 		<div class="wrapper">
 			<!-- postfixes DEGREE SIGN -->
 			<p class="test" lang="ja">
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-024b.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-017b.xht
similarity index 84%
rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-024b.xht
rename to tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-017b.xht
index e0da4088832..124ece3189f 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-024b.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-017b.xht
@@ -5,8 +5,9 @@
 		<title>CSS Text Test: line-break - normal and postfixes</title>
 		<!-- postfixes -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
-		<link rel="help" title="5.2. Breaking Rules for Punctuation: the 'line-break' property" href="http://www.w3.org/TR/css-text-3/#line-break" />
-		<link rel="match" href="reference/line-break-normal-024b-ref.xht" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
+		<link rel="match" href="reference/line-break-normal-017b-ref.xht" />
 		<meta http-equiv="content-language" content="en, ja" />
 		<meta name="assert" content="This test verifies that 'line-break: normal' does not allow line breaking before postfixes such as PERCENT SIGN (U+0025) and CENT SIGN (U+00A2)." />
 		<style type="text/css">
@@ -20,13 +21,13 @@
 				*/
 			}
 			.test span {
-				line-break: normal;						// The property to be tested
+				line-break: normal;						/* The property to be tested */
 			}
 			p.test, p.control {
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-018.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-018.xht
new file mode 100644
index 00000000000..a1042e858aa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-018.xht
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Text Test: line-break - normal and prefixes</title>
+		<!-- prefixes -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
+		<link rel="match" href="reference/line-break-normal-018-ref.xht" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<meta name="assert" content="This test verifies that 'line-break: normal' does not allow line breaking after prefixes." />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			.test span {
+				line-break: normal;						/* The property to be tested */
+			}
+			p.test, p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 10px;
+				padding: 10px;
+			}
+		</style>
+	</head>
+	<body lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<div class="wrapper">
+            <!-- prefixes EURO SIGN -->
+            <p class="test" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#x20ac;</span>サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#x20ac;</span>サンプル文</span>
+            </p>
+		</div>
+		<div class="wrapper">
+            <!-- prefixes NUMERO SIGN -->
+            <p class="test" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#x2116;</span>サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#x2116;</span>サンプル文</span>
+            </p>
+		</div>
+		<div class="wrapper">
+            <!-- prefixes FULLWIDTH DOLLAR SIGN -->
+            <p class="test" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#xff04;</span>サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#xff04;</span>サンプル文</span>
+            </p>
+		</div>
+		<div class="wrapper">
+            <!-- prefixes FULLWIDTH POUND SIGN -->
+            <p class="test" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#xffe1;</span>サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#xffe1;</span>サンプル文</span>
+            </p>
+		</div>
+		<div class="wrapper">
+            <!-- prefixes FULLWIDTH YEN SIGN -->
+            <p class="test" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#xffe5;</span>サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#xffe5;</span>サンプル文</span>
+            </p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-011.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-011.xht
index 3ba2e885bdf..d9cecc788ab 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-011.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-011.xht
@@ -5,7 +5,8 @@
 		<title>CSS Text Test: line-break - strict and Japanese small kana</title>
 		<!-- Japanese small kana -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
-		<link rel="help" title="5.2. Breaking Rules for Punctuation: the 'line-break' property" href="http://www.w3.org/TR/css-text-3/#line-break" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
 		<link rel="match" href="reference/line-break-strict-011-ref.xht" />
 		<meta http-equiv="content-language" content="en, ja" />
 		<meta name="assert" content="This test verifies that 'line-break: strict' does not allow line breaking before Japanese small kana such as 'Japanese small kana a (U+3041)' and  'Japanese small kana i (U+3043)'." />
@@ -20,13 +21,13 @@
 				*/
 			}
 			.test span {
-				line-break: strict;						// The property to be tested
+				line-break: strict;						/* The property to be tested */
 			}
 			p.test, p.control {
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-012.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-012.xht
index 28358b8ca79..d01b53f6224 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-012.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-012.xht
@@ -5,7 +5,8 @@
 		<title>CSS Text Test: line-break - strict and  Katakana-Hiragana prolonged sound marks</title>
 		<!-- Katakana-Hiragana prolonged sound marks -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
-		<link rel="help" title="5.2. Breaking Rules for Punctuation: the 'line-break' property" href="http://www.w3.org/TR/css-text-3/#line-break" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
 		<link rel="match" href="reference/line-break-strict-012-ref.xht" />
 		<meta http-equiv="content-language" content="en, ja" />
 		<meta name="assert" content="This test verifies that 'line-break: strict' does not allow line breaking before Katakana-Hiragana prolonged sound marks such as (U+30FC) and (U+FF70)." />
@@ -20,13 +21,13 @@
 				*/
 			}
 			.test span {
-				line-break: strict;						// The property to be tested
+				line-break: strict;						/* The property to be tested */
 			}
 			p.test, p.control {
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-013.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-013.xht
index b9468834483..0ae49fb5ac0 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-013.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-013.xht
@@ -5,7 +5,8 @@
 		<title>CSS Text Test: line-break - strict and hyphens</title>
 		<!-- hyphens -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
-		<link rel="help" title="5.2. Breaking Rules for Punctuation: the 'line-break' property" href="http://www.w3.org/TR/css-text-3/#line-break" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
 		<link rel="match" href="reference/line-break-strict-013-ref.xht" />
 		<meta http-equiv="content-language" content="en, ja" />
 		<meta name="assert" content="This test verifies that 'line-break: strict' does not allow line breaking before hyphens such as HYPHEN (U+2010) and ENDASH (U+2013)." />
@@ -20,13 +21,13 @@
 				*/
 			}
 			.test span {
-				line-break: strict;						// The property to be tested
+				line-break: strict;						/* The property to be tested */
 			}
 			p.test, p.control {
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-014.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-014.xht
index 8cb4660e770..90710cbdbe4 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-014.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-014.xht
@@ -5,10 +5,11 @@
 		<title>CSS Text Test: line-break - strict and iteration marks</title>
 		<!-- iteration marks -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
-		<link rel="help" title="5.2. Breaking Rules for Punctuation: the 'line-break' property" href="http://www.w3.org/TR/css-text-3/#line-break" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
 		<link rel="match" href="reference/line-break-strict-014-ref.xht" />
 		<meta http-equiv="content-language" content="en, ja" />
-		<meta name="assert" content="This test verifies that 'line-break: strict' does not allow line breaking before iteration marks such as IDEOGRAPHIC ITERATION MARK (U+3005) and VERTICAL IDEOGRAPHIC ITERATION MARK (U+3B)." />
+		<meta name="assert" content="This test verifies that 'line-break: strict' does not allow line breaking before iteration marks such as IDEOGRAPHIC ITERATION MARK (U+3005) and VERTICAL IDEOGRAPHIC ITERATION MARK (U+303B)." />
 		<style type="text/css">
 			@font-face
 			{
@@ -20,13 +21,13 @@
 				*/
 			}
 			.test span {
-				line-break: strict;						// The property to be tested
+				line-break: strict;						/* The property to be tested */
 			}
 			p.test, p.control {
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-015.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-015.xht
index 8549f73a4bc..ec3d6520f6b 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-015.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-015.xht
@@ -5,10 +5,11 @@
 		<title>CSS Text Test: line-break - strict and  inseparable characters</title>
 		<!-- inseparable characters -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
-		<link rel="help" title="5.2. Breaking Rules for Punctuation: the 'line-break' property" href="http://www.w3.org/TR/css-text-3/#line-break" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
 		<link rel="match" href="reference/line-break-strict-015-ref.xht" />
 		<meta http-equiv="content-language" content="en, ja" />
-		<meta name="assert" content="This test verifies that 'line-break: strict' does not allow line breaking before inseparable characters such as TWO DOT LEADER (U+2025) and HORIZONTAL ELLIPSIS (U+2026)." />
+		<meta name="assert" content="This test verifies that 'line-break: strict' does not allow line breaking between inseparable characters such as TWO DOT LEADER (U+2025) and HORIZONTAL ELLIPSIS (U+2026)." />
 		<style type="text/css">
 			@font-face
 			{
@@ -20,13 +21,13 @@
 				*/
 			}
 			.test span {
-				line-break: strict;						// The property to be tested
+				line-break: strict;						/* The property to be tested */
 			}
 			p.test, p.control {
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
@@ -46,19 +47,19 @@
 		<div class="wrapper">
 			<!-- inseparable characters TWO DOT LEADER -->
 			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#x2025;</span>サンプル文</span>
+				<span>サンプルサンプル。<span class="target">&#x2025;&#x2025;</span>サンプル文</span>
 			</p>
 			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x2025;</span>サンプル文</span>
+				<span>サンプルサンプル。<br /><span class="target">&#x2025;&#x2025;</span>サンプル文</span>
 			</p>
 		</div>
 		<div class="wrapper">
 			<!-- inseparable characters HORIZONTAL ELLIPSIS -->
 			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#x2026;</span>サンプル文</span>
+				<span>サンプルサンプル。<span class="target">&#x2026;&#x2026;</span>サンプル文</span>
 			</p>
 			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x2026;</span>サンプル文</span>
+				<span>サンプルサンプル。<br /><span class="target">&#x2026;&#x2026;</span>サンプル文</span>
 			</p>
 		</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-016a.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-016a.xht
index 55e5434079e..9e6e8b8690d 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-016a.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-016a.xht
@@ -5,10 +5,11 @@
 		<title>CSS Text Test: line-break - strict and centered punctuation marks</title>
 		<!-- centered punctuation marks -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
-		<link rel="help" title="5.2. Breaking Rules for Punctuation: the 'line-break' property" href="http://www.w3.org/TR/css-text-3/#line-break" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
 		<link rel="match" href="reference/line-break-strict-016a-ref.xht" />
 		<meta http-equiv="content-language" content="en, ja" />
-		<meta name="assert" content="This test verifies that 'line-break: strict' does not allow line breaking before centered punctuation marks such as COLON (U+003A) and SEMICOLON (U+003B)." />
+		<meta name="assert" content="This test verifies that 'line-break: strict' does not allow line breaking before centered punctuation marks." />
 		<style type="text/css">
 			@font-face
 			{
@@ -20,13 +21,13 @@
 				*/
 			}
 			.test span {
-				line-break: strict;						// The property to be tested
+				line-break: strict;						/* The property to be tested */
 			}
 			p.test, p.control {
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
@@ -43,24 +44,6 @@
 		<p>
 			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
 		</p>
-		<div class="wrapper">
-			<!-- centered punctuation marks COLON -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#x003a;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x003a;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- centered punctuation marks SEMICOLON -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#x003b;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x003b;</span>サンプル文</span>
-			</p>
-		</div>
 		<div class="wrapper">
 			<!-- centered punctuation marks KATAKANA MIDDLE DOT -->
 			<p class="test" lang="ja">
@@ -97,23 +80,5 @@
 				<span>サンプル文サンプル<br />文<span class="target">&#xff65;</span>サンプル文</span>
 			</p>
 		</div>
-		<div class="wrapper">
-			<!-- centered punctuation marks EXCLAMATION MARK -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#x0021;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x0021;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- centered punctuation marks QUESTION MARK -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#x003f;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x003f;</span>サンプル文</span>
-			</p>
-		</div>
 	</body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-016b.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-016b.xht
index 66ed3de155d..9a4a3c22ed7 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-016b.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-016b.xht
@@ -5,10 +5,11 @@
 		<title>CSS Text Test: line-break - strict and centered punctuation marks</title>
 		<!-- centered punctuation marks -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
-		<link rel="help" title="5.2. Breaking Rules for Punctuation: the 'line-break' property" href="http://www.w3.org/TR/css-text-3/#line-break" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
 		<link rel="match" href="reference/line-break-strict-016b-ref.xht" />
 		<meta http-equiv="content-language" content="en, ja" />
-		<meta name="assert" content="This test verifies that 'line-break: strict' does not allow line breaking before centered punctuation marks such as COLON (U+003A) and SEMICOLON (U+003B)." />
+		<meta name="assert" content="This test verifies that 'line-break: strict' does not allow line breaking before centered punctuation marks." />
 		<style type="text/css">
 			@font-face
 			{
@@ -20,13 +21,13 @@
 				*/
 			}
 			.test span {
-				line-break: strict;						// The property to be tested
+				line-break: strict;						/* The property to be tested */
 			}
 			p.test, p.control {
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-017a.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-017a.xht
index 4c8f9ce7b04..1c0e91fd63e 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-017a.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-017a.xht
@@ -5,10 +5,11 @@
 		<title>CSS Text Test: line-break - strict and postfixes</title>
 		<!-- postfixes -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
-		<link rel="help" title="5.2. Breaking Rules for Punctuation: the 'line-break' property" href="http://www.w3.org/TR/css-text-3/#line-break" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
 		<link rel="match" href="reference/line-break-strict-017a-ref.xht" />
 		<meta http-equiv="content-language" content="en, ja" />
-		<meta name="assert" content="This test verifies that 'line-break: strict' does not allow line breaking before postfixes such as PERCENT SIGN (U+0025) and CENT SIGN (U+00A2)." />
+		<meta name="assert" content="This test verifies that 'line-break: strict' does not allow line breaking before postfixes." />
 		<style type="text/css">
 			@font-face
 			{
@@ -20,13 +21,13 @@
 				*/
 			}
 			.test span {
-				line-break: strict;						// The property to be tested
+				line-break: strict;						/* The property to be tested */
 			}
 			p.test, p.control {
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
@@ -43,24 +44,6 @@
 		<p>
 			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
 		</p>
-		<div class="wrapper">
-			<!-- postfixes PERCENT SIGN -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#x0025;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x0025;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- postfixes CENT SIGN -->
-			<p class="test" lang="ja">
-				<span>サンプル文サンプル文<span class="target">&#x00a2;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x00a2;</span>サンプル文</span>
-			</p>
-		</div>
 		<div class="wrapper">
 			<!-- postfixes DEGREE SIGN -->
 			<p class="test" lang="ja">
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-017b.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-017b.xht
index 95629cbef3e..c41b3afae26 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-017b.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-017b.xht
@@ -5,10 +5,11 @@
 		<title>CSS Text Test: line-break - strict and postfixes</title>
 		<!-- postfixes -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
-		<link rel="help" title="5.2. Breaking Rules for Punctuation: the 'line-break' property" href="http://www.w3.org/TR/css-text-3/#line-break" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
 		<link rel="match" href="reference/line-break-strict-017b-ref.xht" />
 		<meta http-equiv="content-language" content="en, ja" />
-		<meta name="assert" content="This test verifies that 'line-break: strict' does not allow line breaking before postfixes such as PERCENT SIGN (U+0025) and CENT SIGN (U+00A2)." />
+		<meta name="assert" content="This test verifies that 'line-break: strict' does not allow line breaking before postfixes." />
 		<style type="text/css">
 			@font-face
 			{
@@ -20,13 +21,13 @@
 				*/
 			}
 			.test span {
-				line-break: strict;						// The property to be tested
+				line-break: strict;						/* The property to be tested */
 			}
 			p.test, p.control {
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-018.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-018.xht
new file mode 100644
index 00000000000..85a92d1688e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-018.xht
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Text Test: line-break - strict and prefixes</title>
+		<!-- prefixes -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<link rel="help" title="5.3. Line Breaking Rules: the 'line-break' property" href="https://drafts.csswg.org/css-text-3/#line-break-property" />
+		<link rel="match" href="reference/line-break-strict-018-ref.xht" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<meta name="assert" content="This test verifies that 'line-break: strict' does not allow line breaking after prefixes." />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			.test span {
+				line-break: strict;						/* The property to be tested */
+			}
+			p.test, p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 10px;
+				padding: 10px;
+			}
+		</style>
+	</head>
+	<body lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<div class="wrapper">
+            <!-- prefixes EURO SIGN -->
+            <p class="test" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#x20ac;</span>サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#x20ac;</span>サンプル文</span>
+            </p>
+		</div>
+		<div class="wrapper">
+            <!-- prefixes NUMERO SIGN -->
+            <p class="test" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#x2116;</span>サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#x2116;</span>サンプル文</span>
+            </p>
+		</div>
+		<div class="wrapper">
+            <!-- prefixes FULLWIDTH DOLLAR SIGN -->
+            <p class="test" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#xff04;</span>サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#xff04;</span>サンプル文</span>
+            </p>
+		</div>
+		<div class="wrapper">
+            <!-- prefixes FULLWIDTH POUND SIGN -->
+            <p class="test" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#xffe1;</span>サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#xffe1;</span>サンプル文</span>
+            </p>
+		</div>
+		<div class="wrapper">
+            <!-- prefixes FULLWIDTH YEN SIGN -->
+            <p class="test" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#xffe5;</span>サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#xffe5;</span>サンプル文</span>
+            </p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-011-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-011-ref.xht
new file mode 100644
index 00000000000..cc6d9023c08
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-011-ref.xht
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Reftest Reference</title>
+		<!-- reftest for line-break-loose-011.xht -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 10px;
+				padding: 10px;
+			}
+		</style>
+	</head>
+	<body lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<div class="wrapper">
+			<!-- Japanese small kana: HIRAGANA LETTER SMALL A -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3041;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3041;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- Japanese small kana: HIRAGANA LETTER SMALL I -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3043;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3043;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- Japanese small kana: HIRAGANA LETTER SMALL U -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3045;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3045;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- Japanese small kana: HIRAGANA LETTER SMALL E -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3047;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3047;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- Japanese small kana: HIRAGANA LETTER SMALL O -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3049;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3049;</span>サンプル文</span>
+			</p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-012-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-012-ref.xht
new file mode 100644
index 00000000000..4ffd2f90ecc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-012-ref.xht
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Reftest Reference</title>
+		<!-- reftest for line-break-loose-012.xht -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 10px;
+				padding: 10px;
+			}
+		</style>
+	</head>
+	<body  lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<div class="wrapper">
+			<!-- Katakana-Hiragana prolonged sound mark - fullwidth -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x30FC;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x30FC;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- Katakana-Hiragana prolonged sound mark - halfwidth -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#xff70;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#xff70;</span>サンプル文</span>
+			</p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-013-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-013-ref.xht
new file mode 100644
index 00000000000..fa97005132d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-013-ref.xht
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Reftest Reference</title>
+		<!-- reftest for line-break-loose-013.xht -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 10px;
+				padding: 10px;
+			}
+		</style>
+	</head>
+	<body  lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<!-- hyphens -->
+		<div class="wrapper">
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2010;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2010;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2013;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2013;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x301c;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x301c;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x30a0;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x30a0;</span>サンプル文</span>
+			</p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-014-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-014-ref.xht
new file mode 100644
index 00000000000..bc8090819cd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-014-ref.xht
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Reftest Reference</title>
+		<!-- reftest for line-break-loose-014.xht -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 10px;
+				padding: 10px;
+			}
+		</style>
+	</head>
+	<body  lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<!-- iteration marks -->
+		<div class="wrapper">
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3005;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3005;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x303b;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x303b;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x309d;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x309d;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x309e;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x309e;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x30fd;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x30fd;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x30fe;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x30fe;</span>サンプル文</span>
+			</p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-022-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-015-ref.xht
similarity index 68%
rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-022-ref.xht
rename to tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-015-ref.xht
index c9508ab67f9..c59d5af5046 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-022-ref.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-015-ref.xht
@@ -3,8 +3,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<title>CSS Reftest Reference</title>
-		<!-- reftest for line-break-normal-022.xht -->
+		<!-- reftest for line-break-loose-015.xht -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
 		<meta http-equiv="content-language" content="en, ja" />
 		<style type="text/css">
 			@font-face
@@ -20,7 +21,7 @@
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
@@ -40,19 +41,19 @@
 		<div class="wrapper">
 			<!-- inseparable characters TWO DOT LEADER -->
 			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x2025;</span>サンプル文</span>
+				<span>サンプルサンプル。<span class="target">&#x2025;<br />&#x2025;</span>サンプル文</span>
 			</p>
 			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x2025;</span>サンプル文</span>
+				<span>サンプルサンプル。<span class="target">&#x2025;<br />&#x2025;</span>サンプル文</span>
 			</p>
 		</div>
 		<div class="wrapper">
 			<!-- inseparable characters HORIZONTAL ELLIPSIS -->
 			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x2026;</span>サンプル文</span>
+				<span>サンプルサンプル。<span class="target">&#x2026;<br />&#x2026;</span>サンプル文</span>
 			</p>
 			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x2026;</span>サンプル文</span>
+				<span>サンプルサンプル。<span class="target">&#x2026;<br />&#x2026;</span>サンプル文</span>
 			</p>
 		</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-016a-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-016a-ref.xht
new file mode 100644
index 00000000000..4338d02bab4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-016a-ref.xht
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Reftest Reference</title>
+		<!-- reftest for line-break-loose-016a.xht -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 5px;
+				padding: 5px;
+			}
+		</style>
+	</head>
+	<body  lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<div class="wrapper">
+			<!-- centered punctuation marks KATAKANA MIDDLE DOT -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x30fb;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x30fb;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- centered punctuation marks FULLWIDTH COLON -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#xff1a;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#xff1a;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- centered punctuation marks FULLWIDTH SEMICOLON -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#xff1b;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#xff1b;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- centered punctuation marks HALFWIDTH KATAKANA MIDDLE DOT -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#xff65;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#xff65;</span>サンプル文</span>
+			</p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-016b-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-016b-ref.xht
new file mode 100644
index 00000000000..0c80df6ec46
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-016b-ref.xht
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Reftest Reference</title>
+		<!-- reftest for line-break-loose-016b.xht -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 5px;
+				padding: 5px;
+			}
+		</style>
+	</head>
+	<body  lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<div class="wrapper">
+			<!-- centered punctuation marks DOUBLE EXCLAMATION MARK -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x203c;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x203c;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- centered punctuation marks DOUBLE QUESTION MARK -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2047;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2047;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- centered punctuation marks QUESTION EXCLAMATION MARK -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2048;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2048;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- centered punctuation marks EXCLAMATION QUESTION MARK -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2049;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2049;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- centered punctuation marks FULLWIDTH EXCLAMATION MARK -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#xff01;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#xff01;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- centered punctuation marks FULLWIDTH QUESTION MARK -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#xff1f;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#xff1f;</span>サンプル文</span>
+			</p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-017a-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-017a-ref.xht
new file mode 100644
index 00000000000..09a18a2396f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-017a-ref.xht
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Reftest Reference</title>
+		<!-- reftest for line-break-loose-017a.xht -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 10px;
+				padding: 10px;
+			}
+		</style>
+	</head>
+	<body  lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<div class="wrapper">
+			<!-- postfixes DEGREE SIGN -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x00b0;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x00b0;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- postfixes PER MILLE SIGN -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2030;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2030;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- postfixes PRIME -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2032;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2032;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- postfixes DOUBLE PRIME -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2033;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2033;</span>サンプル文</span>
+			</p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-017b-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-017b-ref.xht
new file mode 100644
index 00000000000..7148339b05e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-017b-ref.xht
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Reftest Reference</title>
+		<!-- reftest for line-break-loose-017b.xht -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 10px;
+				padding: 10px;
+			}
+		</style>
+	</head>
+	<body  lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<div class="wrapper">
+			<!-- postfixes DEGREE CELSIUS -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2103;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2103;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- postfixes FULLWIDTH PERCENT SIGN -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#xff05;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#xff05;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- postfixes FULLWIDTH CENT SIGN -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#xffe0;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#xffe0;</span>サンプル文</span>
+			</p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-018-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-018-ref.xht
new file mode 100644
index 00000000000..c8f6b561240
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-018-ref.xht
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Reftest Reference</title>
+		<!-- reftest for line-break-loose-018.xht -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 10px;
+				padding: 10px;
+			}
+		</style>
+	</head>
+	<body  lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<div class="wrapper">
+            <!-- prefixes EURO SIGN -->
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#x20ac;</span><br />サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#x20ac;</span><br />サンプル文</span>
+            </p>
+		</div>
+		<div class="wrapper">
+            <!-- prefixes NUMERO SIGN -->
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#x2116;</span><br />サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#x2116;</span><br />サンプル文</span>
+            </p>
+		</div>
+		<div class="wrapper">
+            <!-- prefixes FULLWIDTH DOLLAR SIGN -->
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#xff04;</span><br />サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#xff04;</span><br />サンプル文</span>
+            </p>
+		</div>
+		<div class="wrapper">
+            <!-- prefixes FULLWIDTH POUND SIGN -->
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#xffe1;</span><br />サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#xffe1;</span><br />サンプル文</span>
+            </p>
+		</div>
+		<div class="wrapper">
+            <!-- prefixes FULLWIDTH YEN SIGN -->
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#xffe5;</span><br />サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<span class="target">&#xffe5;</span><br />サンプル文</span>
+            </p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-011-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-011-ref.xht
new file mode 100644
index 00000000000..dc37069bad4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-011-ref.xht
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Reftest Reference</title>
+		<!-- reftest for line-break-normal-011.xht -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 10px;
+				padding: 10px;
+			}
+		</style>
+	</head>
+	<body lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<div class="wrapper">
+			<!-- Japanese small kana: HIRAGANA LETTER SMALL A -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3041;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3041;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- Japanese small kana: HIRAGANA LETTER SMALL I -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3043;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3043;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- Japanese small kana: HIRAGANA LETTER SMALL U -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3045;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3045;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- Japanese small kana: HIRAGANA LETTER SMALL E -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3047;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3047;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- Japanese small kana: HIRAGANA LETTER SMALL O -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3049;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x3049;</span>サンプル文</span>
+			</p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-012-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-012-ref.xht
new file mode 100644
index 00000000000..ecb86a902c7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-012-ref.xht
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Reftest Reference</title>
+		<!-- reftest for line-break-normal-012.xht -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 10px;
+				padding: 10px;
+			}
+		</style>
+	</head>
+	<body  lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<div class="wrapper">
+			<!-- Katakana-Hiragana prolonged sound mark - fullwidth -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x30FC;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x30FC;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- Katakana-Hiragana prolonged sound mark - halfwidth -->
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#xff70;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#xff70;</span>サンプル文</span>
+			</p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-013-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-013-ref.xht
new file mode 100644
index 00000000000..f6b670f90a7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-013-ref.xht
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Reftest Reference</title>
+		<!-- reftest for line-break-normal-013.xht -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 10px;
+				padding: 10px;
+			}
+		</style>
+	</head>
+	<body  lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<!-- hyphens -->
+		<div class="wrapper">
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2010;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2010;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2013;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x2013;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x301c;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x301c;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x30a0;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプル文サンプル文<br /><span class="target">&#x30a0;</span>サンプル文</span>
+			</p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-021-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-014-ref.xht
similarity index 93%
rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-021-ref.xht
rename to tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-014-ref.xht
index 13937468d80..577bf29a518 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-021-ref.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-014-ref.xht
@@ -3,8 +3,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<title>CSS Reftest Reference</title>
-		<!-- reftest for line-break-normal-021.xht -->
+		<!-- reftest for line-break-normal-014.xht -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
 		<meta http-equiv="content-language" content="en, ja" />
 		<style type="text/css">
 			@font-face
@@ -20,7 +21,7 @@
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-015-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-015-ref.xht
new file mode 100644
index 00000000000..886c4a30a03
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-015-ref.xht
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Reftest Reference</title>
+		<!-- reftest for line-break-normal-015.xht -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 10px;
+				padding: 10px;
+			}
+		</style>
+	</head>
+	<body  lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<div class="wrapper">
+			<!-- inseparable characters TWO DOT LEADER -->
+			<p class="control" lang="ja">
+				<span>サンプルサンプル。<br /><span class="target">&#x2025;&#x2025;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプルサンプル。<br /><span class="target">&#x2025;&#x2025;</span>サンプル文</span>
+			</p>
+		</div>
+		<div class="wrapper">
+			<!-- inseparable characters HORIZONTAL ELLIPSIS -->
+			<p class="control" lang="ja">
+				<span>サンプルサンプル。<br /><span class="target">&#x2026;&#x2026;</span>サンプル文</span>
+			</p>
+			<p class="control" lang="ja">
+				<span>サンプルサンプル。<br /><span class="target">&#x2026;&#x2026;</span>サンプル文</span>
+			</p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-023a-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-016a-ref.xht
similarity index 62%
rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-023a-ref.xht
rename to tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-016a-ref.xht
index 07fb2028a7e..4ebe678bd40 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-023a-ref.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-016a-ref.xht
@@ -3,8 +3,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<title>CSS Reftest Reference</title>
-		<!-- reftest for line-break-normal-023.xht -->
+		<!-- reftest for line-break-normal-016a.xht -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
 		<meta http-equiv="content-language" content="en, ja" />
 		<style type="text/css">
 			@font-face
@@ -20,7 +21,7 @@
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
@@ -37,24 +38,6 @@
 		<p>
 			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
 		</p>
-		<!-- centered punctuation marks COLON -->
-		<div class="wrapper">
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x003a;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x003a;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- centered punctuation marks SEMICOLON -->
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x003b;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x003b;</span>サンプル文</span>
-			</p>
-		</div>
 		<div class="wrapper">
 			<!-- centered punctuation marks KATAKANA MIDDLE DOT -->
 			<p class="control" lang="ja">
@@ -91,23 +74,5 @@
 				<span>サンプル文サンプル<br />文<span class="target">&#xff65;</span>サンプル文</span>
 			</p>
 		</div>
-		<div class="wrapper">
-			<!-- centered punctuation marks EXCLAMATION MARK -->
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x0021;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x0021;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- centered punctuation marks QUESTION MARK -->
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x003f;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x003f;</span>サンプル文</span>
-			</p>
-		</div>
 	</body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-023b-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-016b-ref.xht
similarity index 94%
rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-023b-ref.xht
rename to tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-016b-ref.xht
index 302ddd6d1d8..4ee234b4cba 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-023b-ref.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-016b-ref.xht
@@ -3,8 +3,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<title>CSS Reftest Reference</title>
-		<!-- reftest for line-break-normal-023.xht -->
+		<!-- reftest for line-break-normal-016b.xht -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
 		<meta http-equiv="content-language" content="en, ja" />
 		<style type="text/css">
 			@font-face
@@ -20,7 +21,7 @@
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-024a-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-017a-ref.xht
similarity index 76%
rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-024a-ref.xht
rename to tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-017a-ref.xht
index 63580b20b34..cd9710014ef 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-024a-ref.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-017a-ref.xht
@@ -3,8 +3,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<title>CSS Reftest Reference</title>
-		<!-- reftest for line-break-normal-024.xht -->
+		<!-- reftest for line-break-normal-017a.xht -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
 		<meta http-equiv="content-language" content="en, ja" />
 		<style type="text/css">
 			@font-face
@@ -20,7 +21,7 @@
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
@@ -37,24 +38,6 @@
 		<p>
 			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
 		</p>
-		<div class="wrapper">
-			<!-- postfixes PERCENT SIGN -->
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x0025;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x0025;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- postfixes CENT SIGN -->
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x00a2;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x00a2;</span>サンプル文</span>
-			</p>
-		</div>
 		<div class="wrapper">
 			<!-- postfixes DEGREE SIGN -->
 			<p class="control" lang="ja">
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-024b-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-017b-ref.xht
similarity index 93%
rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-024b-ref.xht
rename to tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-017b-ref.xht
index 1c63f173daa..7efb5296b05 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-024b-ref.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-017b-ref.xht
@@ -5,6 +5,7 @@
 		<title>CSS Reftest Reference</title>
 		<!-- reftest for line-break-normal-024.xht -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
 		<meta http-equiv="content-language" content="en, ja" />
 		<style type="text/css">
 			@font-face
@@ -20,7 +21,7 @@
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-018-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-018-ref.xht
new file mode 100644
index 00000000000..9b23b57dfe6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-018-ref.xht
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Reftest Reference</title>
+		<!-- reftest for line-break-normal-018.xht -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 10px;
+				padding: 10px;
+			}
+		</style>
+	</head>
+	<body  lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<div class="wrapper">
+            <!-- prefixes EURO SIGN -->
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#x20ac;</span>サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#x20ac;</span>サンプル文</span>
+            </p>
+		</div>
+		<div class="wrapper">
+            <!-- prefixes NUMERO SIGN -->
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#x2116;</span>サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#x2116;</span>サンプル文</span>
+            </p>
+		</div>
+		<div class="wrapper">
+            <!-- prefixes FULLWIDTH DOLLAR SIGN -->
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#xff04;</span>サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#xff04;</span>サンプル文</span>
+            </p>
+		</div>
+		<div class="wrapper">
+            <!-- prefixes FULLWIDTH POUND SIGN -->
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#xffe1;</span>サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#xffe1;</span>サンプル文</span>
+            </p>
+		</div>
+		<div class="wrapper">
+            <!-- prefixes FULLWIDTH YEN SIGN -->
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#xffe5;</span>サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#xffe5;</span>サンプル文</span>
+            </p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-011-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-011-ref.xht
index 1a2841bc01e..ec17a31ec55 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-011-ref.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-011-ref.xht
@@ -5,6 +5,7 @@
 		<title>CSS Reftest Reference</title>
 		<!-- reftest for line-break-strict-011.xht -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
 		<meta http-equiv="content-language" content="en, ja" />
 		<style type="text/css">
 			@font-face
@@ -20,7 +21,7 @@
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-012-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-012-ref.xht
index 0deeb9f5694..fbe2222c72d 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-012-ref.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-012-ref.xht
@@ -5,6 +5,7 @@
 		<title>CSS Reftest Reference</title>
 		<!-- reftest for line-break-strict-012.xht -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
 		<meta http-equiv="content-language" content="en, ja" />
 		<style type="text/css">
 			@font-face
@@ -20,7 +21,7 @@
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-013-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-013-ref.xht
index 40e5b1d940c..44a33c588db 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-013-ref.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-013-ref.xht
@@ -5,6 +5,7 @@
 		<title>CSS Reftest Reference</title>
 		<!-- reftest for line-break-strict-013.xht -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
 		<meta http-equiv="content-language" content="en, ja" />
 		<style type="text/css">
 			@font-face
@@ -20,7 +21,7 @@
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-014-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-014-ref.xht
index 2676a3b4bfa..2af0a903eb6 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-014-ref.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-014-ref.xht
@@ -5,6 +5,7 @@
 		<title>CSS Reftest Reference</title>
 		<!-- reftest for line-break-strict-014.xht -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
 		<meta http-equiv="content-language" content="en, ja" />
 		<style type="text/css">
 			@font-face
@@ -20,7 +21,7 @@
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-015-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-015-ref.xht
index 5bcd3c2cfd4..320870299d2 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-015-ref.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-015-ref.xht
@@ -5,6 +5,7 @@
 		<title>CSS Reftest Reference</title>
 		<!-- reftest for line-break-strict-015.xht -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
 		<meta http-equiv="content-language" content="en, ja" />
 		<style type="text/css">
 			@font-face
@@ -20,7 +21,7 @@
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
@@ -40,19 +41,19 @@
 		<div class="wrapper">
 			<!-- inseparable characters TWO DOT LEADER -->
 			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x2025;</span>サンプル文</span>
+				<span>サンプルサンプル。<br /><span class="target">&#x2025;&#x2025;</span>サンプル文</span>
 			</p>
 			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x2025;</span>サンプル文</span>
+				<span>サンプルサンプル。<br /><span class="target">&#x2025;&#x2025;</span>サンプル文</span>
 			</p>
 		</div>
 		<div class="wrapper">
 			<!-- inseparable characters HORIZONTAL ELLIPSIS -->
 			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x2026;</span>サンプル文</span>
+				<span>サンプルサンプル。<br /><span class="target">&#x2026;&#x2026;</span>サンプル文</span>
 			</p>
 			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x2026;</span>サンプル文</span>
+				<span>サンプルサンプル。<br /><span class="target">&#x2026;&#x2026;</span>サンプル文</span>
 			</p>
 		</div>
 	</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-016a-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-016a-ref.xht
index b95368ff7ff..9c2d497a039 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-016a-ref.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-016a-ref.xht
@@ -5,6 +5,7 @@
 		<title>CSS Reftest Reference</title>
 		<!-- reftest for line-break-strict-016.xht -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
 		<meta http-equiv="content-language" content="en, ja" />
 		<style type="text/css">
 			@font-face
@@ -20,7 +21,7 @@
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
@@ -37,24 +38,6 @@
 		<p>
 			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
 		</p>
-		<div class="wrapper">
-			<!-- centered punctuation marks COLON -->
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x003a;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x003a;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- centered punctuation marks SEMICOLON -->
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x003b;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x003b;</span>サンプル文</span>
-			</p>
-		</div>
 		<div class="wrapper">
 			<!-- centered punctuation marks KATAKANA MIDDLE DOT -->
 			<p class="control" lang="ja">
@@ -91,23 +74,5 @@
 				<span>サンプル文サンプル<br />文<span class="target">&#xff65;</span>サンプル文</span>
 			</p>
 		</div>
-		<div class="wrapper">
-			<!-- centered punctuation marks EXCLAMATION MARK -->
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x0021;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x0021;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- centered punctuation marks QUESTION MARK -->
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x003f;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x003f;</span>サンプル文</span>
-			</p>
-		</div>
 	</body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-016b-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-016b-ref.xht
index 57698e5a558..d000b8087b8 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-016b-ref.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-016b-ref.xht
@@ -5,6 +5,7 @@
 		<title>CSS Reftest Reference</title>
 		<!-- reftest for line-break-strict-016.xht -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
 		<meta http-equiv="content-language" content="en, ja" />
 		<style type="text/css">
 			@font-face
@@ -20,7 +21,7 @@
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-017a-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-017a-ref.xht
index 7234804a08d..87f9f322c11 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-017a-ref.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-017a-ref.xht
@@ -5,6 +5,7 @@
 		<title>CSS Reftest Reference</title>
 		<!-- reftest for line-break-strict-017.xht -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
 		<meta http-equiv="content-language" content="en, ja" />
 		<style type="text/css">
 			@font-face
@@ -20,7 +21,7 @@
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
@@ -37,24 +38,6 @@
 		<p>
 			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
 		</p>
-		<div class="wrapper">
-			<!-- postfixes PERCENT SIGN -->
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x0025;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x0025;</span>サンプル文</span>
-			</p>
-		</div>
-		<div class="wrapper">
-			<!-- postfixes CENT SIGN -->
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x00a2;</span>サンプル文</span>
-			</p>
-			<p class="control" lang="ja">
-				<span>サンプル文サンプル<br />文<span class="target">&#x00a2;</span>サンプル文</span>
-			</p>
-		</div>
 		<div class="wrapper">
 			<!-- postfixes DEGREE SIGN -->
 			<p class="control" lang="ja">
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-017b-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-017b-ref.xht
index 3960275176a..c4b5c89b201 100644
--- a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-017b-ref.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-017b-ref.xht
@@ -3,8 +3,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<title>CSS Reftest Reference</title>
-		<!-- reftest for line-break-strict-017.xht -->
+		<!-- reftest for line-break-strict-017b.xht -->
 		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
 		<meta http-equiv="content-language" content="en, ja" />
 		<style type="text/css">
 			@font-face
@@ -20,7 +21,7 @@
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10em;
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-018-ref.xht b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-018-ref.xht
new file mode 100644
index 00000000000..c0c236a9276
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-018-ref.xht
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Reftest Reference</title>
+		<!-- reftest for line-break-strict-018.xht -->
+		<link rel="author" title="Taka Oshiyama" href="mailto:takaoshiyama@gmail.com" />
+		<link rel="author" title="Shinyu Murakami" href="mailto:murakami@vivliostyle.org" />
+		<meta http-equiv="content-language" content="en, ja" />
+		<style type="text/css">
+			@font-face
+			{
+				font-family: "mplus-1p-regular";
+				src: url("/fonts/mplus-1p-regular.woff") format("woff");
+				/* filesize: 803300 bytes (784.5 KBytes) */
+				/*
+				mplus-1p-regular.ttf can be downloaded at/from [TBD later]
+				*/
+			}
+			p.control {
+				border: 1px solid gray;
+				color: blue;
+				font-family: "mplus-1p-regular";
+				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+			}
+			span.target {
+				background-color: aqua;
+			}
+			div.wrapper {
+				display: inline-block;
+				border: 1px solid;
+				margin: 10px;
+				padding: 10px;
+			}
+		</style>
+	</head>
+	<body  lang="en">
+		<p>
+			Test passes if the highlighted characters in each pair of rectangles are at the exact same horizontal position.
+		</p>
+		<div class="wrapper">
+            <!-- prefixes EURO SIGN -->
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#x20ac;</span>サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#x20ac;</span>サンプル文</span>
+            </p>
+		</div>
+		<div class="wrapper">
+            <!-- prefixes NUMERO SIGN -->
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#x2116;</span>サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#x2116;</span>サンプル文</span>
+            </p>
+		</div>
+		<div class="wrapper">
+            <!-- prefixes FULLWIDTH DOLLAR SIGN -->
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#xff04;</span>サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#xff04;</span>サンプル文</span>
+            </p>
+		</div>
+		<div class="wrapper">
+            <!-- prefixes FULLWIDTH POUND SIGN -->
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#xffe1;</span>サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#xffe1;</span>サンプル文</span>
+            </p>
+		</div>
+		<div class="wrapper">
+            <!-- prefixes FULLWIDTH YEN SIGN -->
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#xffe5;</span>サンプル文</span>
+            </p>
+            <p class="control" lang="ja">
+                <span>サンプル文サンプル<br /><span class="target">&#xffe5;</span>サンプル文</span>
+            </p>
+		</div>
+	</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-020-ref.html b/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-020-ref.html
index 635bd024bf4..32b85542a77 100644
--- a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-020-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-020-ref.html
@@ -8,9 +8,9 @@ div {
   width: 2em;
 }
 
-div::nth-of-type(1) { border-color: blue; }
-div::nth-of-type(2) { border-color: green; }
-div::nth-of-type(3) { border-color: orange; }
+div:nth-of-type(1) { border-color: blue; }
+div:nth-of-type(2) { border-color: green; }
+div:nth-of-type(3) { border-color: orange; }
 
 </style>
 
diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-010.html b/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-010.html
index 1ab97fb146a..7d3bc056d82 100644
--- a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-010.html
+++ b/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-010.html
@@ -8,9 +8,10 @@
 <meta name="assert" content="The word is broken even if pre-wrap provides a former breaking opportunity in leading white-space.">
 <style>
 div {
-   position: relative;
-   font-size: 20px;
-   font-family: Ahem;
+  position: relative;
+  font-size: 20px;
+  font-family: Ahem;
+  line-height: 1em;
 }
 .red {
   position: absolute;
@@ -23,9 +24,7 @@ div {
 }
 .test {
   color: green;
-  line-height: 1em;
   width: 5ch;
-
   white-space: pre-wrap;
   word-break: break-all;
 }
diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-011.html b/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-011.html
index ed07aeb7368..531c68d8cea 100644
--- a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-011.html
+++ b/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-011.html
@@ -8,9 +8,10 @@
 <meta name="assert" content="A single leading white-space should account as soft breaking opportunity, honoring the 'white-space: pre-wrap', on top to the ones provided by 'word-break: break-all'.">
 <style>
 div {
-   position: relative;
-   font-size: 20px;
-   font-family: Ahem;
+  position: relative;
+  font-size: 20px;
+  font-family: Ahem;
+  line-height: 1em;
 }
 .red {
   position: absolute;
@@ -23,7 +24,6 @@ div {
 .test {
   color: green;
   background: green;
-  line-height: 1em;
   width: 1ch;
   white-space: pre-wrap;
   word-break: break-all;
diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-020.html b/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-020.html
index 6c86749263a..ac1840131c3 100644
--- a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-020.html
+++ b/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-020.html
@@ -11,11 +11,11 @@ div {
   width: 2em;
 }
 
-div::nth-of-type(1) { border-color: blue; }
-div::nth-of-type(2) { border-color: green; }
-div::nth-of-type(3) { border-color: orange; }
+div:nth-of-type(1) { border-color: blue; }
+div:nth-of-type(2) { border-color: green; }
+div:nth-of-type(3) { border-color: orange; }
 
-div::nth-of-type(3) { word-break: break-word; }
+div:nth-of-type(3) { word-break: break-all; }
 </style>
 
 <p>Test passes if the text in each of the following 3 boxes is broken into separate lines at the same points.
diff --git a/tests/wpt/web-platform-tests/html/dom/usvstring-reflection.html b/tests/wpt/web-platform-tests/html/dom/usvstring-reflection.html
index b9c06d824ec..b9cafd1fb35 100644
--- a/tests/wpt/web-platform-tests/html/dom/usvstring-reflection.html
+++ b/tests/wpt/web-platform-tests/html/dom/usvstring-reflection.html
@@ -109,6 +109,11 @@ test(() => {
   window.navigator.registerProtocolHandler('web+myprotocol', "custom-scheme\uD800/url=%s", "title");
 }, "RegisterPtotocolHandler URL: unpaired surrogate codepoint should not make any exceptions.")
 
+test(() => {
+  // This shouldn't throw an exception.
+  window.navigator.unregisterProtocolHandler('web+myprotocol', "custom-scheme\uD800/url=%s");
+}, "UnregisterPtotocolHandler URL: unpaired surrogate codepoint should not make any exceptions.")
+
 test(() => {
   var w = window.open("about:blank#\uD800");
   assert_equals(w.document.URL, 'about:blank#%EF%BF%BD');
diff --git a/tests/wpt/web-platform-tests/interfaces/DOM-Parsing.idl b/tests/wpt/web-platform-tests/interfaces/DOM-Parsing.idl
index 94d437977af..f3a13342f5e 100644
--- a/tests/wpt/web-platform-tests/interfaces/DOM-Parsing.idl
+++ b/tests/wpt/web-platform-tests/interfaces/DOM-Parsing.idl
@@ -4,30 +4,30 @@
 // Source: DOM Parsing and Serialization (https://w3c.github.io/DOM-Parsing/)
 
 [Constructor, Exposed=Window]
-    interface DOMParser {
-      [NewObject] Document parseFromString(DOMString str, SupportedType type);
-    };
+interface DOMParser {
+  [NewObject] Document parseFromString(DOMString str, SupportedType type);
+};
 
-    enum SupportedType {
-      "text/html",
-      "text/xml",
-      "application/xml",
-      "application/xhtml+xml",
-      "image/svg+xml"
-    };
+enum SupportedType {
+  "text/html",
+  "text/xml",
+  "application/xml",
+  "application/xhtml+xml",
+  "image/svg+xml"
+};
 
 [Constructor, Exposed=Window]
 
-      interface XMLSerializer {
-      DOMString serializeToString(Node root);
-    };
+  interface XMLSerializer {
+  DOMString serializeToString(Node root);
+};
 
 partial interface Element {
-      [CEReactions, TreatNullAs=EmptyString] attribute DOMString innerHTML;
-      [CEReactions, TreatNullAs=EmptyString] attribute DOMString outerHTML;
-      [CEReactions] void insertAdjacentHTML(DOMString position, DOMString text);
-    };
+  [CEReactions, TreatNullAs=EmptyString] attribute DOMString innerHTML;
+  [CEReactions, TreatNullAs=EmptyString] attribute DOMString outerHTML;
+  [CEReactions] void insertAdjacentHTML(DOMString position, DOMString text);
+};
 
 partial interface Range {
-      [CEReactions, NewObject] DocumentFragment createContextualFragment(DOMString fragment);
-    };
+  [CEReactions, NewObject] DocumentFragment createContextualFragment(DOMString fragment);
+};
diff --git a/tests/wpt/web-platform-tests/interfaces/audio-output.idl b/tests/wpt/web-platform-tests/interfaces/audio-output.idl
index c8efd4ea051..2a86188565f 100644
--- a/tests/wpt/web-platform-tests/interfaces/audio-output.idl
+++ b/tests/wpt/web-platform-tests/interfaces/audio-output.idl
@@ -4,6 +4,6 @@
 // Source: Audio Output Devices API (https://w3c.github.io/mediacapture-output/)
 
 partial interface HTMLMediaElement {
-  readonly        attribute DOMString sinkId;
-  Promise<void> setSinkId(DOMString sinkId);
+  [SecureContext] readonly attribute DOMString sinkId;
+  [SecureContext] Promise<void> setSinkId(DOMString sinkId);
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/credential-management.idl b/tests/wpt/web-platform-tests/interfaces/credential-management.idl
index c60fa4ec669..da1b9dfca69 100644
--- a/tests/wpt/web-platform-tests/interfaces/credential-management.idl
+++ b/tests/wpt/web-platform-tests/interfaces/credential-management.idl
@@ -46,8 +46,6 @@ dictionary CredentialCreationOptions {
   AbortSignal signal;
 };
 
-typedef (FormData or URLSearchParams) CredentialBodyType;
-
 [Constructor(HTMLFormElement form),
  Constructor(PasswordCredentialData data),
  Exposed=Window,
@@ -64,6 +62,7 @@ partial dictionary CredentialRequestOptions {
 dictionary PasswordCredentialData : CredentialData {
   USVString name;
   USVString iconURL;
+  required USVString origin;
   required USVString password;
 };
 
@@ -94,6 +93,7 @@ partial dictionary CredentialRequestOptions {
 dictionary FederatedCredentialInit : CredentialData {
   USVString name;
   USVString iconURL;
+  required USVString origin;
   required USVString provider;
   DOMString protocol;
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/input-events.idl b/tests/wpt/web-platform-tests/interfaces/input-events.idl
index 3bcb0dd78cd..bd4024856b5 100644
--- a/tests/wpt/web-platform-tests/interfaces/input-events.idl
+++ b/tests/wpt/web-platform-tests/interfaces/input-events.idl
@@ -4,11 +4,13 @@
 // Source: Input Events Level 1 (https://cdn.staticaly.com/gh/w3c/input-events/v1/index.html)
 
 partial interface InputEvent {
-                    readonly attribute DataTransfer? dataTransfer;
-                    sequence<StaticRange> getTargetRanges();
-                };
+    readonly attribute DOMString inputType;
+    readonly attribute DataTransfer? dataTransfer;
+    sequence<StaticRange> getTargetRanges();
+};
 
-                partial dictionary InputEventInit {
-                    DataTransfer? dataTransfer = null;
-                    sequence<StaticRange> targetRanges = [];
-                };
+partial dictionary InputEventInit {
+    DOMString inputType = "";
+    DataTransfer? dataTransfer = null;
+    sequence<StaticRange> targetRanges = [];
+};
diff --git a/tests/wpt/web-platform-tests/interfaces/mediacapture-streams.idl b/tests/wpt/web-platform-tests/interfaces/mediacapture-streams.idl
index b2dc9904fde..a66e473493e 100644
--- a/tests/wpt/web-platform-tests/interfaces/mediacapture-streams.idl
+++ b/tests/wpt/web-platform-tests/interfaces/mediacapture-streams.idl
@@ -160,11 +160,12 @@ dictionary OverconstrainedErrorEventInit : EventInit {
 };
 
 partial interface Navigator {
-    [SameObject]
+    [SameObject, SecureContext]
     readonly        attribute MediaDevices mediaDevices;
 };
 
-[Exposed=Window]
+[Exposed=Window,
+SecureContext]
 interface MediaDevices : EventTarget {
                     attribute EventHandler ondevicechange;
     Promise<sequence<MediaDeviceInfo>> enumerateDevices();
@@ -190,6 +191,7 @@ enum MediaDeviceKind {
 };
 
 partial interface Navigator {
+    [SecureContext]
     void getUserMedia(MediaStreamConstraints constraints, NavigatorUserMediaSuccessCallback successCallback, NavigatorUserMediaErrorCallback errorCallback);
 };
 
diff --git a/tests/wpt/web-platform-tests/interfaces/payment-method-basic-card.idl b/tests/wpt/web-platform-tests/interfaces/payment-method-basic-card.idl
index 2019aa11669..25cb62170dc 100644
--- a/tests/wpt/web-platform-tests/interfaces/payment-method-basic-card.idl
+++ b/tests/wpt/web-platform-tests/interfaces/payment-method-basic-card.idl
@@ -5,15 +5,12 @@
 
 dictionary BasicCardRequest {
   sequence<DOMString> supportedNetworks;
-  sequence<BasicCardType> supportedTypes;
 };
 
 dictionary BasicCardChangeDetails {
   PaymentAddress? billingAddress;
 };
 
-enum BasicCardType { "credit", "debit", "prepaid" };
-
 dictionary BasicCardResponse {
   required DOMString cardNumber;
   DOMString cardholderName;
diff --git a/tests/wpt/web-platform-tests/interfaces/performance-timeline.idl b/tests/wpt/web-platform-tests/interfaces/performance-timeline.idl
index 2ec82476b59..0cd2830b2ea 100644
--- a/tests/wpt/web-platform-tests/interfaces/performance-timeline.idl
+++ b/tests/wpt/web-platform-tests/interfaces/performance-timeline.idl
@@ -26,6 +26,7 @@ interface PerformanceObserver {
   void observe(PerformanceObserverInit options);
   void disconnect();
   PerformanceEntryList takeRecords();
+  static readonly attribute FrozenArray<DOMString> supportedEntryTypes;
 };
 
 dictionary PerformanceObserverInit {
diff --git a/tests/wpt/web-platform-tests/interfaces/trusted-types.tentative.idl b/tests/wpt/web-platform-tests/interfaces/trusted-types.tentative.idl
index 564200133b7..6ff45e7050c 100644
--- a/tests/wpt/web-platform-tests/interfaces/trusted-types.tentative.idl
+++ b/tests/wpt/web-platform-tests/interfaces/trusted-types.tentative.idl
@@ -5,34 +5,34 @@ typedef (DOMString or TrustedScript) ScriptString;
 typedef (DOMString or TrustedScriptURL) ScriptURLString;
 typedef (USVString or TrustedURL) URLString;
 
-[Exposed=Window]
+[Exposed=(Window, Worker)]
 interface TrustedHTML {
     stringifier;
 };
 
-[Exposed=Window]
+[Exposed=(Window, Worker)]
 interface TrustedScript {
     stringifier;
 };
 
-[Exposed=Window]
+[Exposed=(Window, Worker)]
 interface TrustedScriptURL {
     stringifier;
 };
 
-[Exposed=Window]
+[Exposed=(Window, Worker)]
 interface TrustedURL {
     stringifier;
 };
 
-[Exposed=Window]
+[Exposed=(Window, Worker)]
 interface TrustedTypePolicyFactory {
     [Unforgeable] TrustedTypePolicy createPolicy(DOMString policyName, TrustedTypePolicyOptions policyOptions);
     // All the policy object names that have been created
     [Unforgeable] sequence<DOMString> getPolicyNames();
 };
 
-[Exposed=Window]
+[Exposed=(Window, Worker)]
 interface TrustedTypePolicy {
     [Unforgeable] readonly attribute DOMString name;
     [Unforgeable] TrustedHTML createHTML(DOMString input);
diff --git a/tests/wpt/web-platform-tests/scroll-animations/constructor-no-document.html b/tests/wpt/web-platform-tests/scroll-animations/constructor-no-document.html
new file mode 100644
index 00000000000..63c0665a8be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-animations/constructor-no-document.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>ScrollTimeline constructor - no document</title>
+<link rel="help" href="https://wicg.github.io/scroll-animations/#scrolltimeline-interface">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script>
+'use strict';
+
+test(function() {
+  document.documentElement.remove();
+  assert_equals(document.scrollingElement, null);
+
+  const timeline = new ScrollTimeline({timeRange: 100});
+  assert_equals(timeline.scrollSource, null);
+  assert_equals(timeline.currentTime, null);
+}, 'The scrollSource can be null if the document.scrollingElement does not exist');
+</script>
diff --git a/tests/wpt/web-platform-tests/scroll-animations/constructor.html b/tests/wpt/web-platform-tests/scroll-animations/constructor.html
new file mode 100644
index 00000000000..a449b32d2be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-animations/constructor.html
@@ -0,0 +1,264 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>ScrollTimeline constructor</title>
+  <link rel="help" href="https://wicg.github.io/scroll-animations/#scrolltimeline-interface">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<style>
+.scroller {
+  height: 100px;
+  width: 100px;
+  overflow: scroll;
+}
+
+.content {
+  height: 500px;
+  width: 500px;
+}
+</style>
+
+<div class="scroller">
+  <div class="content"></div>
+</div>
+
+<script>
+'use strict';
+
+// TODO(smcgruer): In many of the tests below, timeRange is specified when it
+// should not need to be. This is an artifact of the initial Chrome
+// implementation which doesn't support timeRange: 'auto'. These should be
+// removed in the future.
+
+// scrollSource
+
+test(t => {
+  const scroller = document.querySelector('.scroller');
+  assert_equals(
+      new ScrollTimeline({scrollSource: scroller, timeRange: 100}).scrollSource,
+      scroller);
+}, 'A ScrollTimeline can be created with a scrollSource');
+
+test(t => {
+  const div = document.createElement('div');
+  assert_equals(
+      new ScrollTimeline({scrollSource: div, timeRange: 100}).scrollSource,
+      div);
+}, 'A ScrollTimeline can be created with a non-scrolling scrollSource');
+
+test(t => {
+  assert_equals(
+      new ScrollTimeline({scrollSource: null, timeRange: 100}).scrollSource,
+      document.scrollingElement);
+  // The default value for scrollSource should also map to the
+  // document.scrollingElement.
+  assert_equals(
+      new ScrollTimeline({timeRange: 100}).scrollSource,
+      document.scrollingElement);
+}, 'A ScrollTimeline created with a null scrollSource should use the document.scrollingElement');
+
+// orientation
+
+test(t => {
+  assert_equals(new ScrollTimeline({timeRange: 100}).orientation, 'block');
+}, 'A ScrollTimeline created with the default orientation should default to \'block\'');
+
+const gValidOrientationValues = [
+  'block',
+  'inline',
+  'horizontal',
+  'vertical',
+];
+
+for (let orientation of gValidOrientationValues) {
+  test(function() {
+    const scrollTimeline =
+        new ScrollTimeline({orientation: orientation, timeRange: 100});
+    assert_equals(scrollTimeline.orientation, orientation);
+  }, '\'' + orientation + '\' is a valid orientation value');
+}
+
+test(t => {
+  let constructorFunc = function() {
+    new ScrollTimeline({orientation: 'nonsense', timeRange: 100})
+  };
+  assert_throws(TypeError(), constructorFunc);
+
+  // 'auto' for orientation was previously in the spec, but was removed. Make
+  // sure that implementations do not support it.
+  constructorFunc = function() {
+    new ScrollTimeline({orientation: 'auto', timeRange: 100})
+  };
+  assert_throws(TypeError(), constructorFunc);
+}, 'Creating a ScrollTimeline with an invalid orientation value should throw');
+
+// startScrollOffset and endScrollOffset
+
+test(t => {
+  assert_equals(new ScrollTimeline({timeRange: 100}).startScrollOffset, 'auto');
+}, 'A ScrollTimeline created with the default startScrollOffset should default to \'auto\'');
+
+test(t => {
+  assert_equals(new ScrollTimeline({timeRange: 100}).endScrollOffset, 'auto');
+}, 'A ScrollTimeline created with the default endScrollOffset should default to \'auto\'');
+
+const gValidScrollOffsetValues = [
+  'auto',
+  0,
+  'calc(100% - 80px)',
+];
+
+const gValidScrollOffsetSuffixes = [
+  // Relative lengths.
+  'em',
+  'ex',
+  'ch',
+  'rem',
+  'vw',
+  'vh',
+  'vmin',
+  'vmax',
+  // Absolute lengths.
+  'cm',
+  'mm',
+  'q',
+  'in',
+  'pc',
+  'pt',
+  'px',
+  // Percentage.
+  '%',
+];
+
+for (let offset of gValidScrollOffsetValues) {
+  test(function() {
+    const scrollTimeline = new ScrollTimeline(
+        {timeRange: 100, startScrollOffset: offset, endScrollOffset: offset});
+
+    // Special case for 0; this is a valid value, but like computed style will
+    // be output as '0px' when queried.
+    if (offset === 0) offset = '0px';
+
+    assert_equals(scrollTimeline.startScrollOffset, offset);
+    assert_equals(scrollTimeline.endScrollOffset, offset);
+  }, '\'' + offset + '\' is a valid scroll offset value');
+}
+
+for (const suffix of gValidScrollOffsetSuffixes) {
+  test(function() {
+    const offset = '75' + suffix;
+    const scrollTimeline = new ScrollTimeline(
+        {timeRange: 100, startScrollOffset: offset, endScrollOffset: offset});
+
+    assert_equals(scrollTimeline.startScrollOffset, offset);
+    assert_equals(scrollTimeline.endScrollOffset, offset);
+  }, '\'' + suffix + '\' is a valid scroll offset unit');
+}
+
+// These are deliberately incomplete, just a random sampling of invalid
+// values/units.
+const gInvalidScrollOffsetValues = [
+  '',
+  'calc(360deg / 4)',
+  'left',
+  '#ff0000',
+  'rgb(0, 128, 0)',
+  'url("http://www.example.com/pinkish.gif")',
+  'this_is_garbage',
+  // Multiple valid values.
+  '100px 5%',
+];
+
+const gInvalidScrollOffsetSuffixes = [
+  'deg',
+  's',
+  'Hz',
+  'dpi',
+];
+
+for (const offset of gInvalidScrollOffsetValues) {
+  test(function() {
+    const constructorFunc = function() {
+      new ScrollTimeline(
+          {timeRange: 100, startScrollOffset: offset, endScrollOffset: offset})
+    };
+    assert_throws(new TypeError(), constructorFunc);
+  }, '\'' + offset + '\' is an invalid scroll offset value');
+}
+
+for (const suffix of gInvalidScrollOffsetSuffixes) {
+  test(function() {
+    const offset = '75' + suffix;
+    const constructorFunc = function() {
+      new ScrollTimeline(
+          {timeRange: 100, startScrollOffset: offset, endScrollOffset: offset});
+    };
+    assert_throws(new TypeError(), constructorFunc);
+  }, '\'' + suffix + '\' is an invalid scroll offset unit');
+}
+
+// timeRange
+
+test(function() {
+  assert_equals(new ScrollTimeline().timeRange, 'auto');
+}, 'A ScrollTimeline created with the default timeRange should default to \'auto\'');
+
+const gValidTimeRangeValues = [
+  'auto',
+  0,
+  -100,
+  100,
+  1234.5678,
+];
+
+for (let timeRange of gValidTimeRangeValues) {
+  test(function() {
+    const scrollTimeline = new ScrollTimeline({timeRange: timeRange});
+    assert_equals(scrollTimeline.timeRange, timeRange);
+  }, '\'' + timeRange + '\' is a valid timeRange value');
+}
+
+const gInvalidTimeRangeValues = [
+  'invalid',
+  Infinity,
+  -Infinity,
+  NaN,
+];
+
+for (let timeRange of gInvalidTimeRangeValues) {
+  test(function() {
+    const constructorFunc = function() {
+      new ScrollTimeline({timeRange: timeRange});
+    };
+    assert_throws(new TypeError(), constructorFunc);
+  }, '\'' + timeRange + '\' is an invalid timeRange value');
+}
+
+// fill
+
+test(function() {
+  assert_equals(new ScrollTimeline({timeRange: 100}).fill, 'none');
+}, 'A ScrollTimeline created with the default fill should default to \'none\'');
+
+const gValidFillValues = [
+  'none',
+  'forwards',
+  'backwards',
+  'both',
+  'auto',
+];
+
+for (let fill of gValidFillValues) {
+  test(function() {
+    const scrollTimeline = new ScrollTimeline({fill: fill, timeRange: 100});
+    assert_equals(scrollTimeline.fill, fill);
+  }, '\'' + fill + '\' is a valid fill value');
+}
+
+test(t => {
+  let constructorFunc = function() {
+    new ScrollTimeline({fill: 'nonsense', timeRange: 100})
+  };
+  assert_throws(TypeError(), constructorFunc);
+}, 'Creating a ScrollTimeline with an invalid fill value should throw');
+</script>
diff --git a/tests/wpt/web-platform-tests/tools/lint/lint.py b/tests/wpt/web-platform-tests/tools/lint/lint.py
index 3973dda3b94..9976314c8fb 100644
--- a/tests/wpt/web-platform-tests/tools/lint/lint.py
+++ b/tests/wpt/web-platform-tests/tools/lint/lint.py
@@ -71,6 +71,9 @@ def all_filesystem_paths(repo_root, subdir=None):
     for dirpath, dirnames, filenames in path_filter(walk(expanded_path)):
         for filename, _ in filenames:
             path = os.path.join(dirpath, filename)
+            if subdir:
+                path = os.path.join(subdir, path)
+            assert not os.path.isabs(path), path
             yield path
 
 
diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/test_lint.py b/tests/wpt/web-platform-tests/tools/lint/tests/test_lint.py
index 6b484ea24b5..dbd4708cdc9 100644
--- a/tests/wpt/web-platform-tests/tools/lint/tests/test_lint.py
+++ b/tests/wpt/web-platform-tests/tools/lint/tests/test_lint.py
@@ -415,6 +415,23 @@ def test_all_filesystem_paths():
                        os.path.join('dir_a', 'file_d')]
 
 
+def test_filesystem_paths_subdir():
+    with mock.patch(
+            'tools.lint.lint.walk',
+            return_value=[('',
+                           [('dir_a', None), ('dir_b', None)],
+                           [('file_a', None), ('file_b', None)]),
+                          ('dir_a',
+                           [],
+                           [('file_c', None), ('file_d', None)])]
+    ):
+        got = list(lint_mod.all_filesystem_paths('.', 'dir'))
+        assert got == [os.path.join('dir', 'file_a'),
+                       os.path.join('dir', 'file_b'),
+                       os.path.join('dir', 'dir_a', 'file_c'),
+                       os.path.join('dir', 'dir_a', 'file_d')]
+
+
 def test_main_with_args():
     orig_argv = sys.argv
     try:
diff --git a/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py b/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py
index 1f08088eb46..d2e5df85526 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py
@@ -164,6 +164,8 @@ class SourceFile(object):
         :param contents: Byte array of the contents of the file or ``None``.
         """
 
+        assert not os.path.isabs(rel_path), rel_path
+
         self.tests_root = tests_root
         if os.name == "nt":
             # do slash normalization on Windows
diff --git a/tests/wpt/web-platform-tests/tools/manifest/utils.py b/tests/wpt/web-platform-tests/tools/manifest/utils.py
index d9be750e416..9da79f6deb4 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/utils.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/utils.py
@@ -4,7 +4,7 @@ import os
 from six import BytesIO
 
 def rel_path_to_url(rel_path, url_base="/"):
-    assert not os.path.isabs(rel_path)
+    assert not os.path.isabs(rel_path), rel_path
     if url_base[0] != "/":
         url_base = "/" + url_base
     if url_base[-1] != "/":
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/fennec.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/fennec.py
index 457565e84d8..a7009dd26b3 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/fennec.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/fennec.py
@@ -1,8 +1,5 @@
 import os
-import signal
-import sys
 import tempfile
-import traceback
 
 import moznetwork
 from mozprocess import ProcessHandler
@@ -193,6 +190,7 @@ class FennecBrowser(FirefoxBrowser):
 
         write_hosts_file(self.config, self.runner.device.device)
 
+        self.runner.stop()
         self.runner.start(debug_args=debug_args, interactive=self.debug_info and self.debug_info.interactive)
 
         self.runner.device.device.forward(
@@ -203,22 +201,14 @@ class FennecBrowser(FirefoxBrowser):
 
     def stop(self, force=False):
         if self.runner is not None:
-            try:
-                if self.runner.device.connected:
-                    if len(self.runner.device.device.list_forwards()) > 0:
-                        self.runner.device.device.remove_forwards(
-                            "tcp:{}".format(self.marionette_port))
-            except Exception:
-                traceback.print_exception(*sys.exc_info())
+            if (self.runner.device.connected and
+                len(self.runner.device.device.list_forwards()) > 0):
+                try:
+                    self.runner.device.device.remove_forwards(
+                        "tcp:{}".format(self.marionette_port))
+                except Exception:
+                    self.logger.warning("Failed to remove port forwarding")
             # We assume that stopping the runner prompts the
             # browser to shut down. This allows the leak log to be written
             self.runner.stop()
-            for clean, stop_f in [(True, lambda: self.runner.wait(self.shutdown_timeout)),
-                                  (False, lambda: self.runner.stop(signal.SIGTERM)),
-                                  (False, lambda: self.runner.stop(signal.SIGKILL))]:
-                if not force or not clean:
-                    retcode = stop_f()
-                    if retcode is not None:
-                        self.logger.info("Browser exited with return code %s" % retcode)
-                        break
         self.logger.debug("stopped")
diff --git a/tests/wpt/web-platform-tests/trusted-types/WorkerGlobalScope-importScripts.https.html b/tests/wpt/web-platform-tests/trusted-types/WorkerGlobalScope-importScripts.https.html
new file mode 100644
index 00000000000..30dea82077c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/trusted-types/WorkerGlobalScope-importScripts.https.html
@@ -0,0 +1,42 @@
+<!doctype html>
+<html>
+<head>
+  <meta http-equiv="Content-Security-Policy" content="trusted-types *">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id=log></div>
+
+<script>
+
+// To test workers, we need to importScripts source files in the workers.
+// Since the point of this test is to test blocking of importScripts, we need
+// to set up one policy that will blindly pass through URLs for use in the test
+// setup, and then have additional policies for the actual test cases.
+//
+// For the same reason we cannot use the otherwise preferred 'META: workers'
+// tag, since the test setup that uses would be blocked as soon trusted types
+// enforcement is enabled.
+const test_setup_policy = TrustedTypes.createPolicy("hurrayanythinggoes", {
+  createScriptURL: x => new URL(x, location.href)
+});
+const test_url =
+  test_setup_policy.createScriptURL("WorkerGlobalScope-importScripts.https.js");
+
+fetch_tests_from_worker(new Worker(test_url));
+
+fetch_tests_from_worker(new SharedWorker(test_url));
+
+// Cargo-culted from code generated from "META: worker".
+if ('serviceWorker' in navigator) {
+  (async function() {
+      const scope = 'some/scope/for/this/test';
+      let reg = await navigator.serviceWorker.getRegistration(scope);
+      if (reg) await reg.unregister();
+      reg = await navigator.serviceWorker.register(test_url, {scope});
+      fetch_tests_from_worker(reg.installing);
+  })();
+}
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/trusted-types/WorkerGlobalScope-importScripts.https.js b/tests/wpt/web-platform-tests/trusted-types/WorkerGlobalScope-importScripts.https.js
new file mode 100644
index 00000000000..4e491b9fe60
--- /dev/null
+++ b/tests/wpt/web-platform-tests/trusted-types/WorkerGlobalScope-importScripts.https.js
@@ -0,0 +1,70 @@
+
+let test_setup_policy = TrustedTypes.createPolicy("hurrayanythinggoes", {
+  createScriptURL: x => new URL(x, location.href)
+});
+importScripts(test_setup_policy.createScriptURL("/resources/testharness.js"));
+
+
+// Determine worker type (for better logging)
+let worker_type = "unknown";
+if (this.DedicatedWorkerGlobalScope !== undefined) {
+  worker_type = "dedicated worker";
+} else if (this.SharedWorkerGlobalScope !== undefined) {
+  worker_type = "shared worker";
+} else if (this.ServiceWorkerGlobalScope !== undefined) {
+  worker_type = "service worker";
+}
+
+const test_policy = TrustedTypes.createPolicy('xxx', {
+  createScriptURL: url => new URL(url.replace("play", "work"), this.location.href) });
+
+test(t => {
+  self.result = "Fail";
+  let trusted_url = test_policy.createScriptURL(new URL("support/player.js", location.href));
+  assert_true(TrustedTypes.isScriptURL(trusted_url));
+  importScripts(trusted_url);  // support/worker.js modifies self.result.
+  assert_equals(self.result, "Pass");
+}, "importScripts with TrustedScriptURL works in " + worker_type);
+
+test(t => {
+  let untrusted_url = "support/player.js";
+  assert_throws(new TypeError(),
+    function() { importScripts(untrusted_url) },
+    "importScripts(untrusted_url)");
+}, "importScripts with untrusted URLs throws in " + worker_type);
+
+test(t => {
+  assert_throws(new TypeError(),
+    function() { importScripts(null) },
+    "importScripts(null)");
+}, "null is not a trusted script URL throws in " + worker_type);
+
+test(t => {
+  self.result = "Fail";
+  let trusted_url = test_policy.createScriptURL(
+      new URL("support/player.js?variant1", location.href));
+  let trusted_url2 = test_policy.createScriptURL(
+      new URL("support/player.js?variant2", location.href));
+  importScripts(trusted_url, trusted_url2);
+  assert_equals(self.result, "Pass");
+}, "importScripts with two URLs, both trusted, in " + worker_type);
+
+test(t => {
+  let untrusted_url = "support/player.js?variant1";
+  let untrusted_url2 = "support/player.js?variant2";
+  assert_throws(new TypeError(),
+    function() { importScripts(untrusted_url, untrusted_url2) },
+    "importScripts(untrusted_url, untrusted_url2)");
+}, "importScripts with two URLs, both strings, in " + worker_type);
+
+test(t => {
+  let untrusted_url = "support/player.js";
+  let trusted_url = test_policy.createScriptURL(
+      new URL(untrusted_url, location.href));
+  assert_throws(new TypeError(),
+    function() { importScripts(untrusted_url, trusted_url) },
+    "importScripts(untrusted_url, trusted_url)");
+}, "importScripts with two URLs, one trusted, in " + worker_type);
+
+done();
+
diff --git a/tests/wpt/web-platform-tests/trusted-types/WorkerGlobalScope-importScripts.https.js.headers b/tests/wpt/web-platform-tests/trusted-types/WorkerGlobalScope-importScripts.https.js.headers
new file mode 100644
index 00000000000..1bc33add09b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/trusted-types/WorkerGlobalScope-importScripts.https.js.headers
@@ -0,0 +1 @@
+Content-Security-Policy: trusted-types *
diff --git a/tests/wpt/web-platform-tests/trusted-types/support/worker.js b/tests/wpt/web-platform-tests/trusted-types/support/worker.js
new file mode 100644
index 00000000000..4079f7e9c79
--- /dev/null
+++ b/tests/wpt/web-platform-tests/trusted-types/support/worker.js
@@ -0,0 +1 @@
+self.result = "Pass";