diff --git a/Cargo.lock b/Cargo.lock
index 181afad5ac1..51dbf819506 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2312,7 +2312,7 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "layout"
+name = "layout_2013"
 version = "0.0.1"
 dependencies = [
  "app_units 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2360,7 +2360,14 @@ dependencies = [
 ]
 
 [[package]]
-name = "layout_thread"
+name = "layout_2020"
+version = "0.0.1"
+dependencies = [
+ "style 0.0.1",
+]
+
+[[package]]
+name = "layout_thread_2013"
 version = "0.0.1"
 dependencies = [
  "app_units 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2375,7 +2382,7 @@ dependencies = [
  "histogram 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "html5ever 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "layout 0.0.1",
+ "layout_2013 0.0.1",
  "layout_traits 0.0.1",
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2405,6 +2412,27 @@ dependencies = [
  "webrender_api 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
 ]
 
+[[package]]
+name = "layout_thread_2020"
+version = "0.0.1"
+dependencies = [
+ "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gfx 0.0.1",
+ "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "layout_2020 0.0.1",
+ "layout_traits 0.0.1",
+ "metrics 0.0.1",
+ "msg 0.0.1",
+ "net_traits 0.0.1",
+ "profile_traits 0.0.1",
+ "script_layout_interface 0.0.1",
+ "script_traits 0.0.1",
+ "servo_geometry 0.0.1",
+ "servo_url 0.0.1",
+ "webrender_api 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+]
+
 [[package]]
 name = "layout_traits"
 version = "0.0.1"
@@ -2514,7 +2542,8 @@ dependencies = [
  "gleam 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "keyboard-types 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "layout_thread 0.0.1",
+ "layout_thread_2013 0.0.1",
+ "layout_thread_2020 0.0.1",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mozangle 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
@@ -2759,7 +2788,7 @@ version = "0.0.1"
 dependencies = [
  "gfx_traits 0.0.1",
  "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "layout 0.0.1",
+ "layout_2013 0.0.1",
  "metrics 0.0.1",
  "msg 0.0.1",
  "profile_traits 0.0.1",
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
index 91b29ff2ee2..a6623516129 100644
--- a/components/layout/Cargo.toml
+++ b/components/layout/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "layout"
+name = "layout_2013"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
 license = "MPL-2.0"
diff --git a/components/layout_2020/Cargo.toml b/components/layout_2020/Cargo.toml
new file mode 100644
index 00000000000..bff14135888
--- /dev/null
+++ b/components/layout_2020/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "layout_2020"
+version = "0.0.1"
+authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
+edition = "2018"
+publish = false
+
+[lib]
+path = "lib.rs"
+test = false
+doctest = false
+
+[dependencies]
+style = {path = "../style", features = ["servo", "servo-layout-2020"]}
diff --git a/components/layout_2020/lib.rs b/components/layout_2020/lib.rs
new file mode 100644
index 00000000000..daa3e8897c2
--- /dev/null
+++ b/components/layout_2020/lib.rs
@@ -0,0 +1,3 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
diff --git a/components/layout_thread/Cargo.toml b/components/layout_thread/Cargo.toml
index 9ae8a6f953d..e0e91c0d449 100644
--- a/components/layout_thread/Cargo.toml
+++ b/components/layout_thread/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "layout_thread"
+name = "layout_thread_2013"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
 license = "MPL-2.0"
@@ -23,7 +23,7 @@ gfx_traits = {path = "../gfx_traits"}
 histogram = "0.6.8"
 html5ever = "0.23"
 ipc-channel = "0.11"
-layout = {path = "../layout"}
+layout = {path = "../layout", package = "layout_2013"}
 layout_traits = {path = "../layout_traits"}
 lazy_static = "1"
 libc = "0.2"
diff --git a/components/layout_thread_2020/Cargo.toml b/components/layout_thread_2020/Cargo.toml
new file mode 100644
index 00000000000..157d1085711
--- /dev/null
+++ b/components/layout_thread_2020/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+name = "layout_thread_2020"
+version = "0.0.1"
+authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
+edition = "2018"
+publish = false
+
+[lib]
+name = "layout_thread"
+path = "lib.rs"
+
+[dependencies]
+crossbeam-channel = "0.3"
+euclid = "0.19"
+gfx = {path = "../gfx"}
+ipc-channel = "0.11"
+layout = {path = "../layout_2020", package = "layout_2020"}
+layout_traits = {path = "../layout_traits"}
+metrics = {path = "../metrics"}
+msg = {path = "../msg"}
+net_traits = {path = "../net_traits"}
+profile_traits = {path = "../profile_traits"}
+script_layout_interface = {path = "../script_layout_interface"}
+script_traits = {path = "../script_traits"}
+servo_url = {path = "../url"}
+servo_geometry = {path = "../geometry"}
+webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
diff --git a/components/layout_thread_2020/lib.rs b/components/layout_thread_2020/lib.rs
new file mode 100644
index 00000000000..d101ccac107
--- /dev/null
+++ b/components/layout_thread_2020/lib.rs
@@ -0,0 +1,59 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use crossbeam_channel::{Receiver, Sender};
+use euclid::TypedSize2D;
+use gfx::font_cache_thread::FontCacheThread;
+use ipc_channel::ipc::{IpcReceiver, IpcSender};
+use metrics::PaintTimeMetrics;
+use msg::constellation_msg::TopLevelBrowsingContextId;
+use msg::constellation_msg::{BackgroundHangMonitorRegister, PipelineId};
+use net_traits::image_cache::ImageCache;
+use profile_traits::{mem, time};
+use script_traits::LayoutMsg as ConstellationMsg;
+use script_traits::{ConstellationControlMsg, LayoutControlMsg};
+use servo_geometry::DeviceIndependentPixel;
+use servo_url::ServoUrl;
+use std::sync::atomic::AtomicBool;
+use std::sync::Arc;
+
+pub struct LayoutThread;
+
+impl layout_traits::LayoutThreadFactory for LayoutThread {
+    type Message = script_layout_interface::message::Msg;
+
+    #[allow(unused)]
+    fn create(
+        id: PipelineId,
+        top_level_browsing_context_id: TopLevelBrowsingContextId,
+        url: ServoUrl,
+        is_iframe: bool,
+        chan: (Sender<Self::Message>, Receiver<Self::Message>),
+        pipeline_port: IpcReceiver<LayoutControlMsg>,
+        background_hang_monitor: Box<dyn BackgroundHangMonitorRegister>,
+        constellation_chan: IpcSender<ConstellationMsg>,
+        script_chan: IpcSender<ConstellationControlMsg>,
+        image_cache: Arc<dyn ImageCache>,
+        font_cache_thread: FontCacheThread,
+        time_profiler_chan: time::ProfilerChan,
+        mem_profiler_chan: mem::ProfilerChan,
+        content_process_shutdown_chan: Option<IpcSender<()>>,
+        webrender_api_sender: webrender_api::RenderApiSender,
+        webrender_document: webrender_api::DocumentId,
+        paint_time_metrics: PaintTimeMetrics,
+        busy: Arc<AtomicBool>,
+        load_webfonts_synchronously: bool,
+        initial_window_size: TypedSize2D<u32, DeviceIndependentPixel>,
+        device_pixels_per_px: Option<f32>,
+        dump_display_list: bool,
+        dump_display_list_json: bool,
+        dump_style_tree: bool,
+        dump_rule_tree: bool,
+        relayout_event: bool,
+        nonincremental_layout: bool,
+        trace_layout: bool,
+        dump_flow_tree: bool,
+    ) {
+    }
+}
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
index d64ab06149a..b717adce9e4 100644
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@@ -20,6 +20,8 @@ energy-profiling = ["profile_traits/energy-profiling"]
 profilemozjs = ["script/profilemozjs"]
 googlevr = ["webvr/googlevr"]
 js_backtrace = ["script/js_backtrace"]
+layout-2013 = ["layout_thread_2013"]
+layout-2020 = ["layout_thread_2020"]
 max_log_level = ["log/release_max_level_info"]
 native-bluetooth = ["bluetooth/native-bluetooth"]
 no_wgl = ["canvas/no_wgl"]
@@ -53,7 +55,8 @@ gfx = {path = "../gfx"}
 gleam = "0.6"
 ipc-channel = "0.11"
 keyboard-types = "0.4"
-layout_thread = {path = "../layout_thread"}
+layout_thread_2013 = {path = "../layout_thread", optional = true}
+layout_thread_2020 = {path = "../layout_thread_2020", optional = true}
 log = "0.4"
 msg = {path = "../msg"}
 net = {path = "../net"}
diff --git a/components/servo/build.rs b/components/servo/build.rs
new file mode 100644
index 00000000000..67482840dac
--- /dev/null
+++ b/components/servo/build.rs
@@ -0,0 +1,20 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+fn main() {
+    let layout_2013 = std::env::var_os("CARGO_FEATURE_LAYOUT_2013").is_some();
+    let layout_2020 = std::env::var_os("CARGO_FEATURE_LAYOUT_2020").is_some();
+
+    if !(layout_2013 || layout_2020) {
+        error("Must enable one of the `layout-2013` or `layout-2020` features.")
+    }
+    if layout_2013 && layout_2020 {
+        error("Must not enable both of the `layout-2013` or `layout-2020` features.")
+    }
+}
+
+fn error(message: &str) {
+    print!("\n\n    Error: {}\n\n", message);
+    std::process::exit(1)
+}
diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml
index 05798b83bcb..c0c01204037 100644
--- a/components/style/Cargo.toml
+++ b/components/style/Cargo.toml
@@ -21,6 +21,7 @@ use_bindgen = ["bindgen", "regex", "toml"]
 servo = ["serde", "style_traits/servo", "servo_atoms", "servo_config", "html5ever",
          "cssparser/serde", "encoding_rs", "malloc_size_of/servo", "arrayvec/use_union",
          "servo_url", "string_cache", "crossbeam-channel", "to_shmem/servo", "servo_arc/servo"]
+"servo-layout-2020" = []
 gecko_debug = []
 gecko_refcount_logging = []
 gecko_profiler = []
diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py
index 294dff642cf..90e57bc7ca9 100644
--- a/etc/taskcluster/decision_task.py
+++ b/etc/taskcluster/decision_task.py
@@ -17,9 +17,6 @@ def main(task_for):
         )
 
     if task_for == "github-push":
-        # FIXME https://github.com/servo/servo/issues/22325 implement these:
-        linux_arm32_dev = linux_arm64_dev = lambda: None
-
         # FIXME https://github.com/servo/servo/issues/22187
         # In-emulator testing is disabled for now. (Instead we only compile.)
         # This local variable shadows the module-level function of the same name.
@@ -39,8 +36,6 @@ def main(task_for):
             android_arm32_dev_from_macos,
             android_arm32_release,
             android_x86_wpt,
-            linux_arm32_dev,
-            linux_arm64_dev,
             linux_wpt,
             linux_release,
             macos_wpt,
@@ -62,7 +57,7 @@ def main(task_for):
             "try-linux": [linux_tidy_unit_docs, linux_release],
             "try-windows": [windows_unit, windows_x86, windows_arm64],
             "try-magicleap": [magicleap_dev],
-            "try-arm": [linux_arm32_dev, linux_arm64_dev, windows_arm64],
+            "try-arm": [windows_arm64],
             "try-wpt": [linux_wpt],
             "try-wpt-mac": [macos_wpt],
             "try-wpt-android": [android_x86_wpt],
@@ -191,6 +186,7 @@ def linux_tidy_unit_docs():
             ./mach test-unit
             ./mach package --dev
             ./mach build --dev --features canvas2d-raqote
+            ./mach build --dev --features layout-2020
             ./mach build --dev --libsimpleservo
             ./mach test-tidy --no-progress --self-test
 
diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml
index 37feefddead..c52a04d0b84 100644
--- a/ports/glutin/Cargo.toml
+++ b/ports/glutin/Cargo.toml
@@ -34,6 +34,8 @@ egl = ["libservo/egl"]
 energy-profiling = ["libservo/energy-profiling"]
 debugmozjs = ["libservo/debugmozjs"]
 js_backtrace = ["libservo/js_backtrace"]
+layout-2013 = ["libservo/layout-2013"]
+layout-2020 = ["libservo/layout-2020"]
 max_log_level = ["log/release_max_level_info"]
 native-bluetooth = ["libservo/native-bluetooth"]
 profilemozjs = ["libservo/profilemozjs"]
diff --git a/ports/libmlservo/Cargo.toml b/ports/libmlservo/Cargo.toml
index 9942d95baac..e4c67e9be2b 100644
--- a/ports/libmlservo/Cargo.toml
+++ b/ports/libmlservo/Cargo.toml
@@ -16,6 +16,8 @@ bench = false
 canvas2d-azure = ["simpleservo/canvas2d-azure"]
 canvas2d-raqote = ["simpleservo/canvas2d-raqote"]
 egl = ["simpleservo/egl"]
+layout-2013 = ["simpleservo/layout-2013"]
+layout-2020 = ["simpleservo/layout-2020"]
 
 [dependencies]
 libservo = { path = "../../components/servo", features = ["no_static_freetype"] }
diff --git a/ports/libsimpleservo/api/Cargo.toml b/ports/libsimpleservo/api/Cargo.toml
index 6dd0c7c014a..8efa8d6086a 100644
--- a/ports/libsimpleservo/api/Cargo.toml
+++ b/ports/libsimpleservo/api/Cargo.toml
@@ -34,6 +34,8 @@ egl = ["libservo/egl"]
 energy-profiling = ["libservo/energy-profiling"]
 googlevr = ["libservo/googlevr"]
 js_backtrace = ["libservo/js_backtrace"]
+layout-2013 = ["libservo/layout-2013"]
+layout-2020 = ["libservo/layout-2020"]
 max_log_level = ["log/release_max_level_info"]
 native-bluetooth = ["libservo/native-bluetooth"]
 no_static_freetype = ["libservo/no_static_freetype"]
diff --git a/ports/libsimpleservo/capi/Cargo.toml b/ports/libsimpleservo/capi/Cargo.toml
index 8c6707a02aa..7d508495022 100644
--- a/ports/libsimpleservo/capi/Cargo.toml
+++ b/ports/libsimpleservo/capi/Cargo.toml
@@ -29,6 +29,8 @@ egl = ["simpleservo/egl"]
 energy-profiling = ["simpleservo/energy-profiling"]
 googlevr = ["simpleservo/googlevr"]
 js_backtrace = ["simpleservo/js_backtrace"]
+layout-2013 = ["simpleservo/layout-2013"]
+layout-2020 = ["simpleservo/layout-2020"]
 max_log_level = ["simpleservo/max_log_level"]
 native-bluetooth = ["simpleservo/native-bluetooth"]
 no_wgl = ["simpleservo/no_wgl"]
diff --git a/ports/libsimpleservo/jniapi/Cargo.toml b/ports/libsimpleservo/jniapi/Cargo.toml
index 5f5098a4c4f..391d64416c9 100644
--- a/ports/libsimpleservo/jniapi/Cargo.toml
+++ b/ports/libsimpleservo/jniapi/Cargo.toml
@@ -34,6 +34,8 @@ egl = ["simpleservo/egl"]
 energy-profiling = ["simpleservo/energy-profiling"]
 googlevr = ["simpleservo/googlevr"]
 js_backtrace = ["simpleservo/js_backtrace"]
+layout-2013 = ["simpleservo/layout-2013"]
+layout-2020 = ["simpleservo/layout-2020"]
 max_log_level = ["simpleservo/max_log_level"]
 native-bluetooth = ["simpleservo/native-bluetooth"]
 oculusvr = ["simpleservo/oculusvr"]
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index 265d2814eb6..46f9f6e5ad3 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -788,6 +788,7 @@ install them, let us know by filing a bug!")
                 action='store_true',
                 help='Build for HoloLens (x64)'),
             CommandArgument('--with-raqote', default=None, action='store_true'),
+            CommandArgument('--with-layout-2020', default=None, action='store_true'),
             CommandArgument('--without-wgl', default=None, action='store_true'),
         ]
 
@@ -813,7 +814,7 @@ install them, let us know by filing a bug!")
         env=None, verbose=False,
         target=None, android=False, magicleap=False, libsimpleservo=False,
         features=None, debug_mozjs=False, with_debug_assertions=False,
-        with_frame_pointer=False, with_raqote=False, without_wgl=False,
+        with_frame_pointer=False, with_raqote=False, with_layout_2020=False, without_wgl=False,
         uwp=False,
     ):
         env = env or self.build_env()
