diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index 7a6d4c32b27..cccf1d3d8c5 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -38,8 +38,6 @@ prefs:"layout.writing-mode.enabled" == iframe/size_attributes_vertical_writing_m
flaky_cpu == linebreak_simple_a.html linebreak_simple_b.html
# Fails intermittently (#3636)
# == link_style_dynamic_addition.html link_style_dynamic_addition_ref.html
-== ol_japanese_iroha_a.html ol_japanese_iroha_ref.html
-!= ol_japanese_iroha_bullet_styles.html ol_japanese_iroha_ref.html
# Should be == with expected failure. See #2797
!= overconstrained_block.html overconstrained_block_ref.html
== overflow_auto.html overflow_simple_b.html
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 459b29c4ec4..277002d10d5 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -2839,6 +2839,30 @@
"url": "/_mozilla/css/octicons_a.html"
}
],
+ "css/ol_japanese_iroha_a.html": [
+ {
+ "path": "css/ol_japanese_iroha_a.html",
+ "references": [
+ [
+ "/_mozilla/css/ol_japanese_iroha_ref.html",
+ "=="
+ ]
+ ],
+ "url": "/_mozilla/css/ol_japanese_iroha_a.html"
+ }
+ ],
+ "css/ol_japanese_iroha_bullet_styles.html": [
+ {
+ "path": "css/ol_japanese_iroha_bullet_styles.html",
+ "references": [
+ [
+ "/_mozilla/css/ol_japanese_iroha_ref.html",
+ "!="
+ ]
+ ],
+ "url": "/_mozilla/css/ol_japanese_iroha_bullet_styles.html"
+ }
+ ],
"css/ol_simple_a.html": [
{
"path": "css/ol_simple_a.html",
@@ -8112,6 +8136,30 @@
"url": "/_mozilla/css/octicons_a.html"
}
],
+ "css/ol_japanese_iroha_a.html": [
+ {
+ "path": "css/ol_japanese_iroha_a.html",
+ "references": [
+ [
+ "/_mozilla/css/ol_japanese_iroha_ref.html",
+ "=="
+ ]
+ ],
+ "url": "/_mozilla/css/ol_japanese_iroha_a.html"
+ }
+ ],
+ "css/ol_japanese_iroha_bullet_styles.html": [
+ {
+ "path": "css/ol_japanese_iroha_bullet_styles.html",
+ "references": [
+ [
+ "/_mozilla/css/ol_japanese_iroha_ref.html",
+ "!="
+ ]
+ ],
+ "url": "/_mozilla/css/ol_japanese_iroha_bullet_styles.html"
+ }
+ ],
"css/ol_simple_a.html": [
{
"path": "css/ol_simple_a.html",
diff --git a/tests/ref/fonts/takao-p-gothic/COPYING.html b/tests/wpt/mozilla/tests/css/fonts/takao-p-gothic/COPYING.html
similarity index 100%
rename from tests/ref/fonts/takao-p-gothic/COPYING.html
rename to tests/wpt/mozilla/tests/css/fonts/takao-p-gothic/COPYING.html
diff --git a/tests/ref/fonts/takao-p-gothic/TakaoPGothic.ttf b/tests/wpt/mozilla/tests/css/fonts/takao-p-gothic/TakaoPGothic.ttf
similarity index 100%
rename from tests/ref/fonts/takao-p-gothic/TakaoPGothic.ttf
rename to tests/wpt/mozilla/tests/css/fonts/takao-p-gothic/TakaoPGothic.ttf
diff --git a/tests/ref/ol_japanese_iroha_a.html b/tests/wpt/mozilla/tests/css/ol_japanese_iroha_a.html
similarity index 90%
rename from tests/ref/ol_japanese_iroha_a.html
rename to tests/wpt/mozilla/tests/css/ol_japanese_iroha_a.html
index 8c1aedd9965..2a20d40f01d 100644
--- a/tests/ref/ol_japanese_iroha_a.html
+++ b/tests/wpt/mozilla/tests/css/ol_japanese_iroha_a.html
@@ -2,6 +2,7 @@
+