diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index 21ed4be1575..7a6d4c32b27 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -38,7 +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
-!= octicons_a.html octicons_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
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 08f559d03ca..459b29c4ec4 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -2827,6 +2827,18 @@
"url": "/_mozilla/css/object_element_a.html"
}
],
+ "css/octicons_a.html": [
+ {
+ "path": "css/octicons_a.html",
+ "references": [
+ [
+ "/_mozilla/css/octicons_ref.html",
+ "!="
+ ]
+ ],
+ "url": "/_mozilla/css/octicons_a.html"
+ }
+ ],
"css/ol_simple_a.html": [
{
"path": "css/ol_simple_a.html",
@@ -8088,6 +8100,18 @@
"url": "/_mozilla/css/object_element_a.html"
}
],
+ "css/octicons_a.html": [
+ {
+ "path": "css/octicons_a.html",
+ "references": [
+ [
+ "/_mozilla/css/octicons_ref.html",
+ "!="
+ ]
+ ],
+ "url": "/_mozilla/css/octicons_a.html"
+ }
+ ],
"css/ol_simple_a.html": [
{
"path": "css/ol_simple_a.html",
diff --git a/tests/ref/fonts/octicons/LICENSE.txt b/tests/wpt/mozilla/tests/css/fonts/octicons/LICENSE.txt
similarity index 100%
rename from tests/ref/fonts/octicons/LICENSE.txt
rename to tests/wpt/mozilla/tests/css/fonts/octicons/LICENSE.txt
diff --git a/tests/ref/fonts/octicons/octicons.ttf b/tests/wpt/mozilla/tests/css/fonts/octicons/octicons.ttf
similarity index 100%
rename from tests/ref/fonts/octicons/octicons.ttf
rename to tests/wpt/mozilla/tests/css/fonts/octicons/octicons.ttf
diff --git a/tests/ref/octicons_a.html b/tests/wpt/mozilla/tests/css/octicons_a.html
similarity index 82%
rename from tests/ref/octicons_a.html
rename to tests/wpt/mozilla/tests/css/octicons_a.html
index eb3a4a97b82..61d70be6d78 100644
--- a/tests/ref/octicons_a.html
+++ b/tests/wpt/mozilla/tests/css/octicons_a.html
@@ -1,6 +1,7 @@
+