@@ -852,6 +853,10 @@ install them, let us know by filing a bug!")
             features.append("canvas2d-raqote")
         elif "canvas2d-raqote" not in features:
             features.append("canvas2d-azure")
+        if with_layout_2020 and "layout-2013" not in features:
+            features.append("layout-2020")
+        elif "layout-2020" not in features:
+            features.append("layout-2013")
         if with_frame_pointer:
             env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C force-frame-pointers=yes"
             features.append("profilemozjs")
diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py
index d1880f6385e..6aeb176c040 100644
--- a/python/servo/testing_commands.py
+++ b/python/servo/testing_commands.py
@@ -72,6 +72,8 @@ def create_parser_wpt():
                         help="Run under chaos mode in rr until a failure is captured")
     parser.add_argument('--pref', default=[], action="append", dest="prefs",
                         help="Pass preferences to servo")
+    parser.add_argument('--layout-2020', default=False, action="store_true",
+                        help="Use expected results for the 2020 layout engine")
     parser.add_argument('--always-succeed', default=False, action="store_true",
                         help="Always yield exit code of zero")
     return parser
@@ -248,7 +250,7 @@ class MachCommands(CommandBase):
         self_contained_tests = [
             "background_hang_monitor",
             "gfx",
-            "layout",
+            "layout_2013",
             "msg",
             "net",
             "net_traits",
diff --git a/tests/unit/metrics/Cargo.toml b/tests/unit/metrics/Cargo.toml
index 23db807945d..b268e12e909 100644
--- a/tests/unit/metrics/Cargo.toml
+++ b/tests/unit/metrics/Cargo.toml
@@ -13,7 +13,7 @@ doctest = false
 [dependencies]
 gfx_traits = {path = "../../../components/gfx_traits"}
 ipc-channel = "0.11"
-layout = {path = "../../../components/layout"}
+layout = {path = "../../../components/layout", package = "layout_2013"}
 metrics = {path = "../../../components/metrics"}
 msg = {path = "../../../components/msg"}
 profile_traits = {path = "../../../components/profile_traits"}
diff --git a/tests/wpt/include-layout-2020.ini b/tests/wpt/include-layout-2020.ini
new file mode 100644
index 00000000000..cad0318f6cf
--- /dev/null
+++ b/tests/wpt/include-layout-2020.ini
@@ -0,0 +1,8 @@
+skip: true
+[css]
+  skip: true
+  [CSS2]
+    skip: true
+    [box-display]
+      skip: false
+
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/anonymous-box-generation-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/anonymous-box-generation-001.xht.ini
new file mode 100644
index 00000000000..c864d3b5360
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/anonymous-box-generation-001.xht.ini
@@ -0,0 +1,2 @@
+[anonymous-box-generation-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/anonymous-boxes-inheritance-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/anonymous-boxes-inheritance-001.xht.ini
new file mode 100644
index 00000000000..43c0c834cea
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/anonymous-boxes-inheritance-001.xht.ini
@@ -0,0 +1,2 @@
+[anonymous-boxes-inheritance-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/anonymous-inline-whitespace-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/anonymous-inline-whitespace-001.xht.ini
new file mode 100644
index 00000000000..27bb8d99b13
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/anonymous-inline-whitespace-001.xht.ini
@@ -0,0 +1,2 @@
+[anonymous-inline-whitespace-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-001.xht.ini
new file mode 100644
index 00000000000..c8e2abc3943
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-001.xht.ini
@@ -0,0 +1,2 @@
+[block-in-inline-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-002.xht.ini
new file mode 100644
index 00000000000..dbd444e16ac
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-002.xht.ini
@@ -0,0 +1,2 @@
+[block-in-inline-002.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-003.xht.ini
new file mode 100644
index 00000000000..672c8fba4fb
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-003.xht.ini
@@ -0,0 +1,2 @@
+[block-in-inline-003.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-007.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-007.xht.ini
new file mode 100644
index 00000000000..1304f2ea07b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-007.xht.ini
@@ -0,0 +1,2 @@
+[block-in-inline-007.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-008.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-008.xht.ini
new file mode 100644
index 00000000000..baed3a38411
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-008.xht.ini
@@ -0,0 +1,2 @@
+[block-in-inline-008.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-relpos-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-relpos-001.xht.ini
new file mode 100644
index 00000000000..36258eb2ff6
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-relpos-001.xht.ini
@@ -0,0 +1,2 @@
+[block-in-inline-relpos-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-relpos-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-relpos-002.xht.ini
new file mode 100644
index 00000000000..0151ccbabc9
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-relpos-002.xht.ini
@@ -0,0 +1,2 @@
+[block-in-inline-relpos-002.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/box-generation-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/box-generation-001.xht.ini
new file mode 100644
index 00000000000..eec28b72000
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/box-generation-001.xht.ini
@@ -0,0 +1,2 @@
+[box-generation-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/box-generation-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/box-generation-002.xht.ini
new file mode 100644
index 00000000000..2d503d92735
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/box-generation-002.xht.ini
@@ -0,0 +1,2 @@
+[box-generation-002.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-001.xht.ini
new file mode 100644
index 00000000000..c86a16905f2
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-001.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-002.xht.ini
new file mode 100644
index 00000000000..0a0cc1d0724
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-002.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-002.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-003.xht.ini
new file mode 100644
index 00000000000..3f9c8d68c66
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-003.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-003.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-004.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-004.xht.ini
new file mode 100644
index 00000000000..29fe211635e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-004.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-004.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-005.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-005.xht.ini
new file mode 100644
index 00000000000..91cbb380e98
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-005.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-005.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-006.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-006.xht.ini
new file mode 100644
index 00000000000..8dc9880db30
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-006.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-006.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-007.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-007.xht.ini
new file mode 100644
index 00000000000..b8731bb917c
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-007.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-007.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-008.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-008.xht.ini
new file mode 100644
index 00000000000..e281870c70f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-008.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-008.xht]
+  expected: CRASH
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
new file mode 100644
index 00000000000..dfcfe005e43
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-009.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-009.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-010.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-010.xht.ini
new file mode 100644
index 00000000000..22ec8f99179
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-010.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-010.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-019.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-019.xht.ini
new file mode 100644
index 00000000000..ddd0969b261
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-019.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-019.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-020.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-020.xht.ini
new file mode 100644
index 00000000000..a3fa2fd5a06
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-020.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-020.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-021.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-021.xht.ini
new file mode 100644
index 00000000000..699803c36ba
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-021.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-021.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-022.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-022.xht.ini
new file mode 100644
index 00000000000..5cabfb9d842
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-022.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-022.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-023.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-023.xht.ini
new file mode 100644
index 00000000000..e350d74e9ce
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-023.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-023.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-026.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-026.xht.ini
new file mode 100644
index 00000000000..a0252cd5d9f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-026.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-026.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-027.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-027.xht.ini
new file mode 100644
index 00000000000..604ffdd4859
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-027.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-027.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-028.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-028.xht.ini
new file mode 100644
index 00000000000..fd672024da3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-028.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-028.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-029.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-029.xht.ini
new file mode 100644
index 00000000000..79a3cf4f324
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-029.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-029.xht]
+  expected: CRASH
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
new file mode 100644
index 00000000000..473ba897c60
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-030.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-030.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-block-in-inlines-beginning-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-block-in-inlines-beginning-001.xht.ini
new file mode 100644
index 00000000000..cc279d600a7
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-block-in-inlines-beginning-001.xht.ini
@@ -0,0 +1,2 @@
+[delete-block-in-inlines-beginning-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-block-in-inlines-end-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-block-in-inlines-end-001.xht.ini
new file mode 100644
index 00000000000..f87c224905f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-block-in-inlines-end-001.xht.ini
@@ -0,0 +1,2 @@
+[delete-block-in-inlines-end-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-block-in-inlines-middle-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-block-in-inlines-middle-001.xht.ini
new file mode 100644
index 00000000000..b005253092a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-block-in-inlines-middle-001.xht.ini
@@ -0,0 +1,2 @@
+[delete-block-in-inlines-middle-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-beginning-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-beginning-001.xht.ini
new file mode 100644
index 00000000000..96159262a6f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-beginning-001.xht.ini
@@ -0,0 +1,2 @@
+[delete-inline-in-blocks-beginning-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-end-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-end-001.xht.ini
new file mode 100644
index 00000000000..350c4eca54b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-end-001.xht.ini
@@ -0,0 +1,2 @@
+[delete-inline-in-blocks-end-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-middle-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-middle-001.xht.ini
new file mode 100644
index 00000000000..1a74503e2b2
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-middle-001.xht.ini
@@ -0,0 +1,2 @@
+[delete-inline-in-blocks-middle-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-middle-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-middle-002.xht.ini
new file mode 100644
index 00000000000..a805db109a8
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-middle-002.xht.ini
@@ -0,0 +1,2 @@
+[delete-inline-in-blocks-middle-002.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-middle-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-middle-003.xht.ini
new file mode 100644
index 00000000000..e6667105b5e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-middle-003.xht.ini
@@ -0,0 +1,2 @@
+[delete-inline-in-blocks-middle-003.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/descendant-display-none-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/descendant-display-none-001.xht.ini
new file mode 100644
index 00000000000..d3a571ea52f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/descendant-display-none-001.xht.ini
@@ -0,0 +1,2 @@
+[descendant-display-none-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/descendant-display-override-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/descendant-display-override-001.xht.ini
new file mode 100644
index 00000000000..a97ed1dec1b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/descendant-display-override-001.xht.ini
@@ -0,0 +1,2 @@
+[descendant-display-override-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-001.xht.ini
new file mode 100644
index 00000000000..f8ff0b68ec8
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-001.xht.ini
@@ -0,0 +1,2 @@
+[display-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-002.xht.ini
new file mode 100644
index 00000000000..414027aa4fa
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-002.xht.ini
@@ -0,0 +1,2 @@
+[display-002.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-005.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-005.xht.ini
new file mode 100644
index 00000000000..620d0a6a534
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-005.xht.ini
@@ -0,0 +1,2 @@
+[display-005.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-006.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-006.xht.ini
new file mode 100644
index 00000000000..45391624809
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-006.xht.ini
@@ -0,0 +1,2 @@
+[display-006.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-007.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-007.xht.ini
new file mode 100644
index 00000000000..ab5568ac4ac
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-007.xht.ini
@@ -0,0 +1,2 @@
+[display-007.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-008.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-008.xht.ini
new file mode 100644
index 00000000000..feea963e5ae
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-008.xht.ini
@@ -0,0 +1,2 @@
+[display-008.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-009.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-009.xht.ini
new file mode 100644
index 00000000000..af152655c0e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-009.xht.ini
@@ -0,0 +1,2 @@
+[display-009.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-010.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-010.xht.ini
new file mode 100644
index 00000000000..3fb7e2315e6
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-010.xht.ini
@@ -0,0 +1,2 @@
+[display-010.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-011.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-011.xht.ini
new file mode 100644
index 00000000000..4e767bc1dc3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-011.xht.ini
@@ -0,0 +1,2 @@
+[display-011.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-012.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-012.xht.ini
new file mode 100644
index 00000000000..cd58cff27c7
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-012.xht.ini
@@ -0,0 +1,2 @@
+[display-012.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-013.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-013.xht.ini
new file mode 100644
index 00000000000..0711c2aa718
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-013.xht.ini
@@ -0,0 +1,2 @@
+[display-013.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-014.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-014.xht.ini
new file mode 100644
index 00000000000..d03116fdced
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-014.xht.ini
@@ -0,0 +1,2 @@
+[display-014.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-015.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-015.xht.ini
new file mode 100644
index 00000000000..1e245ebc41e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-015.xht.ini
@@ -0,0 +1,2 @@
+[display-015.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-016.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-016.xht.ini
new file mode 100644
index 00000000000..00644d37ad7
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-016.xht.ini
@@ -0,0 +1,2 @@
+[display-016.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-017.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-017.xht.ini
new file mode 100644
index 00000000000..c8b32c605fe
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-017.xht.ini
@@ -0,0 +1,2 @@
+[display-017.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-018.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-018.xht.ini
new file mode 100644
index 00000000000..15150730a06
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-018.xht.ini
@@ -0,0 +1,2 @@
+[display-018.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-change-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-change-001.xht.ini
new file mode 100644
index 00000000000..68390ee937d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-change-001.xht.ini
@@ -0,0 +1,2 @@
+[display-change-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-none-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-none-001.xht.ini
new file mode 100644
index 00000000000..376e9a28ed9
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-none-001.xht.ini
@@ -0,0 +1,2 @@
+[display-none-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-none-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-none-002.xht.ini
new file mode 100644
index 00000000000..dcda7ce8ac9
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-none-002.xht.ini
@@ -0,0 +1,2 @@
+[display-none-002.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-none-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-none-003.xht.ini
new file mode 100644
index 00000000000..b67f46e3538
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-none-003.xht.ini
@@ -0,0 +1,2 @@
+[display-none-003.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-001.xht.ini
new file mode 100644
index 00000000000..21a00e94015
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-001.xht.ini
@@ -0,0 +1,2 @@
+[insert-block-in-blocks-n-inlines-begin-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-002.xht.ini
new file mode 100644
index 00000000000..8c85ad54bb8
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-002.xht.ini
@@ -0,0 +1,2 @@
+[insert-block-in-blocks-n-inlines-begin-002.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-003.xht.ini
new file mode 100644
index 00000000000..235d2fda859
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-003.xht.ini
@@ -0,0 +1,2 @@
+[insert-block-in-blocks-n-inlines-begin-003.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-001.xht.ini
new file mode 100644
index 00000000000..2d4455aa5f4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-001.xht.ini
@@ -0,0 +1,2 @@
+[insert-block-in-blocks-n-inlines-end-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-002.xht.ini
new file mode 100644
index 00000000000..7ed95f5c511
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-002.xht.ini
@@ -0,0 +1,2 @@
+[insert-block-in-blocks-n-inlines-end-002.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-003.xht.ini
new file mode 100644
index 00000000000..30e55bfb181
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-003.xht.ini
@@ -0,0 +1,2 @@
+[insert-block-in-blocks-n-inlines-end-003.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-001.xht.ini
new file mode 100644
index 00000000000..1b2b6d58dc5
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-001.xht.ini
@@ -0,0 +1,2 @@
+[insert-block-in-blocks-n-inlines-middle-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-002.xht.ini
new file mode 100644
index 00000000000..7643708b917
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-002.xht.ini
@@ -0,0 +1,2 @@
+[insert-block-in-blocks-n-inlines-middle-002.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-003.xht.ini
new file mode 100644
index 00000000000..7f028af26eb
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-003.xht.ini
@@ -0,0 +1,2 @@
+[insert-block-in-blocks-n-inlines-middle-003.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-inlines-beginning-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-inlines-beginning-001.xht.ini
new file mode 100644
index 00000000000..ad37bc67e06
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-inlines-beginning-001.xht.ini
@@ -0,0 +1,2 @@
+[insert-block-in-inlines-beginning-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-inlines-end-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-inlines-end-001.xht.ini
new file mode 100644
index 00000000000..68476801ca9
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-inlines-end-001.xht.ini
@@ -0,0 +1,2 @@
+[insert-block-in-inlines-end-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-inlines-middle-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-inlines-middle-001.xht.ini
new file mode 100644
index 00000000000..25c91d15cd3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-inlines-middle-001.xht.ini
@@ -0,0 +1,2 @@
+[insert-block-in-inlines-middle-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-beginning-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-beginning-001.xht.ini
new file mode 100644
index 00000000000..26b1c19f4a3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-beginning-001.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-beginning-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-end-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-end-001.xht.ini
new file mode 100644
index 00000000000..7e49a81fac1
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-end-001.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-end-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-middle-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-middle-001.xht.ini
new file mode 100644
index 00000000000..19bb2dc0005
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-middle-001.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-middle-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-middle-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-middle-002.xht.ini
new file mode 100644
index 00000000000..eb47f152261
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-middle-002.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-middle-002.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-001.xht.ini
new file mode 100644
index 00000000000..d5a9cd895a4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-001.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-n-inlines-begin-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-002.xht.ini
new file mode 100644
index 00000000000..e6fcb724185
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-002.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-n-inlines-begin-002.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-003.xht.ini
new file mode 100644
index 00000000000..ec1010dbef3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-003.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-n-inlines-begin-003.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-001.xht.ini
new file mode 100644
index 00000000000..6fad543e6d1
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-001.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-n-inlines-end-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-002.xht.ini
new file mode 100644
index 00000000000..bc38bf708e3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-002.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-n-inlines-end-002.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-003.xht.ini
new file mode 100644
index 00000000000..b6bbb70f801
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-003.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-n-inlines-end-003.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-001.xht.ini
new file mode 100644
index 00000000000..df8af850556
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-001.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-n-inlines-middle-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-002.xht.ini
new file mode 100644
index 00000000000..596340879bf
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-002.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-n-inlines-middle-002.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-003.xht.ini
new file mode 100644
index 00000000000..34ea0b302ae
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-003.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-n-inlines-middle-003.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/root-box-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/root-box-002.xht.ini
new file mode 100644
index 00000000000..dcf42e7fd29
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/root-box-002.xht.ini
@@ -0,0 +1,2 @@
+[root-box-002.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/root-box-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/root-box-003.xht.ini
new file mode 100644
index 00000000000..8778e3ca550
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/root-box-003.xht.ini
@@ -0,0 +1,2 @@
+[root-box-003.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/root-canvas-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/root-canvas-001.xht.ini
new file mode 100644
index 00000000000..4dc9c147291
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/root-canvas-001.xht.ini
@@ -0,0 +1,2 @@
+[root-canvas-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/run.py b/tests/wpt/run.py
index 6b012d0f5d3..819fbd744e4 100644
--- a/tests/wpt/run.py
+++ b/tests/wpt/run.py
@@ -93,6 +93,10 @@ def set_defaults(kwargs):
 
     wptcommandline.check_args(kwargs)
 
+    if kwargs.pop("layout_2020"):
+        kwargs["test_paths"]["/"]["metadata_path"] = wpt_path("metadata-layout-2020")
+        kwargs["include_manifest"] = wpt_path("include-layout-2020.ini")
+
 
 def main():
     parser = wptcommandline.create_parser()
diff --git a/tests/wpt/update.py b/tests/wpt/update.py
index 2091b1fed66..d8d1db22114 100644
--- a/tests/wpt/update.py
+++ b/tests/wpt/update.py
@@ -34,6 +34,10 @@ def set_defaults(kwargs):
     kwargs["store_state"] = False
     updatecommandline.check_args(kwargs)
 
+    if kwargs.pop("layout_2020"):
+        kwargs["test_paths"]["/"]["metadata_path"] = wpt_path("metadata-layout-2020")
+        kwargs["include_manifest"] = wpt_path("include-layout-2020.ini")
+
 
 def main():
     parser = wptcommandline.create_parser()
diff --git a/tests/wpt/update/updatecommandline.py b/tests/wpt/update/updatecommandline.py
index 2f8077f93e8..60803729c8d 100644
--- a/tests/wpt/update/updatecommandline.py
+++ b/tests/wpt/update/updatecommandline.py
@@ -13,6 +13,8 @@ def create_parser():
     parser.add_argument("--token-file", action="store", type=wptcommandline.abs_path,
                         help="Path to file containing github token")
     parser.add_argument("--token", action="store", help="GitHub token to use")
+    parser.add_argument('--layout-2020', default=False, action="store_true",
+                        help="Use expected results for the 2020 layout engine")
     return parser