diff --git a/components/layout_2020/flow/inline.rs b/components/layout_2020/flow/inline.rs
index 5cee99440ad..bab919f38c9 100644
--- a/components/layout_2020/flow/inline.rs
+++ b/components/layout_2020/flow/inline.rs
@@ -567,7 +567,10 @@ fn layout_atomic<'box_tree>(
         },
     };
 
-    ifc.inline_position += pbm.inline_end;
+    ifc.inline_position += pbm.inline_end + fragment.content_rect.size.inline;
+    ifc.current_nesting_level
+        .max_block_size_of_fragments_so_far
+        .max_assign(pbm.block_sum() + fragment.content_rect.size.block);
     ifc.current_nesting_level
         .fragments_so_far
         .push(Fragment::Box(fragment));
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-087.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-087.xht.ini
deleted file mode 100644
index f3d35d47e05..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-087.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-087.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-182.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-182.xht.ini
deleted file mode 100644
index 39f324866e2..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-182.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-182.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-328.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-328.xht.ini
deleted file mode 100644
index ef0c7a12c75..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-328.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-328.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-329.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-329.xht.ini
deleted file mode 100644
index fd3a246765d..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-329.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-329.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-002.xht.ini
deleted file mode 100644
index d7e7c04eb59..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-002.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-002.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-003.xht.ini
deleted file mode 100644
index 89aa253960a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-003.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-003.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-004.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-004.xht.ini
deleted file mode 100644
index fe728703ba9..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-004.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-004.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-005.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-005.xht.ini
deleted file mode 100644
index 265658b8b22..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-005.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-005.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-006.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-006.xht.ini
deleted file mode 100644
index 02e70e2912c..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-006.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-006.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-009.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-009.xht.ini
deleted file mode 100644
index f1c5adeaa58..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-009.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-009.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-010.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-010.xht.ini
deleted file mode 100644
index a15b1da570f..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-010.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-010.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-011.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-011.xht.ini
deleted file mode 100644
index 99f137509b7..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-011.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-011.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-012.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-012.xht.ini
deleted file mode 100644
index 0a4edc2afbd..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-012.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-012.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-014.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-014.xht.ini
deleted file mode 100644
index 428fbb7609b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-014.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-014.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-015.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-015.xht.ini
deleted file mode 100644
index fb26a7c013a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-015.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-015.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-016.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-016.xht.ini
deleted file mode 100644
index 8b93cf78899..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-016.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-016.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-017.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-017.xht.ini
deleted file mode 100644
index 059c2b881a4..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-017.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-017.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-019.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-019.xht.ini
deleted file mode 100644
index 64fdb64d64e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-019.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-019.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-020.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-020.xht.ini
deleted file mode 100644
index 15499664858..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-020.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-020.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-021.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-021.xht.ini
deleted file mode 100644
index b8ff54b24ad..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-021.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-021.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-022.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-022.xht.ini
deleted file mode 100644
index 68862d42237..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-022.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-022.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-025.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-025.xht.ini
deleted file mode 100644
index e36a26d1383..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-025.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-025.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-026.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-026.xht.ini
deleted file mode 100644
index dacbcd933ea..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-026.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-026.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-027.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-027.xht.ini
deleted file mode 100644
index c34002f1427..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-027.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-027.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-028.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-028.xht.ini
deleted file mode 100644
index 35fbdd33f56..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-028.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-028.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-029.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-029.xht.ini
deleted file mode 100644
index 761e5453e15..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-029.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-029.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-032.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-032.xht.ini
deleted file mode 100644
index e88eca30d47..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-032.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-032.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-033.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-033.xht.ini
deleted file mode 100644
index d3e3ea6cbdc..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-033.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-033.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-034.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-034.xht.ini
deleted file mode 100644
index d82fbab02b9..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-034.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-034.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-035.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-035.xht.ini
deleted file mode 100644
index db56d5fd5f1..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-035.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-035.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-037.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-037.xht.ini
deleted file mode 100644
index 4086080ed84..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-037.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-037.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-038.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-038.xht.ini
deleted file mode 100644
index 507f883748c..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-038.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-038.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-039.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-039.xht.ini
deleted file mode 100644
index 40f1b60d49d..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-039.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-039.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-040.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-040.xht.ini
deleted file mode 100644
index 03158c0ed95..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-040.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-040.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-042.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-042.xht.ini
deleted file mode 100644
index 35dace391b8..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-042.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-042.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-043.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-043.xht.ini
deleted file mode 100644
index 05c331ae381..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-043.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-043.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-044.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-044.xht.ini
deleted file mode 100644
index 6fa2eaffc12..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-044.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-044.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-045.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-045.xht.ini
deleted file mode 100644
index c2fd95812a3..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-045.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-045.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-047.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-047.xht.ini
deleted file mode 100644
index 52ac879f2b1..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-047.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-047.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-048.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-048.xht.ini
deleted file mode 100644
index 6a153227055..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-048.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-048.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-049.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-049.xht.ini
deleted file mode 100644
index 36578fc779b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-049.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-049.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-050.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-050.xht.ini
deleted file mode 100644
index cd48f07e8f5..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-050.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-050.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-051.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-051.xht.ini
deleted file mode 100644
index 317dad1e15d..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-051.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-051.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-052.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-052.xht.ini
deleted file mode 100644
index 1dc695405af..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-052.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-052.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-053.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-053.xht.ini
deleted file mode 100644
index a449bcbcf9b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-053.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-053.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-054.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-054.xht.ini
deleted file mode 100644
index 1760937a5f7..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-054.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-054.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-055.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-055.xht.ini
deleted file mode 100644
index 9043bdfe325..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-055.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-055.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-056.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-056.xht.ini
deleted file mode 100644
index 4404a5d97d9..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-056.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-056.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-057.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-057.xht.ini
deleted file mode 100644
index 8f29c8ac868..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-057.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-057.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-058.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-058.xht.ini
deleted file mode 100644
index e7b17735439..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-058.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-058.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-059.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-059.xht.ini
deleted file mode 100644
index 5a8c3f093f0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-059.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-059.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-060.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-060.xht.ini
deleted file mode 100644
index 70019ddbc8c..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-060.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-060.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-061.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-061.xht.ini
deleted file mode 100644
index 3d3bef50b69..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-061.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-061.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-062.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-062.xht.ini
deleted file mode 100644
index 34cb7299dd9..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-062.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-062.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-063.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-063.xht.ini
deleted file mode 100644
index ce4fb0f0182..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-063.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-063.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-064.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-064.xht.ini
deleted file mode 100644
index 51c47a93413..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-064.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-064.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-065.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-065.xht.ini
deleted file mode 100644
index fe7a0c89994..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-065.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-065.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-066.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-066.xht.ini
deleted file mode 100644
index 8bd3ad14011..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-066.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-066.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-067.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-067.xht.ini
deleted file mode 100644
index 0fcc828f5e8..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-067.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-067.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-068.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-068.xht.ini
deleted file mode 100644
index 3486beafca9..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-068.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-068.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-069.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-069.xht.ini
deleted file mode 100644
index bf989d3bb26..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-069.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-069.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-070.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-070.xht.ini
deleted file mode 100644
index 73c3b86e2c2..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-070.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-070.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-071.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-071.xht.ini
deleted file mode 100644
index 1ae8a11abee..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-071.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-071.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-072.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-072.xht.ini
deleted file mode 100644
index aa71546b733..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-072.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-072.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-073.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-073.xht.ini
deleted file mode 100644
index bfa560bfcca..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-073.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-073.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-074.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-074.xht.ini
deleted file mode 100644
index 72449b63a0e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-074.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-074.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-075.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-075.xht.ini
deleted file mode 100644
index 71dfabb6445..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-075.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-075.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-076.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-076.xht.ini
deleted file mode 100644
index 917be8c99df..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-076.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-076.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-077.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-077.xht.ini
deleted file mode 100644
index 4be69293cda..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-077.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-077.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-078.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-078.xht.ini
deleted file mode 100644
index 2a194c1001e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-078.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-078.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-079.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-079.xht.ini
deleted file mode 100644
index cc9ca76ed24..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-079.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-079.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-080.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-080.xht.ini
deleted file mode 100644
index bd1aeaa3099..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-080.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-080.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-081.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-081.xht.ini
deleted file mode 100644
index b5fdd5b43d2..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-081.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-081.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-082.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-082.xht.ini
deleted file mode 100644
index 25b3f156fcf..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-082.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-082.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-083.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-083.xht.ini
deleted file mode 100644
index 603ba94a981..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-083.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-083.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-084.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-084.xht.ini
deleted file mode 100644
index 87b37e92b27..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-084.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-084.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-085.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-085.xht.ini
deleted file mode 100644
index e3c81f9bb01..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-085.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-085.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-086.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-086.xht.ini
deleted file mode 100644
index 62c0b21ec44..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-086.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-086.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-087.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-087.xht.ini
deleted file mode 100644
index c564ed983e6..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-087.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-087.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-088.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-088.xht.ini
deleted file mode 100644
index fe6b9bf82ec..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-088.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-088.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-089.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-089.xht.ini
deleted file mode 100644
index b8d04a6c1ff..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-089.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-089.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-090.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-090.xht.ini
deleted file mode 100644
index 859d34fff8c..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-090.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-090.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-091.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-091.xht.ini
deleted file mode 100644
index 4a67fc3a847..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-091.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-091.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-092.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-092.xht.ini
deleted file mode 100644
index 67c4bec3c13..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-092.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-092.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-093.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-093.xht.ini
deleted file mode 100644
index 89edcf6ed94..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-093.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-093.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-094.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-094.xht.ini
deleted file mode 100644
index fa5d4703227..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-094.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-094.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-095.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-095.xht.ini
deleted file mode 100644
index d1abbff0ee9..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-095.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-095.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-096.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-096.xht.ini
deleted file mode 100644
index c3a0bd6d890..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-096.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-096.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-097.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-097.xht.ini
deleted file mode 100644
index e2ad73bccdf..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-097.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-097.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-098.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-098.xht.ini
deleted file mode 100644
index ef60e78f8e0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-098.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-098.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-099.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-099.xht.ini
deleted file mode 100644
index 43889956719..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-099.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-099.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-100.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-100.xht.ini
deleted file mode 100644
index 0e47d525159..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-100.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-100.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-101.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-101.xht.ini
deleted file mode 100644
index 137e774041a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-101.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-101.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-102.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-102.xht.ini
deleted file mode 100644
index 553d3c5eac8..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-102.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-102.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-103.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-103.xht.ini
deleted file mode 100644
index f19c729eb6a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-103.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-103.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-104.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-104.xht.ini
deleted file mode 100644
index 6d00591c2bc..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-104.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-104.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-105.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-105.xht.ini
deleted file mode 100644
index e8436d39cf0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-105.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-105.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-106.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-106.xht.ini
deleted file mode 100644
index 1ad14cb96b6..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-106.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-106.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-107.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-107.xht.ini
deleted file mode 100644
index 7b29c8792a0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-107.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-107.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-108.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-108.xht.ini
deleted file mode 100644
index 1e59af26a06..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-108.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-108.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-109.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-109.xht.ini
deleted file mode 100644
index 867ff916e46..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-109.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-109.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-110.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-110.xht.ini
deleted file mode 100644
index b2ccdaeef55..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-110.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-110.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-111.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-111.xht.ini
deleted file mode 100644
index eb02697a514..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-111.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-111.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-112.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-112.xht.ini
deleted file mode 100644
index 64f6c133203..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-112.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-112.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-113.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-113.xht.ini
deleted file mode 100644
index 36afaa12975..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-113.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-113.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-114.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-114.xht.ini
deleted file mode 100644
index fa6d908c91c..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-114.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-114.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-115.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-115.xht.ini
deleted file mode 100644
index 5308bd4df68..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-115.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-115.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-116.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-116.xht.ini
deleted file mode 100644
index 50a1bd2a311..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-116.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-116.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-117.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-117.xht.ini
deleted file mode 100644
index ea3e9611327..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-117.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-117.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-118.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-118.xht.ini
deleted file mode 100644
index 450836522bb..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-118.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-118.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-119.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-119.xht.ini
deleted file mode 100644
index 570ad4f9b4b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-119.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-119.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-120.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-120.xht.ini
deleted file mode 100644
index e8932c630a5..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-120.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-120.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-121.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-121.xht.ini
deleted file mode 100644
index 4c0d0e45150..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-121.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-121.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-122.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-122.xht.ini
deleted file mode 100644
index 856ede0c6b4..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-122.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-122.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-123.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-123.xht.ini
deleted file mode 100644
index 41a602c7f4f..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-123.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-123.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-124.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-124.xht.ini
deleted file mode 100644
index 93c9cfa34c8..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-124.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-124.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-125.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-125.xht.ini
deleted file mode 100644
index c46a6002ef8..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-125.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-125.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-126.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-126.xht.ini
deleted file mode 100644
index 9070a0300cb..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-126.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-126.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-127.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-127.xht.ini
deleted file mode 100644
index b1d0e0dc6fe..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-127.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-127.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-128.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-128.xht.ini
deleted file mode 100644
index 827fa7629c3..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-128.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-128.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-129.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-129.xht.ini
deleted file mode 100644
index 5c3b5122769..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-129.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-129.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-130.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-130.xht.ini
deleted file mode 100644
index ce1d060c88d..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-130.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-130.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-131.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-131.xht.ini
deleted file mode 100644
index 87cba6339e1..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-131.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-131.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-132.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-132.xht.ini
deleted file mode 100644
index 83383403766..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-132.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-132.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-133.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-133.xht.ini
deleted file mode 100644
index e1fcb1128da..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-133.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-133.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-134.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-134.xht.ini
deleted file mode 100644
index ea6523e5d6c..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-134.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-134.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-135.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-135.xht.ini
deleted file mode 100644
index 731d80c935d..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-135.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-135.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-136.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-136.xht.ini
deleted file mode 100644
index 6dd606f7661..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-136.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-136.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-137.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-137.xht.ini
deleted file mode 100644
index 7fcf3c1cfdf..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-137.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-137.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-138.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-138.xht.ini
deleted file mode 100644
index 696816fd001..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-138.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-138.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-139.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-139.xht.ini
deleted file mode 100644
index 7728a9e6c22..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-139.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-139.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-140.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-140.xht.ini
deleted file mode 100644
index cbd0d053ea4..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-140.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-140.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-141.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-141.xht.ini
deleted file mode 100644
index b7f3a9dc742..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-141.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-141.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-142.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-142.xht.ini
deleted file mode 100644
index 543b80c716d..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-142.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-142.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-143.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-143.xht.ini
deleted file mode 100644
index 5ec98cbf000..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-143.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-143.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-144.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-144.xht.ini
deleted file mode 100644
index 876284f5b83..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-144.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-144.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-145.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-145.xht.ini
deleted file mode 100644
index 6633d1c7f89..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-145.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-145.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-175.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-175.xht.ini
deleted file mode 100644
index 1c024177a64..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-color-175.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-color-175.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-repeat-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-repeat-001.xht.ini
deleted file mode 100644
index 17aef412518..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-repeat-001.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-repeat-001.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-009.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-009.xht.ini
deleted file mode 100644
index 4d8ca58286c..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-009.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[containing-block-009.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-030.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-030.xht.ini
deleted file mode 100644
index 2b17df9afe9..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-030.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[containing-block-030.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/generated-content/before-content-display-005.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/generated-content/before-content-display-005.xht.ini
deleted file mode 100644
index 261054ee8df..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/generated-content/before-content-display-005.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[before-content-display-005.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-334.html.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-334.html.ini
deleted file mode 100644
index aedc9115d8f..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-334.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-334.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
new file mode 100644
index 00000000000..e38782d8c85
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
@@ -0,0 +1,4 @@
+[elementFromPoint-001.html]
+  [CSSOM View - 5 - extensions to the Document interface]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/acid2_ref.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/acid2_ref.html.ini
new file mode 100644
index 00000000000..acbcb878252
--- /dev/null
+++ b/tests/wpt/mozilla/meta-layout-2020/css/acid2_ref.html.ini
@@ -0,0 +1,2 @@
+[acid2_ref.html]
+  expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/alpha_gif_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/alpha_gif_a.html.ini
deleted file mode 100644
index 7ef59b05973..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/alpha_gif_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[alpha_gif_a.html]
-  expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/alpha_png_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/alpha_png_a.html.ini
deleted file mode 100644
index c5bfb67615f..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/alpha_png_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[alpha_png_a.html]
-  expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/block_replaced_content_b.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/block_replaced_content_b.html.ini
deleted file mode 100644
index c94aeb74f97..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/block_replaced_content_b.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[block_replaced_content_b.html]
-  expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/css-position-3/position-sticky-right.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/css-position-3/position-sticky-right.html.ini
deleted file mode 100644
index 168e97384fc..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/css-position-3/position-sticky-right.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[position-sticky-right.html]
-  expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/css-position-3/position-sticky-top.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/css-position-3/position-sticky-top.html.ini
new file mode 100644
index 00000000000..62f8d7a2409
--- /dev/null
+++ b/tests/wpt/mozilla/meta-layout-2020/css/css-position-3/position-sticky-top.html.ini
@@ -0,0 +1,2 @@
+[position-sticky-top.html]
+  expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/inline_absolute_hypothetical_line_metrics_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/inline_absolute_hypothetical_line_metrics_a.html.ini
deleted file mode 100644
index 09ed209c08f..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/inline_absolute_hypothetical_line_metrics_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[inline_absolute_hypothetical_line_metrics_a.html]
-  expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/inline_block_explicit_height_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/inline_block_explicit_height_a.html.ini
deleted file mode 100644
index e1b89444321..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/inline_block_explicit_height_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[inline_block_explicit_height_a.html]
-  expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/inline_block_with_margin_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/inline_block_with_margin_a.html.ini
deleted file mode 100644
index 82b40519039..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/inline_block_with_margin_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[inline_block_with_margin_a.html]
-  expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/inline_hypothetical_box_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/inline_hypothetical_box_a.html.ini
deleted file mode 100644
index b3e8ba84005..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/inline_hypothetical_box_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[inline_hypothetical_box_a.html]
-  expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/list_item_marker_around_float.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/list_item_marker_around_float.html.ini
deleted file mode 100644
index 70e3d2c12e8..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/list_item_marker_around_float.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[list_item_marker_around_float.html]
-  expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/margin_padding_inline_block_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/margin_padding_inline_block_a.html.ini
deleted file mode 100644
index 8c194d964d9..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/margin_padding_inline_block_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[margin_padding_inline_block_a.html]
-  expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/vertical_align_inline_block_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/vertical_align_inline_block_a.html.ini
deleted file mode 100644
index 307ea7e4ff5..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/vertical_align_inline_block_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[vertical_align_inline_block_a.html]
-  expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/mozilla/fetch_cannot_overwhelm_system.window.js.ini b/tests/wpt/mozilla/meta-layout-2020/mozilla/fetch_cannot_overwhelm_system.window.js.ini
deleted file mode 100644
index 8a90539b5cf..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/mozilla/fetch_cannot_overwhelm_system.window.js.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[fetch_cannot_overwhelm_system.window.html]
-  expected: CRASH
diff --git a/tests/wpt/mozilla/meta-layout-2020/mozilla/hit_test_pos_fixed.html.ini b/tests/wpt/mozilla/meta-layout-2020/mozilla/hit_test_pos_fixed.html.ini
deleted file mode 100644
index 9f5b10bd6af..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/mozilla/hit_test_pos_fixed.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit_test_pos_fixed.html]
-  [Hit-test of an element with position: fixed should discard scroll offset]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta-layout-2020/mozilla/htmllabel-activation.html.ini b/tests/wpt/mozilla/meta-layout-2020/mozilla/htmllabel-activation.html.ini
deleted file mode 100644
index a5186543e80..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/mozilla/htmllabel-activation.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[htmllabel-activation.html]
-  [If label's 1st child (submit) is disabled, click should have no impact]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta-layout-2020/mozilla/paint_timing.html.ini b/tests/wpt/mozilla/meta-layout-2020/mozilla/paint_timing.html.ini
new file mode 100644
index 00000000000..c79dd44c777
--- /dev/null
+++ b/tests/wpt/mozilla/meta-layout-2020/mozilla/paint_timing.html.ini
@@ -0,0 +1,5 @@
+[paint_timing.html]
+  expected: ERROR
+  [Performance entries observer]
+    expected: NOTRUN
+
diff --git a/tests/wpt/mozilla/meta-layout-2020/mozilla/svg/svg.html.ini b/tests/wpt/mozilla/meta-layout-2020/mozilla/svg/svg.html.ini
new file mode 100644
index 00000000000..146dd79c483
--- /dev/null
+++ b/tests/wpt/mozilla/meta-layout-2020/mozilla/svg/svg.html.ini
@@ -0,0 +1,2 @@
+[svg.html]
+  expected: FAIL