From 4119bbdfabefa07a03dc3b9ac995371cf357ef95 Mon Sep 17 00:00:00 2001
From: Emily McDonough <emcdonough@mozilla.com>
Date: Mon, 31 Jul 2023 18:47:42 +0000
Subject: [PATCH] Bug 1787073 - Migrate all handwritten css-page-3 layout
 reftests to WPT r=dholbert

This does not touch the autogenerated tests. WPT print reftests are slower
than paged layout reftests, and the autogenerated tests are of much lower
value for catching bugs than the handwritten tests.

Differential Revision: https://phabricator.services.mozilla.com/D184531
---
 .../css-page/page-name-abspos-001.html        |  7 ---
 .../css-page/page-name-canvas-001.html        |  7 ---
 .../css-page/page-name-canvas-002.html        |  7 ---
 .../page-name-display-none-child.html         | 10 ----
 .../css-page/page-name-float-001.html         |  7 ---
 .../css-page/page-name-img-001-ref.html       |  7 ---
 .../css-page/page-name-inline-block-003.html  |  7 ---
 .../page-name-orthogonal-writing-001.html     |  9 ----
 .../page-name-orthogonal-writing-002.html     |  7 ---
 .../page-name-orthogonal-writing-003.html     |  9 ----
 .../css-page/page-name-propagated-007.html    | 11 ----
 .../css-page/page-name-propagated-008.html    | 10 ----
 .../css-page/page-name-propagated-009.html    | 10 ----
 .../css-page/page-name-siblings-001.html      |  8 ---
 .../css-page/page-name-siblings-002.html      | 10 ----
 .../css-page/page-name-siblings-003.html      | 10 ----
 .../css-page/page-name-siblings-004.html      |  8 ---
 .../css-page/page-name-siblings-005.html      |  8 ---
 .../css-page/page-name-siblings-ref.html      |  8 ---
 layout/reftests/css-page/reftest.list         | 54 -------------------
 .../css/css-page/layers-002-print.html.ini    |  2 +
 .../css/css-page/layers-003-print.html.ini    |  2 +
 .../css/css-page/layers-004-print.html.ini    |  2 +
 .../page-name-margin-001-print.html.ini       |  2 +
 .../pseudo-first-margin-001-print.html.ini    |  2 +
 .../pseudo-first-margin-002-print.html.ini    |  2 +
 .../pseudo-first-margin-003-print.html.ini    |  2 +
 .../css/css-page/layers-001-print-ref.html    |  2 +-
 .../tests/css/css-page/layers-001-print.html  |  4 +-
 .../css/css-page/layers-002-print-ref.html    |  2 +-
 .../tests/css/css-page/layers-002-print.html  |  4 +-
 .../css/css-page/layers-003-print-ref.html    |  2 +-
 .../tests/css/css-page/layers-003-print.html  |  4 +-
 .../css/css-page/layers-004-print-ref.html    |  2 +-
 .../tests/css/css-page/layers-004-print.html  |  4 +-
 .../page-name-abspos-001-print-ref.html       |  2 +-
 .../css-page/page-name-abspos-001-print.html  |  9 ++++
 .../page-name-abspos-002-print-ref.html       |  2 +-
 .../css-page/page-name-abspos-002-print.html  |  4 +-
 .../page-name-abspos-003-print-ref.html       |  2 +-
 .../css-page/page-name-abspos-003-print.html  |  4 +-
 .../page-name-canvas-001-print-ref.html       |  6 +--
 .../css-page/page-name-canvas-001-print.html  |  9 ++++
 .../page-name-canvas-002-print-ref.html       |  4 +-
 .../css-page/page-name-canvas-002-print.html  |  9 ++++
 .../page-name-canvas-003-print-ref.html       |  2 +-
 .../css-page/page-name-canvas-003-print.html  |  4 +-
 .../page-name-canvas-004-print-ref.html       |  2 +-
 .../css-page/page-name-canvas-004-print.html  |  4 +-
 ...age-name-display-none-child-print-ref.html |  8 +--
 .../page-name-display-none-child-print.html   | 12 +++++
 .../page-name-fixed-pos-001-print-ref.html    |  2 +-
 .../page-name-fixed-pos-001-print.html        |  4 +-
 .../page-name-flex-001-print-ref.html         |  2 +-
 .../css-page/page-name-flex-001-print.html    |  4 +-
 .../page-name-flex-002-print-ref.html         |  2 +-
 .../css-page/page-name-flex-002-print.html    |  4 +-
 .../page-name-flex-003-print-ref.html         |  2 +-
 .../css-page/page-name-flex-003-print.html    |  4 +-
 .../page-name-flex-004-print-ref.html         |  2 +-
 .../css-page/page-name-flex-004-print.html    |  4 +-
 .../page-name-float-001-print-ref.html        |  2 +-
 .../css-page/page-name-float-001-print.html   |  9 ++++
 .../page-name-float-002-print-ref.html        |  2 +-
 .../css-page/page-name-float-002-print.html   |  4 +-
 .../css-page/page-name-img-001-print-ref.html |  7 +++
 .../css/css-page/page-name-img-001-print.html |  6 ++-
 .../css-page/page-name-img-002-print-ref.html |  4 +-
 .../css/css-page/page-name-img-002-print.html |  6 ++-
 .../css-page/page-name-img-003-print-ref.html |  2 +-
 .../css/css-page/page-name-img-003-print.html |  4 +-
 .../css-page/page-name-img-004-print-ref.html |  2 +-
 .../css/css-page/page-name-img-004-print.html |  4 +-
 .../page-name-inline-block-001-print-ref.html |  2 +-
 .../page-name-inline-block-001-print.html     |  4 +-
 .../page-name-inline-block-002-print-ref.html |  2 +-
 .../page-name-inline-block-002-print.html     |  4 +-
 .../page-name-inline-block-003-print-ref.html |  2 +-
 .../page-name-inline-block-003-print.html     |  9 ++++
 .../page-name-margin-001-print-ref.html       |  2 +-
 .../css-page/page-name-margin-001-print.html  |  4 +-
 .../page-name-margin-002-print-ref.html       |  2 +-
 .../css-page/page-name-margin-002-print.html  |  4 +-
 ...name-orthogonal-writing-001-print-ref.html |  2 +-
 ...age-name-orthogonal-writing-001-print.html | 11 ++++
 ...name-orthogonal-writing-002-print-ref.html |  2 +-
 ...age-name-orthogonal-writing-002-print.html |  9 ++++
 ...name-orthogonal-writing-003-print-ref.html |  2 +-
 ...age-name-orthogonal-writing-003-print.html | 11 ++++
 ...name-orthogonal-writing-004-print-ref.html |  2 +-
 ...age-name-orthogonal-writing-004-print.html |  4 +-
 .../page-name-propagated-001-print-ref.html   |  2 +-
 .../page-name-propagated-001-print.html       |  4 +-
 .../page-name-propagated-002-print-ref.html   |  2 +-
 .../page-name-propagated-002-print.html       |  4 +-
 .../page-name-propagated-003-print-ref.html   |  2 +-
 .../page-name-propagated-003-print.html       |  4 +-
 .../page-name-propagated-004-print-ref.html   |  2 +-
 .../page-name-propagated-004-print.html       |  4 +-
 .../page-name-propagated-005-print-ref.html   |  2 +-
 .../page-name-propagated-005-print.html       |  4 +-
 .../page-name-propagated-006-print-ref.html   |  2 +-
 .../page-name-propagated-006-print.html       |  4 +-
 .../page-name-propagated-007-print-ref.html   |  2 +-
 .../page-name-propagated-007-print.html       | 13 +++++
 .../page-name-propagated-008-print-ref.html   |  2 +-
 .../page-name-propagated-008-print.html       | 12 +++++
 .../page-name-propagated-009-print-ref.html   |  2 +-
 .../page-name-propagated-009-print.html       | 12 +++++
 .../page-name-siblings-001-print.html         | 10 ++++
 .../page-name-siblings-002-print.html         | 12 +++++
 .../page-name-siblings-003-print.html         | 12 +++++
 .../page-name-siblings-004-print.html         | 10 ++++
 .../page-name-siblings-005-print.html         | 10 ++++
 .../page-name-siblings-print-ref.html         |  8 +++
 .../page-name-zero-height-001-print-ref.html  |  2 +-
 .../page-name-zero-height-001-print.html      |  4 +-
 .../pseudo-first-margin-001-print.html        |  4 +-
 .../pseudo-first-margin-002-print.html        |  4 +-
 .../pseudo-first-margin-003-print.html        |  4 +-
 .../pseudo-first-margin-print-ref.html        |  2 +-
 121 files changed, 358 insertions(+), 298 deletions(-)
 delete mode 100644 layout/reftests/css-page/page-name-abspos-001.html
 delete mode 100644 layout/reftests/css-page/page-name-canvas-001.html
 delete mode 100644 layout/reftests/css-page/page-name-canvas-002.html
 delete mode 100644 layout/reftests/css-page/page-name-display-none-child.html
 delete mode 100644 layout/reftests/css-page/page-name-float-001.html
 delete mode 100644 layout/reftests/css-page/page-name-img-001-ref.html
 delete mode 100644 layout/reftests/css-page/page-name-inline-block-003.html
 delete mode 100644 layout/reftests/css-page/page-name-orthogonal-writing-001.html
 delete mode 100644 layout/reftests/css-page/page-name-orthogonal-writing-002.html
 delete mode 100644 layout/reftests/css-page/page-name-orthogonal-writing-003.html
 delete mode 100644 layout/reftests/css-page/page-name-propagated-007.html
 delete mode 100644 layout/reftests/css-page/page-name-propagated-008.html
 delete mode 100644 layout/reftests/css-page/page-name-propagated-009.html
 delete mode 100644 layout/reftests/css-page/page-name-siblings-001.html
 delete mode 100644 layout/reftests/css-page/page-name-siblings-002.html
 delete mode 100644 layout/reftests/css-page/page-name-siblings-003.html
 delete mode 100644 layout/reftests/css-page/page-name-siblings-004.html
 delete mode 100644 layout/reftests/css-page/page-name-siblings-005.html
 delete mode 100644 layout/reftests/css-page/page-name-siblings-ref.html
 create mode 100644 testing/web-platform/meta/css/css-page/layers-002-print.html.ini
 create mode 100644 testing/web-platform/meta/css/css-page/layers-003-print.html.ini
 create mode 100644 testing/web-platform/meta/css/css-page/layers-004-print.html.ini
 create mode 100644 testing/web-platform/meta/css/css-page/page-name-margin-001-print.html.ini
 create mode 100644 testing/web-platform/meta/css/css-page/pseudo-first-margin-001-print.html.ini
 create mode 100644 testing/web-platform/meta/css/css-page/pseudo-first-margin-002-print.html.ini
 create mode 100644 testing/web-platform/meta/css/css-page/pseudo-first-margin-003-print.html.ini
 rename layout/reftests/css-page/layers-001-ref.html => testing/web-platform/tests/css/css-page/layers-001-print-ref.html (92%)
 rename layout/reftests/css-page/layers-001.html => testing/web-platform/tests/css/css-page/layers-001-print.html (73%)
 rename layout/reftests/css-page/layers-002-ref.html => testing/web-platform/tests/css/css-page/layers-002-print-ref.html (92%)
 rename layout/reftests/css-page/layers-002.html => testing/web-platform/tests/css/css-page/layers-002-print.html (73%)
 rename layout/reftests/css-page/layers-003-ref.html => testing/web-platform/tests/css/css-page/layers-003-print-ref.html (93%)
 rename layout/reftests/css-page/layers-003.html => testing/web-platform/tests/css/css-page/layers-003-print.html (78%)
 rename layout/reftests/css-page/layers-004-ref.html => testing/web-platform/tests/css/css-page/layers-004-print-ref.html (92%)
 rename layout/reftests/css-page/layers-004.html => testing/web-platform/tests/css/css-page/layers-004-print.html (78%)
 rename layout/reftests/css-page/page-name-abspos-001-ref.html => testing/web-platform/tests/css/css-page/page-name-abspos-001-print-ref.html (80%)
 create mode 100644 testing/web-platform/tests/css/css-page/page-name-abspos-001-print.html
 rename layout/reftests/css-page/page-name-abspos-002-ref.html => testing/web-platform/tests/css/css-page/page-name-abspos-002-print-ref.html (83%)
 rename layout/reftests/css-page/page-name-abspos-002.html => testing/web-platform/tests/css/css-page/page-name-abspos-002-print.html (54%)
 rename layout/reftests/css-page/page-name-abspos-003-ref.html => testing/web-platform/tests/css/css-page/page-name-abspos-003-print-ref.html (87%)
 rename layout/reftests/css-page/page-name-abspos-003.html => testing/web-platform/tests/css/css-page/page-name-abspos-003-print.html (54%)
 rename layout/reftests/css-page/page-name-canvas-001-ref.html => testing/web-platform/tests/css/css-page/page-name-canvas-001-print-ref.html (62%)
 create mode 100644 testing/web-platform/tests/css/css-page/page-name-canvas-001-print.html
 rename layout/reftests/css-page/page-name-canvas-002-ref.html => testing/web-platform/tests/css/css-page/page-name-canvas-002-print-ref.html (60%)
 create mode 100644 testing/web-platform/tests/css/css-page/page-name-canvas-002-print.html
 rename layout/reftests/css-page/page-name-canvas-003-ref.html => testing/web-platform/tests/css/css-page/page-name-canvas-003-print-ref.html (82%)
 rename layout/reftests/css-page/page-name-canvas-003.html => testing/web-platform/tests/css/css-page/page-name-canvas-003-print.html (54%)
 rename layout/reftests/css-page/page-name-canvas-004-ref.html => testing/web-platform/tests/css/css-page/page-name-canvas-004-print-ref.html (85%)
 rename layout/reftests/css-page/page-name-canvas-004.html => testing/web-platform/tests/css/css-page/page-name-canvas-004-print.html (52%)
 rename layout/reftests/css-page/page-name-display-none-child-ref.html => testing/web-platform/tests/css/css-page/page-name-display-none-child-print-ref.html (50%)
 create mode 100644 testing/web-platform/tests/css/css-page/page-name-display-none-child-print.html
 rename layout/reftests/css-page/page-name-fixed-pos-001-ref.html => testing/web-platform/tests/css/css-page/page-name-fixed-pos-001-print-ref.html (91%)
 rename layout/reftests/css-page/page-name-fixed-pos-001.html => testing/web-platform/tests/css/css-page/page-name-fixed-pos-001-print.html (68%)
 rename layout/reftests/css-page/page-name-flex-001-ref.html => testing/web-platform/tests/css/css-page/page-name-flex-001-print-ref.html (86%)
 rename layout/reftests/css-page/page-name-flex-001.html => testing/web-platform/tests/css/css-page/page-name-flex-001-print.html (58%)
 rename layout/reftests/css-page/page-name-flex-002-ref.html => testing/web-platform/tests/css/css-page/page-name-flex-002-print-ref.html (84%)
 rename layout/reftests/css-page/page-name-flex-002.html => testing/web-platform/tests/css/css-page/page-name-flex-002-print.html (55%)
 rename layout/reftests/css-page/page-name-flex-003-ref.html => testing/web-platform/tests/css/css-page/page-name-flex-003-print-ref.html (88%)
 rename layout/reftests/css-page/page-name-flex-003.html => testing/web-platform/tests/css/css-page/page-name-flex-003-print.html (57%)
 rename layout/reftests/css-page/page-name-flex-004-ref.html => testing/web-platform/tests/css/css-page/page-name-flex-004-print-ref.html (89%)
 rename layout/reftests/css-page/page-name-flex-004.html => testing/web-platform/tests/css/css-page/page-name-flex-004-print.html (64%)
 rename layout/reftests/css-page/page-name-float-001-ref.html => testing/web-platform/tests/css/css-page/page-name-float-001-print-ref.html (77%)
 create mode 100644 testing/web-platform/tests/css/css-page/page-name-float-001-print.html
 rename layout/reftests/css-page/page-name-float-002-ref.html => testing/web-platform/tests/css/css-page/page-name-float-002-print-ref.html (83%)
 rename layout/reftests/css-page/page-name-float-002.html => testing/web-platform/tests/css/css-page/page-name-float-002-print.html (50%)
 create mode 100644 testing/web-platform/tests/css/css-page/page-name-img-001-print-ref.html
 rename layout/reftests/css-page/page-name-img-001.html => testing/web-platform/tests/css/css-page/page-name-img-001-print.html (64%)
 rename layout/reftests/css-page/page-name-img-002-ref.html => testing/web-platform/tests/css/css-page/page-name-img-002-print-ref.html (81%)
 rename layout/reftests/css-page/page-name-img-002.html => testing/web-platform/tests/css/css-page/page-name-img-002-print.html (64%)
 rename layout/reftests/css-page/page-name-img-003-ref.html => testing/web-platform/tests/css/css-page/page-name-img-003-print-ref.html (92%)
 rename layout/reftests/css-page/page-name-img-003.html => testing/web-platform/tests/css/css-page/page-name-img-003-print.html (71%)
 rename layout/reftests/css-page/page-name-img-004-ref.html => testing/web-platform/tests/css/css-page/page-name-img-004-print-ref.html (92%)
 rename layout/reftests/css-page/page-name-img-004.html => testing/web-platform/tests/css/css-page/page-name-img-004-print.html (71%)
 rename layout/reftests/css-page/page-name-inline-block-001-ref.html => testing/web-platform/tests/css/css-page/page-name-inline-block-001-print-ref.html (81%)
 rename layout/reftests/css-page/page-name-inline-block-001.html => testing/web-platform/tests/css/css-page/page-name-inline-block-001-print.html (50%)
 rename layout/reftests/css-page/page-name-inline-block-002-ref.html => testing/web-platform/tests/css/css-page/page-name-inline-block-002-print-ref.html (85%)
 rename layout/reftests/css-page/page-name-inline-block-002.html => testing/web-platform/tests/css/css-page/page-name-inline-block-002-print.html (56%)
 rename layout/reftests/css-page/page-name-inline-block-003-ref.html => testing/web-platform/tests/css/css-page/page-name-inline-block-003-print-ref.html (82%)
 create mode 100644 testing/web-platform/tests/css/css-page/page-name-inline-block-003-print.html
 rename layout/reftests/css-page/page-name-margin-001-ref.html => testing/web-platform/tests/css/css-page/page-name-margin-001-print-ref.html (94%)
 rename layout/reftests/css-page/page-name-margin-001.html => testing/web-platform/tests/css/css-page/page-name-margin-001-print.html (71%)
 rename layout/reftests/css-page/page-name-margin-002-ref.html => testing/web-platform/tests/css/css-page/page-name-margin-002-print-ref.html (90%)
 rename layout/reftests/css-page/page-name-margin-002.html => testing/web-platform/tests/css/css-page/page-name-margin-002-print.html (60%)
 rename layout/reftests/css-page/page-name-orthogonal-writing-001-ref.html => testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-001-print-ref.html (68%)
 create mode 100644 testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-001-print.html
 rename layout/reftests/css-page/page-name-orthogonal-writing-002-ref.html => testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-002-print-ref.html (63%)
 create mode 100644 testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-002-print.html
 rename layout/reftests/css-page/page-name-orthogonal-writing-003-ref.html => testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-003-print-ref.html (67%)
 create mode 100644 testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-003-print.html
 rename layout/reftests/css-page/page-name-orthogonal-writing-004-ref.html => testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-004-print-ref.html (88%)
 rename layout/reftests/css-page/page-name-orthogonal-writing-004.html => testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-004-print.html (58%)
 rename layout/reftests/css-page/page-name-propagated-001-ref.html => testing/web-platform/tests/css/css-page/page-name-propagated-001-print-ref.html (81%)
 rename layout/reftests/css-page/page-name-propagated-001.html => testing/web-platform/tests/css/css-page/page-name-propagated-001-print.html (55%)
 rename layout/reftests/css-page/page-name-propagated-002-ref.html => testing/web-platform/tests/css/css-page/page-name-propagated-002-print-ref.html (88%)
 rename layout/reftests/css-page/page-name-propagated-002.html => testing/web-platform/tests/css/css-page/page-name-propagated-002-print.html (62%)
 rename layout/reftests/css-page/page-name-propagated-003-ref.html => testing/web-platform/tests/css/css-page/page-name-propagated-003-print-ref.html (82%)
 rename layout/reftests/css-page/page-name-propagated-003.html => testing/web-platform/tests/css/css-page/page-name-propagated-003-print.html (61%)
 rename layout/reftests/css-page/page-name-propagated-004-ref.html => testing/web-platform/tests/css/css-page/page-name-propagated-004-print-ref.html (88%)
 rename layout/reftests/css-page/page-name-propagated-004.html => testing/web-platform/tests/css/css-page/page-name-propagated-004-print.html (61%)
 rename layout/reftests/css-page/page-name-propagated-005-ref.html => testing/web-platform/tests/css/css-page/page-name-propagated-005-print-ref.html (86%)
 rename layout/reftests/css-page/page-name-propagated-005.html => testing/web-platform/tests/css/css-page/page-name-propagated-005-print.html (61%)
 rename layout/reftests/css-page/page-name-propagated-006-ref.html => testing/web-platform/tests/css/css-page/page-name-propagated-006-print-ref.html (88%)
 rename layout/reftests/css-page/page-name-propagated-006.html => testing/web-platform/tests/css/css-page/page-name-propagated-006-print.html (61%)
 rename layout/reftests/css-page/page-name-propagated-007-ref.html => testing/web-platform/tests/css/css-page/page-name-propagated-007-print-ref.html (84%)
 create mode 100644 testing/web-platform/tests/css/css-page/page-name-propagated-007-print.html
 rename layout/reftests/css-page/page-name-propagated-008-ref.html => testing/web-platform/tests/css/css-page/page-name-propagated-008-print-ref.html (83%)
 create mode 100644 testing/web-platform/tests/css/css-page/page-name-propagated-008-print.html
 rename layout/reftests/css-page/page-name-propagated-009-ref.html => testing/web-platform/tests/css/css-page/page-name-propagated-009-print-ref.html (80%)
 create mode 100644 testing/web-platform/tests/css/css-page/page-name-propagated-009-print.html
 create mode 100644 testing/web-platform/tests/css/css-page/page-name-siblings-001-print.html
 create mode 100644 testing/web-platform/tests/css/css-page/page-name-siblings-002-print.html
 create mode 100644 testing/web-platform/tests/css/css-page/page-name-siblings-003-print.html
 create mode 100644 testing/web-platform/tests/css/css-page/page-name-siblings-004-print.html
 create mode 100644 testing/web-platform/tests/css/css-page/page-name-siblings-005-print.html
 create mode 100644 testing/web-platform/tests/css/css-page/page-name-siblings-print-ref.html
 rename layout/reftests/css-page/page-name-zero-height-001-ref.html => testing/web-platform/tests/css/css-page/page-name-zero-height-001-print-ref.html (92%)
 rename layout/reftests/css-page/page-name-zero-height-001.html => testing/web-platform/tests/css/css-page/page-name-zero-height-001-print.html (70%)
 rename layout/reftests/css-page/pseudo-first-margin-001.html => testing/web-platform/tests/css/css-page/pseudo-first-margin-001-print.html (67%)
 rename layout/reftests/css-page/pseudo-first-margin-002.html => testing/web-platform/tests/css/css-page/pseudo-first-margin-002-print.html (69%)
 rename layout/reftests/css-page/pseudo-first-margin-003.html => testing/web-platform/tests/css/css-page/pseudo-first-margin-003-print.html (68%)
 rename layout/reftests/css-page/pseudo-first-margin-ref.html => testing/web-platform/tests/css/css-page/pseudo-first-margin-print-ref.html (92%)

diff --git a/layout/reftests/css-page/page-name-abspos-001.html b/layout/reftests/css-page/page-name-abspos-001.html
deleted file mode 100644
index 709df6a52c1d..000000000000
--- a/layout/reftests/css-page/page-name-abspos-001.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-paged">
-  <body>
-    <div>a</div>
-    <div style="page: b; position: absolute; right: 0; top: 0;">b</div>
-  </body>
-</html>
diff --git a/layout/reftests/css-page/page-name-canvas-001.html b/layout/reftests/css-page/page-name-canvas-001.html
deleted file mode 100644
index e6c1b484117f..000000000000
--- a/layout/reftests/css-page/page-name-canvas-001.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-paged">
-  <body style="page:a">
-    <canvas height="1" style="page:b; border: 1px solid black"></canvas>
-    <p style="page:b">b</p>
-  </body>
-</html>
diff --git a/layout/reftests/css-page/page-name-canvas-002.html b/layout/reftests/css-page/page-name-canvas-002.html
deleted file mode 100644
index c14269864a04..000000000000
--- a/layout/reftests/css-page/page-name-canvas-002.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-paged">
-  <body style="page:a">
-    <p style="page:b">a</p>
-    <canvas height="1" style="page:b; border: 1px solid black"></canvas>
-  </body>
-</html>
diff --git a/layout/reftests/css-page/page-name-display-none-child.html b/layout/reftests/css-page/page-name-display-none-child.html
deleted file mode 100644
index e480e51d94d6..000000000000
--- a/layout/reftests/css-page/page-name-display-none-child.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-paged">
-  <body>
-    <p style="page:a">a</p>
-    <div style="page:c">
-      <p style="display: none">c</p>
-    </div>
-    <p style="page:b">b</p>
-  </body>
-</html>
diff --git a/layout/reftests/css-page/page-name-float-001.html b/layout/reftests/css-page/page-name-float-001.html
deleted file mode 100644
index 76664bc9c6ce..000000000000
--- a/layout/reftests/css-page/page-name-float-001.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-paged">
-  <body>
-    <div style="page: a; float: left;">a</div>
-    <div style="page: b">b</div>
-  </body>
-</html>
diff --git a/layout/reftests/css-page/page-name-img-001-ref.html b/layout/reftests/css-page/page-name-img-001-ref.html
deleted file mode 100644
index de50e3bee6b6..000000000000
--- a/layout/reftests/css-page/page-name-img-001-ref.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-paged">
-  <body>
-    <img style="break-after: always" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAIAAAABc2X6AAAAa0lEQVR42u3QMREAAAwCMfybbl3AEu4NhCQ3abUAAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwOXwbunRwEDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDA3d78VrQ4ODmDDUAAAAASUVORK5CYII=">
-    <p>b</p>
-  </body>
-</html>
diff --git a/layout/reftests/css-page/page-name-inline-block-003.html b/layout/reftests/css-page/page-name-inline-block-003.html
deleted file mode 100644
index 5c4be23c2a5e..000000000000
--- a/layout/reftests/css-page/page-name-inline-block-003.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-paged">
-  <body>
-    <div style="page: a; display: inline-block">a</div>
-    <div style="page: b; display: inline-block">b</div>
-  </body>
-</html>
diff --git a/layout/reftests/css-page/page-name-orthogonal-writing-001.html b/layout/reftests/css-page/page-name-orthogonal-writing-001.html
deleted file mode 100644
index 5133f59d8594..000000000000
--- a/layout/reftests/css-page/page-name-orthogonal-writing-001.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-paged" style="writing-mode: vertical-rl">
-  <body>
-    <div style="writing-mode: horizontal-tb">
-      <div style="page: a">a</div>
-      <div style="page: b">b</div>
-    </div>
-  </body>
-</html>
diff --git a/layout/reftests/css-page/page-name-orthogonal-writing-002.html b/layout/reftests/css-page/page-name-orthogonal-writing-002.html
deleted file mode 100644
index cbcf5eaeae6c..000000000000
--- a/layout/reftests/css-page/page-name-orthogonal-writing-002.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-paged" style="writing-mode: vertical-rl">
-  <body>
-    <div style="page: a">a</div>
-    <div style="page: b">b</div>
-  </body>
-</html>
diff --git a/layout/reftests/css-page/page-name-orthogonal-writing-003.html b/layout/reftests/css-page/page-name-orthogonal-writing-003.html
deleted file mode 100644
index 8ab95f4c627d..000000000000
--- a/layout/reftests/css-page/page-name-orthogonal-writing-003.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-paged" style="writing-mode: horizontal-tb">
-  <body>
-    <div style="writing-mode: vertical-rl">
-      <div style="page: a">a</div>
-      <div style="page: b">b</div>
-    </div>
-  </body>
-</html>
diff --git a/layout/reftests/css-page/page-name-propagated-007.html b/layout/reftests/css-page/page-name-propagated-007.html
deleted file mode 100644
index 8353d2bc3d6d..000000000000
--- a/layout/reftests/css-page/page-name-propagated-007.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-paged">
-  <body>
-    <div>a</div>
-    <div>
-      <div>b</div>
-      <div style="page: x">c</div>
-    </div>
-    <div>d</div>
-  </body>
-</html>
diff --git a/layout/reftests/css-page/page-name-propagated-008.html b/layout/reftests/css-page/page-name-propagated-008.html
deleted file mode 100644
index c7b001938054..000000000000
--- a/layout/reftests/css-page/page-name-propagated-008.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-paged">
-  <body>
-    <div>
-      <div style="page: a">a</div>
-      <div>b</div>
-    </div>
-    <div style="page: a">c</div>
-  </body>
-</html>
diff --git a/layout/reftests/css-page/page-name-propagated-009.html b/layout/reftests/css-page/page-name-propagated-009.html
deleted file mode 100644
index 0db893a6acc9..000000000000
--- a/layout/reftests/css-page/page-name-propagated-009.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-paged">
-  <body>
-    <div>
-      <div style="page: a">a</div>
-      <div>b</div>
-    </div>
-    <div>c</div>
-  </body>
-</html>
diff --git a/layout/reftests/css-page/page-name-siblings-001.html b/layout/reftests/css-page/page-name-siblings-001.html
deleted file mode 100644
index 16bd26f4df90..000000000000
--- a/layout/reftests/css-page/page-name-siblings-001.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-paged">
-  <body>
-    <p style="page:b">a</p>
-    <p style="page:b">b</p>
-    <p>c</p>
-  </body>
-</html>
diff --git a/layout/reftests/css-page/page-name-siblings-002.html b/layout/reftests/css-page/page-name-siblings-002.html
deleted file mode 100644
index c0d69c95bcf6..000000000000
--- a/layout/reftests/css-page/page-name-siblings-002.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-paged">
-  <body>
-    <p style="page:a">a</p>
-    <div style="page:b">
-      <p style="page:a">b</p>
-      <p>c</p>
-    </div>
-  </body>
-</html>
diff --git a/layout/reftests/css-page/page-name-siblings-003.html b/layout/reftests/css-page/page-name-siblings-003.html
deleted file mode 100644
index 6ed9b2f006a5..000000000000
--- a/layout/reftests/css-page/page-name-siblings-003.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-paged">
-  <body>
-    <div style="page:a">
-      <p>a</p>
-    </div>
-    <p style="page:a">b</p>
-    <p style="page:b">c</p>
-  </body>
-</html>
diff --git a/layout/reftests/css-page/page-name-siblings-004.html b/layout/reftests/css-page/page-name-siblings-004.html
deleted file mode 100644
index 07f283664acd..000000000000
--- a/layout/reftests/css-page/page-name-siblings-004.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-paged">
-  <body>
-    <p>a</p>
-    <p style="page:auto">b</p>
-    <p style="page:b">c</p>
-  </body>
-</html>
diff --git a/layout/reftests/css-page/page-name-siblings-005.html b/layout/reftests/css-page/page-name-siblings-005.html
deleted file mode 100644
index cb42fd85a8a8..000000000000
--- a/layout/reftests/css-page/page-name-siblings-005.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-paged">
-  <body style="page:a">
-    <p style="page:a">a</p>
-    <p style="page:auto">b</p>
-    <p style="page:b">c</p>
-  </body>
-</html>
diff --git a/layout/reftests/css-page/page-name-siblings-ref.html b/layout/reftests/css-page/page-name-siblings-ref.html
deleted file mode 100644
index cc074694399c..000000000000
--- a/layout/reftests/css-page/page-name-siblings-ref.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-paged">
-  <body>
-    <p>a</p>
-    <p style="break-after: always">b</p>
-    <p>c</p>
-  </body>
-</html>
diff --git a/layout/reftests/css-page/reftest.list b/layout/reftests/css-page/reftest.list
index c275fcf51e4a..79fc41d1256d 100644
--- a/layout/reftests/css-page/reftest.list
+++ b/layout/reftests/css-page/reftest.list
@@ -1,53 +1,3 @@
-== layers-001.html layers-001-ref.html
-== layers-002.html layers-002-ref.html
-== layers-003.html layers-003-ref.html
-== layers-004.html layers-004-ref.html
-== page-name-abspos-001.html page-name-abspos-001-ref.html
-== page-name-abspos-002.html page-name-abspos-002-ref.html
-== page-name-abspos-003.html page-name-abspos-003-ref.html
-== page-name-canvas-001.html page-name-canvas-001-ref.html
-== page-name-canvas-002.html page-name-canvas-002-ref.html
-== page-name-canvas-003.html page-name-canvas-003-ref.html
-== page-name-canvas-004.html page-name-canvas-004-ref.html
-== page-name-display-none-child.html page-name-display-none-child-ref.html
-== page-name-fixed-pos-001.html page-name-fixed-pos-001-ref.html
-== page-name-flex-001.html page-name-flex-001-ref.html
-== page-name-flex-002.html page-name-flex-002-ref.html
-== page-name-flex-003.html page-name-flex-003-ref.html
-# This is affected by https://bugzilla.mozilla.org/1663079, however we can
-# still expect this to behave the same with break-after and page name breaks.
-== page-name-flex-004.html page-name-flex-004-ref.html
-== page-name-float-001.html page-name-float-001-ref.html
-== page-name-float-002.html page-name-float-002-ref.html
-== page-name-img-001.html page-name-img-001-ref.html
-== page-name-img-002.html page-name-img-002-ref.html
-== page-name-img-003.html page-name-img-003-ref.html
-== page-name-img-004.html page-name-img-004-ref.html
-== page-name-inline-block-001.html page-name-inline-block-001-ref.html
-== page-name-inline-block-002.html page-name-inline-block-002-ref.html
-== page-name-inline-block-003.html page-name-inline-block-003-ref.html
-== page-name-margin-001.html page-name-margin-001-ref.html
-== page-name-margin-002.html page-name-margin-002-ref.html
-== page-name-orthogonal-writing-001.html page-name-orthogonal-writing-001-ref.html
-== page-name-orthogonal-writing-002.html page-name-orthogonal-writing-002-ref.html
-== page-name-orthogonal-writing-003.html page-name-orthogonal-writing-003-ref.html
-== page-name-orthogonal-writing-004.html page-name-orthogonal-writing-004-ref.html
-== page-name-propagated-001.html page-name-propagated-001-ref.html
-== page-name-propagated-002.html page-name-propagated-002-ref.html
-# This is affected by https://bugzilla.mozilla.org/1818596, though that bug
-# affects both the ref and the test case in the same way.
-== page-name-propagated-003.html page-name-propagated-003-ref.html
-== page-name-propagated-004.html page-name-propagated-004-ref.html
-== page-name-propagated-005.html page-name-propagated-005-ref.html
-== page-name-propagated-006.html page-name-propagated-006-ref.html
-== page-name-propagated-007.html page-name-propagated-007-ref.html
-== page-name-propagated-008.html page-name-propagated-008-ref.html
-== page-name-propagated-009.html page-name-propagated-009-ref.html
-== page-name-siblings-001.html page-name-siblings-ref.html
-== page-name-siblings-002.html page-name-siblings-ref.html
-== page-name-siblings-003.html page-name-siblings-ref.html
-== page-name-siblings-004.html page-name-siblings-ref.html
-== page-name-siblings-005.html page-name-siblings-ref.html
 # Auto-generated test cases
 == page-name-two-page-001.html page-name-two-page-ref.html
 == page-name-two-page-002.html page-name-two-page-ref.html
@@ -84,7 +34,3 @@
 == page-name-two-page-033.html page-name-two-page-ref.html
 == page-name-two-page-034.html page-name-two-page-ref.html
 == page-name-two-page-035.html page-name-two-page-ref.html
-== page-name-zero-height-001.html page-name-zero-height-001-ref.html
-== pseudo-first-margin-001.html pseudo-first-margin-ref.html
-== pseudo-first-margin-002.html pseudo-first-margin-ref.html
-== pseudo-first-margin-003.html pseudo-first-margin-ref.html
diff --git a/testing/web-platform/meta/css/css-page/layers-002-print.html.ini b/testing/web-platform/meta/css/css-page/layers-002-print.html.ini
new file mode 100644
index 000000000000..e4dab0651dbc
--- /dev/null
+++ b/testing/web-platform/meta/css/css-page/layers-002-print.html.ini
@@ -0,0 +1,2 @@
+[layers-002-print.html]
+  fuzzy: maxDifference=0-20;totalPixels=0-60
diff --git a/testing/web-platform/meta/css/css-page/layers-003-print.html.ini b/testing/web-platform/meta/css/css-page/layers-003-print.html.ini
new file mode 100644
index 000000000000..20f764725d5a
--- /dev/null
+++ b/testing/web-platform/meta/css/css-page/layers-003-print.html.ini
@@ -0,0 +1,2 @@
+[layers-003-print.html]
+  fuzzy: maxDifference=0-30;totalPixels=0-60
diff --git a/testing/web-platform/meta/css/css-page/layers-004-print.html.ini b/testing/web-platform/meta/css/css-page/layers-004-print.html.ini
new file mode 100644
index 000000000000..2b5ce855488d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-page/layers-004-print.html.ini
@@ -0,0 +1,2 @@
+[layers-004-print.html]
+  fuzzy: maxDifference=0-30;totalPixels=0-60
diff --git a/testing/web-platform/meta/css/css-page/page-name-margin-001-print.html.ini b/testing/web-platform/meta/css/css-page/page-name-margin-001-print.html.ini
new file mode 100644
index 000000000000..d5a4dee40603
--- /dev/null
+++ b/testing/web-platform/meta/css/css-page/page-name-margin-001-print.html.ini
@@ -0,0 +1,2 @@
+[page-name-margin-001-print.html]
+  fuzzy: maxDifference=0-40;totalPixels=0-60
diff --git a/testing/web-platform/meta/css/css-page/pseudo-first-margin-001-print.html.ini b/testing/web-platform/meta/css/css-page/pseudo-first-margin-001-print.html.ini
new file mode 100644
index 000000000000..6dff1820d572
--- /dev/null
+++ b/testing/web-platform/meta/css/css-page/pseudo-first-margin-001-print.html.ini
@@ -0,0 +1,2 @@
+[pseudo-first-margin-001-print.html]
+  fuzzy: maxDifference=0-20;totalPixels=0-60
diff --git a/testing/web-platform/meta/css/css-page/pseudo-first-margin-002-print.html.ini b/testing/web-platform/meta/css/css-page/pseudo-first-margin-002-print.html.ini
new file mode 100644
index 000000000000..32e658b78b14
--- /dev/null
+++ b/testing/web-platform/meta/css/css-page/pseudo-first-margin-002-print.html.ini
@@ -0,0 +1,2 @@
+[pseudo-first-margin-002-print.html]
+  fuzzy: maxDifference=0-20;totalPixels=0-60
diff --git a/testing/web-platform/meta/css/css-page/pseudo-first-margin-003-print.html.ini b/testing/web-platform/meta/css/css-page/pseudo-first-margin-003-print.html.ini
new file mode 100644
index 000000000000..c74e044f5009
--- /dev/null
+++ b/testing/web-platform/meta/css/css-page/pseudo-first-margin-003-print.html.ini
@@ -0,0 +1,2 @@
+[pseudo-first-margin-003-print.html]
+  fuzzy: maxDifference=0-20;totalPixels=0-60
diff --git a/layout/reftests/css-page/layers-001-ref.html b/testing/web-platform/tests/css/css-page/layers-001-print-ref.html
similarity index 92%
rename from layout/reftests/css-page/layers-001-ref.html
rename to testing/web-platform/tests/css/css-page/layers-001-print-ref.html
index b2b10b0f2a1d..b2dae651d55c 100644
--- a/layout/reftests/css-page/layers-001-ref.html
+++ b/testing/web-platform/tests/css/css-page/layers-001-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <style>
 @page {
     margin: 0;
diff --git a/layout/reftests/css-page/layers-001.html b/testing/web-platform/tests/css/css-page/layers-001-print.html
similarity index 73%
rename from layout/reftests/css-page/layers-001.html
rename to testing/web-platform/tests/css/css-page/layers-001-print.html
index e6dbc85e1c6d..b097fbb8fc0f 100644
--- a/layout/reftests/css-page/layers-001.html
+++ b/testing/web-platform/tests/css/css-page/layers-001-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="layers-001-print-ref.html"/>
+  <link rel="help" href="https://drafts.csswg.org/css-cascade-5/#layering"/>
   <style>
 @layer layer1, layer2;
 @page b{
diff --git a/layout/reftests/css-page/layers-002-ref.html b/testing/web-platform/tests/css/css-page/layers-002-print-ref.html
similarity index 92%
rename from layout/reftests/css-page/layers-002-ref.html
rename to testing/web-platform/tests/css/css-page/layers-002-print-ref.html
index 0308153b40d7..b8b5fc1d1520 100644
--- a/layout/reftests/css-page/layers-002-ref.html
+++ b/testing/web-platform/tests/css/css-page/layers-002-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <style>
 @page {
     margin: 0;
diff --git a/layout/reftests/css-page/layers-002.html b/testing/web-platform/tests/css/css-page/layers-002-print.html
similarity index 73%
rename from layout/reftests/css-page/layers-002.html
rename to testing/web-platform/tests/css/css-page/layers-002-print.html
index 16f79a10d4d8..fb30ba9eb3d0 100644
--- a/layout/reftests/css-page/layers-002.html
+++ b/testing/web-platform/tests/css/css-page/layers-002-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="layers-002-print-ref.html"/>
+  <link rel="help" href="https://drafts.csswg.org/css-cascade-5/#layering"/>
   <style>
 @layer layer2, layer1;
 @page b{
diff --git a/layout/reftests/css-page/layers-003-ref.html b/testing/web-platform/tests/css/css-page/layers-003-print-ref.html
similarity index 93%
rename from layout/reftests/css-page/layers-003-ref.html
rename to testing/web-platform/tests/css/css-page/layers-003-print-ref.html
index f536e0989358..70e43fb6f50a 100644
--- a/layout/reftests/css-page/layers-003-ref.html
+++ b/testing/web-platform/tests/css/css-page/layers-003-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <style>
 @page {
     margin: 0;
diff --git a/layout/reftests/css-page/layers-003.html b/testing/web-platform/tests/css/css-page/layers-003-print.html
similarity index 78%
rename from layout/reftests/css-page/layers-003.html
rename to testing/web-platform/tests/css/css-page/layers-003-print.html
index 9246a4718c36..ace3d5c8c01e 100644
--- a/layout/reftests/css-page/layers-003.html
+++ b/testing/web-platform/tests/css/css-page/layers-003-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="layers-003-print-ref.html"/>
+  <link rel="help" href="https://drafts.csswg.org/css-cascade-5/#layering"/>
   <style>
 @layer layer1, layer2;
 @page b{
diff --git a/layout/reftests/css-page/layers-004-ref.html b/testing/web-platform/tests/css/css-page/layers-004-print-ref.html
similarity index 92%
rename from layout/reftests/css-page/layers-004-ref.html
rename to testing/web-platform/tests/css/css-page/layers-004-print-ref.html
index 37363a2dc7e0..a779b263c7d2 100644
--- a/layout/reftests/css-page/layers-004-ref.html
+++ b/testing/web-platform/tests/css/css-page/layers-004-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <style>
 @page {
     margin: 0;
diff --git a/layout/reftests/css-page/layers-004.html b/testing/web-platform/tests/css/css-page/layers-004-print.html
similarity index 78%
rename from layout/reftests/css-page/layers-004.html
rename to testing/web-platform/tests/css/css-page/layers-004-print.html
index 5f8f9ba19c80..5e84d2a32266 100644
--- a/layout/reftests/css-page/layers-004.html
+++ b/testing/web-platform/tests/css/css-page/layers-004-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="layers-004-print-ref.html"/>
+  <link rel="help" href="https://drafts.csswg.org/css-cascade-5/#layering">
   <style>
 @layer layer2, layer1;
 @page b{
diff --git a/layout/reftests/css-page/page-name-abspos-001-ref.html b/testing/web-platform/tests/css/css-page/page-name-abspos-001-print-ref.html
similarity index 80%
rename from layout/reftests/css-page/page-name-abspos-001-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-abspos-001-print-ref.html
index 15d9c5d18eff..dc61a550780b 100644
--- a/layout/reftests/css-page/page-name-abspos-001-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-abspos-001-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
     <div>a</div>
     <div style="position: absolute; right: 0; top: 0;">b</div>
diff --git a/testing/web-platform/tests/css/css-page/page-name-abspos-001-print.html b/testing/web-platform/tests/css/css-page/page-name-abspos-001-print.html
new file mode 100644
index 000000000000..df2f61493580
--- /dev/null
+++ b/testing/web-platform/tests/css/css-page/page-name-abspos-001-print.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <link rel="match" href="page-name-abspos-001-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
+  <body>
+    <div>a</div>
+    <div style="page: b; position: absolute; right: 0; top: 0;">b</div>
+  </body>
+</html>
diff --git a/layout/reftests/css-page/page-name-abspos-002-ref.html b/testing/web-platform/tests/css/css-page/page-name-abspos-002-print-ref.html
similarity index 83%
rename from layout/reftests/css-page/page-name-abspos-002-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-abspos-002-print-ref.html
index 145012fe8d79..c93ee0a31df0 100644
--- a/layout/reftests/css-page/page-name-abspos-002-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-abspos-002-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
     <div style="position: absolute; left: 0; top: 0;">
       <div>a</div>
diff --git a/layout/reftests/css-page/page-name-abspos-002.html b/testing/web-platform/tests/css/css-page/page-name-abspos-002-print.html
similarity index 54%
rename from layout/reftests/css-page/page-name-abspos-002.html
rename to testing/web-platform/tests/css/css-page/page-name-abspos-002-print.html
index 23c324dac7a7..f0accb36c2e8 100644
--- a/layout/reftests/css-page/page-name-abspos-002.html
+++ b/testing/web-platform/tests/css/css-page/page-name-abspos-002-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="page-name-abspos-002-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
   <body>
     <div style="position: absolute; left: 0; top: 0;">
       <div style="page: a">a</div>
diff --git a/layout/reftests/css-page/page-name-abspos-003-ref.html b/testing/web-platform/tests/css/css-page/page-name-abspos-003-print-ref.html
similarity index 87%
rename from layout/reftests/css-page/page-name-abspos-003-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-abspos-003-print-ref.html
index 918b1beeee69..d920fd974a85 100644
--- a/layout/reftests/css-page/page-name-abspos-003-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-abspos-003-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
     <div style="page: a">a</div>
     <div style="page: b; position: absolute; left: 0; top: 0;">b</div>
diff --git a/layout/reftests/css-page/page-name-abspos-003.html b/testing/web-platform/tests/css/css-page/page-name-abspos-003-print.html
similarity index 54%
rename from layout/reftests/css-page/page-name-abspos-003.html
rename to testing/web-platform/tests/css/css-page/page-name-abspos-003-print.html
index b086a4aa7ab8..0361f669ca98 100644
--- a/layout/reftests/css-page/page-name-abspos-003.html
+++ b/testing/web-platform/tests/css/css-page/page-name-abspos-003-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="page-name-abspos-003-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
   <body>
     <div style="page: a">a</div>
     <div style="page: b; position: absolute; left: 0; top: 0;">b</div>
diff --git a/layout/reftests/css-page/page-name-canvas-001-ref.html b/testing/web-platform/tests/css/css-page/page-name-canvas-001-print-ref.html
similarity index 62%
rename from layout/reftests/css-page/page-name-canvas-001-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-canvas-001-print-ref.html
index 082807ffbd22..245b1c5bdd10 100644
--- a/layout/reftests/css-page/page-name-canvas-001-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-canvas-001-print-ref.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
-    <canvas height="1" style="border: 1px solid black; break-after: always"></canvas>
-    <p>b</p>
+    <canvas height="1" style="border: 1px solid black; break-after: page"></canvas>
+    <div>b</div>
   </body>
 </html>
diff --git a/testing/web-platform/tests/css/css-page/page-name-canvas-001-print.html b/testing/web-platform/tests/css/css-page/page-name-canvas-001-print.html
new file mode 100644
index 000000000000..64b879efbbc4
--- /dev/null
+++ b/testing/web-platform/tests/css/css-page/page-name-canvas-001-print.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <link rel="match" href="page-name-canvas-001-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
+  <body style="page:a">
+    <canvas height="1" style="page:b; border: 1px solid black"></canvas>
+    <div style="page:b">b</div>
+  </body>
+</html>
diff --git a/layout/reftests/css-page/page-name-canvas-002-ref.html b/testing/web-platform/tests/css/css-page/page-name-canvas-002-print-ref.html
similarity index 60%
rename from layout/reftests/css-page/page-name-canvas-002-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-canvas-002-print-ref.html
index b00e152b99ed..76c3f718cd9f 100644
--- a/layout/reftests/css-page/page-name-canvas-002-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-canvas-002-print-ref.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
-    <p style="break-after: always">a</p>
+    <div style="break-after: page">a</div>
     <canvas height="1" style="border: 1px solid black"></canvas>
   </body>
 </html>
diff --git a/testing/web-platform/tests/css/css-page/page-name-canvas-002-print.html b/testing/web-platform/tests/css/css-page/page-name-canvas-002-print.html
new file mode 100644
index 000000000000..7a1bc7d9a00a
--- /dev/null
+++ b/testing/web-platform/tests/css/css-page/page-name-canvas-002-print.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <link rel="match" href="page-name-canvas-002-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
+  <body style="page:a">
+    <div style="page:b">a</div>
+    <canvas height="1" style="page:b; border: 1px solid black"></canvas>
+  </body>
+</html>
diff --git a/layout/reftests/css-page/page-name-canvas-003-ref.html b/testing/web-platform/tests/css/css-page/page-name-canvas-003-print-ref.html
similarity index 82%
rename from layout/reftests/css-page/page-name-canvas-003-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-canvas-003-print-ref.html
index 4ce545d81092..2aaa9915fa01 100644
--- a/layout/reftests/css-page/page-name-canvas-003-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-canvas-003-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
     <canvas height="1" style="display: block; border: 1px solid black"></canvas>
     <div>b</div>
diff --git a/layout/reftests/css-page/page-name-canvas-003.html b/testing/web-platform/tests/css/css-page/page-name-canvas-003-print.html
similarity index 54%
rename from layout/reftests/css-page/page-name-canvas-003.html
rename to testing/web-platform/tests/css/css-page/page-name-canvas-003-print.html
index c8e15e098d8d..cbebc42153f9 100644
--- a/layout/reftests/css-page/page-name-canvas-003.html
+++ b/testing/web-platform/tests/css/css-page/page-name-canvas-003-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="page-name-canvas-003-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
   <body style="page:a">
     <canvas height="1" style="display: block; page: b; border: 1px solid black"></canvas>
     <div style="page:b">b</div>
diff --git a/layout/reftests/css-page/page-name-canvas-004-ref.html b/testing/web-platform/tests/css/css-page/page-name-canvas-004-print-ref.html
similarity index 85%
rename from layout/reftests/css-page/page-name-canvas-004-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-canvas-004-print-ref.html
index 3ee80270203a..26a5072789b1 100644
--- a/layout/reftests/css-page/page-name-canvas-004-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-canvas-004-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body style="page:a">
     <canvas height="1" style="display: block; break-after: page; border: 1px solid black"></canvas>
     <div>b</div>
diff --git a/layout/reftests/css-page/page-name-canvas-004.html b/testing/web-platform/tests/css/css-page/page-name-canvas-004-print.html
similarity index 52%
rename from layout/reftests/css-page/page-name-canvas-004.html
rename to testing/web-platform/tests/css/css-page/page-name-canvas-004-print.html
index 6b4cad2ede24..6343a509262d 100644
--- a/layout/reftests/css-page/page-name-canvas-004.html
+++ b/testing/web-platform/tests/css/css-page/page-name-canvas-004-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="page-name-canvas-004-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
   <body style="page:a">
     <canvas height="1" style="display: block; page: b; border: 1px solid black"></canvas>
     <div>b</div>
diff --git a/layout/reftests/css-page/page-name-display-none-child-ref.html b/testing/web-platform/tests/css/css-page/page-name-display-none-child-print-ref.html
similarity index 50%
rename from layout/reftests/css-page/page-name-display-none-child-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-display-none-child-print-ref.html
index 39d4e1e3c56d..b7044e0776a8 100644
--- a/layout/reftests/css-page/page-name-display-none-child-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-display-none-child-print-ref.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
-    <p style="break-after:always">a</p>
+    <div style="break-after: page">a</div>
     <!-- This should match the test case, even if page-breaks are being coalesced -->
-    <div style="break-after:always"></div>
-    <p>b</p>
+    <div style="break-after: page"></div>
+    <div>b</div>
   </body>
 </html>
diff --git a/testing/web-platform/tests/css/css-page/page-name-display-none-child-print.html b/testing/web-platform/tests/css/css-page/page-name-display-none-child-print.html
new file mode 100644
index 000000000000..f42aae35c0a5
--- /dev/null
+++ b/testing/web-platform/tests/css/css-page/page-name-display-none-child-print.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <link rel="match" href="page-name-display-none-child-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
+  <body>
+    <div style="page:a">a</div>
+    <div style="page:c">
+      <div style="display: none">c</div>
+    </div>
+    <div style="page:b">b</div>
+  </body>
+</html>
diff --git a/layout/reftests/css-page/page-name-fixed-pos-001-ref.html b/testing/web-platform/tests/css/css-page/page-name-fixed-pos-001-print-ref.html
similarity index 91%
rename from layout/reftests/css-page/page-name-fixed-pos-001-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-fixed-pos-001-print-ref.html
index 5b49a5ec88df..5c1e91ea8582 100644
--- a/layout/reftests/css-page/page-name-fixed-pos-001-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-fixed-pos-001-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <style>
 div {
     width: 1in;
diff --git a/layout/reftests/css-page/page-name-fixed-pos-001.html b/testing/web-platform/tests/css/css-page/page-name-fixed-pos-001-print.html
similarity index 68%
rename from layout/reftests/css-page/page-name-fixed-pos-001.html
rename to testing/web-platform/tests/css/css-page/page-name-fixed-pos-001-print.html
index b70dd85f2b92..495c66ce2e8f 100644
--- a/layout/reftests/css-page/page-name-fixed-pos-001.html
+++ b/testing/web-platform/tests/css/css-page/page-name-fixed-pos-001-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="page-name-fixed-pos-001-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
   <style>
 div {
     width: 1in;
diff --git a/layout/reftests/css-page/page-name-flex-001-ref.html b/testing/web-platform/tests/css/css-page/page-name-flex-001-print-ref.html
similarity index 86%
rename from layout/reftests/css-page/page-name-flex-001-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-flex-001-print-ref.html
index 1081188abf9e..8cd606f8040a 100644
--- a/layout/reftests/css-page/page-name-flex-001-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-flex-001-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
     <div>a</div>
     <div style="display:flex; flex-direction:column">
diff --git a/layout/reftests/css-page/page-name-flex-001.html b/testing/web-platform/tests/css/css-page/page-name-flex-001-print.html
similarity index 58%
rename from layout/reftests/css-page/page-name-flex-001.html
rename to testing/web-platform/tests/css/css-page/page-name-flex-001-print.html
index 42f82d03d5f5..9b932e69d2dd 100644
--- a/layout/reftests/css-page/page-name-flex-001.html
+++ b/testing/web-platform/tests/css/css-page/page-name-flex-001-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="page-name-flex-001-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
   <body>
     <div>a</div>
     <div style="display:flex; flex-direction:column">
diff --git a/layout/reftests/css-page/page-name-flex-002-ref.html b/testing/web-platform/tests/css/css-page/page-name-flex-002-print-ref.html
similarity index 84%
rename from layout/reftests/css-page/page-name-flex-002-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-flex-002-print-ref.html
index ee4b1dffa32f..dbd9bca9ebf8 100644
--- a/layout/reftests/css-page/page-name-flex-002-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-flex-002-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
     <div>a</div>
     <div style="display:flex">
diff --git a/layout/reftests/css-page/page-name-flex-002.html b/testing/web-platform/tests/css/css-page/page-name-flex-002-print.html
similarity index 55%
rename from layout/reftests/css-page/page-name-flex-002.html
rename to testing/web-platform/tests/css/css-page/page-name-flex-002-print.html
index 5eeed49f30f1..a25e22d6fbd3 100644
--- a/layout/reftests/css-page/page-name-flex-002.html
+++ b/testing/web-platform/tests/css/css-page/page-name-flex-002-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="page-name-flex-002-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
   <body>
     <div>a</div>
     <div style="display:flex">
diff --git a/layout/reftests/css-page/page-name-flex-003-ref.html b/testing/web-platform/tests/css/css-page/page-name-flex-003-print-ref.html
similarity index 88%
rename from layout/reftests/css-page/page-name-flex-003-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-flex-003-print-ref.html
index 8df2a9b54dc7..6d33db527bc9 100644
--- a/layout/reftests/css-page/page-name-flex-003-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-flex-003-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
     <div>a</div>
     <div style="break-before: page; break-after: page; display:flex; flex-direction:column">
diff --git a/layout/reftests/css-page/page-name-flex-003.html b/testing/web-platform/tests/css/css-page/page-name-flex-003-print.html
similarity index 57%
rename from layout/reftests/css-page/page-name-flex-003.html
rename to testing/web-platform/tests/css/css-page/page-name-flex-003-print.html
index 42e657826e32..2cfbb6fb7cac 100644
--- a/layout/reftests/css-page/page-name-flex-003.html
+++ b/testing/web-platform/tests/css/css-page/page-name-flex-003-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="page-name-flex-003-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
   <body style="page:a">
     <div>a</div>
     <div style="page:b; display:flex; flex-direction:column">
diff --git a/layout/reftests/css-page/page-name-flex-004-ref.html b/testing/web-platform/tests/css/css-page/page-name-flex-004-print-ref.html
similarity index 89%
rename from layout/reftests/css-page/page-name-flex-004-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-flex-004-print-ref.html
index c6e572a5d94e..85524dfb22a3 100644
--- a/layout/reftests/css-page/page-name-flex-004-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-flex-004-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
     <div>a</div>
     <div style="display:flex; flex-direction:column">
diff --git a/layout/reftests/css-page/page-name-flex-004.html b/testing/web-platform/tests/css/css-page/page-name-flex-004-print.html
similarity index 64%
rename from layout/reftests/css-page/page-name-flex-004.html
rename to testing/web-platform/tests/css/css-page/page-name-flex-004-print.html
index 319513aa0620..aa20ad1cb7d2 100644
--- a/layout/reftests/css-page/page-name-flex-004.html
+++ b/testing/web-platform/tests/css/css-page/page-name-flex-004-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="page-name-flex-004-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
   <body>
     <div>a</div>
     <div style="display:flex; flex-direction:column">
diff --git a/layout/reftests/css-page/page-name-float-001-ref.html b/testing/web-platform/tests/css/css-page/page-name-float-001-print-ref.html
similarity index 77%
rename from layout/reftests/css-page/page-name-float-001-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-float-001-print-ref.html
index ddeb51aa8b55..15ae3b76eba4 100644
--- a/layout/reftests/css-page/page-name-float-001-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-float-001-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
     <div style="float: left;">a</div>
     <div>b</div>
diff --git a/testing/web-platform/tests/css/css-page/page-name-float-001-print.html b/testing/web-platform/tests/css/css-page/page-name-float-001-print.html
new file mode 100644
index 000000000000..4233bac5c062
--- /dev/null
+++ b/testing/web-platform/tests/css/css-page/page-name-float-001-print.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <link rel="match" href="page-name-float-001-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
+  <body>
+    <div style="page: a; float: left;">a</div>
+    <div style="page: b">b</div>
+  </body>
+</html>
diff --git a/layout/reftests/css-page/page-name-float-002-ref.html b/testing/web-platform/tests/css/css-page/page-name-float-002-print-ref.html
similarity index 83%
rename from layout/reftests/css-page/page-name-float-002-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-float-002-print-ref.html
index bb16cf15bce9..e703746e558d 100644
--- a/layout/reftests/css-page/page-name-float-002-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-float-002-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
     <div>a</div>
     <div style="float: left;">b</div>
diff --git a/layout/reftests/css-page/page-name-float-002.html b/testing/web-platform/tests/css/css-page/page-name-float-002-print.html
similarity index 50%
rename from layout/reftests/css-page/page-name-float-002.html
rename to testing/web-platform/tests/css/css-page/page-name-float-002-print.html
index d0a3982ef64c..db4f0b28ce0c 100644
--- a/layout/reftests/css-page/page-name-float-002.html
+++ b/testing/web-platform/tests/css/css-page/page-name-float-002-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="page-name-float-002-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
   <body>
     <div style="page: a">a</div>
     <div style="page: b; float: left;">b</div>
diff --git a/testing/web-platform/tests/css/css-page/page-name-img-001-print-ref.html b/testing/web-platform/tests/css/css-page/page-name-img-001-print-ref.html
new file mode 100644
index 000000000000..0a51da3948ad
--- /dev/null
+++ b/testing/web-platform/tests/css/css-page/page-name-img-001-print-ref.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<html>
+  <body>
+    <img style="break-after: page" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAIAAAABc2X6AAAAa0lEQVR42u3QMREAAAwCMfybbl3AEu4NhCQ3abUAAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwOXwbunRwEDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDA3d78VrQ4ODmDDUAAAAASUVORK5CYII=">
+    <div>b</div>
+  </body>
+</html>
diff --git a/layout/reftests/css-page/page-name-img-001.html b/testing/web-platform/tests/css/css-page/page-name-img-001-print.html
similarity index 64%
rename from layout/reftests/css-page/page-name-img-001.html
rename to testing/web-platform/tests/css/css-page/page-name-img-001-print.html
index dd57f99ae8c6..7864b869d9c4 100644
--- a/layout/reftests/css-page/page-name-img-001.html
+++ b/testing/web-platform/tests/css/css-page/page-name-img-001-print.html
@@ -1,7 +1,9 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="page-name-img-001-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
   <body style="page:a">
     <img style="page:b" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAIAAAABc2X6AAAAa0lEQVR42u3QMREAAAwCMfybbl3AEu4NhCQ3abUAAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwOXwbunRwEDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDA3d78VrQ4ODmDDUAAAAASUVORK5CYII=">
-    <p style="page:b">b</p>
+    <div style="page:b">b</div>
   </body>
 </html>
diff --git a/layout/reftests/css-page/page-name-img-002-ref.html b/testing/web-platform/tests/css/css-page/page-name-img-002-print-ref.html
similarity index 81%
rename from layout/reftests/css-page/page-name-img-002-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-img-002-print-ref.html
index 57cab7b63c27..83cf77bf71ce 100644
--- a/layout/reftests/css-page/page-name-img-002-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-img-002-print-ref.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
-    <p style="break-after: always">a</p>
+    <div style="break-after: page">a</div>
     <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAIAAAABc2X6AAAAa0lEQVR42u3QMREAAAwCMfybbl3AEu4NhCQ3abUAAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwOXwbunRwEDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDA3d78VrQ4ODmDDUAAAAASUVORK5CYII=">
   </body>
 </html>
diff --git a/layout/reftests/css-page/page-name-img-002.html b/testing/web-platform/tests/css/css-page/page-name-img-002-print.html
similarity index 64%
rename from layout/reftests/css-page/page-name-img-002.html
rename to testing/web-platform/tests/css/css-page/page-name-img-002-print.html
index 4873cc1d2dee..3857986ca94c 100644
--- a/layout/reftests/css-page/page-name-img-002.html
+++ b/testing/web-platform/tests/css/css-page/page-name-img-002-print.html
@@ -1,7 +1,9 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="page-name-img-002-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
   <body style="page:a">
-    <p style="page:b">a</p>
+    <div style="page:b">a</div>
     <img style="page:b" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAIAAAABc2X6AAAAa0lEQVR42u3QMREAAAwCMfybbl3AEu4NhCQ3abUAAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwOXwbunRwEDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDA3d78VrQ4ODmDDUAAAAASUVORK5CYII=">
   </body>
 </html>
diff --git a/layout/reftests/css-page/page-name-img-003-ref.html b/testing/web-platform/tests/css/css-page/page-name-img-003-print-ref.html
similarity index 92%
rename from layout/reftests/css-page/page-name-img-003-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-img-003-print-ref.html
index 102f37d584f2..43a7cc43be13 100644
--- a/layout/reftests/css-page/page-name-img-003-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-img-003-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
     <img style="display: block;" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAIAAAABc2X6AAAAa0lEQVR42u3QMREAAAwCMfybbl3AEu4NhCQ3abUAAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwOXwbunRwEDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDA3d78VrQ4ODmDDUAAAAASUVORK5CYII=">
     <div>b</div>
diff --git a/layout/reftests/css-page/page-name-img-003.html b/testing/web-platform/tests/css/css-page/page-name-img-003-print.html
similarity index 71%
rename from layout/reftests/css-page/page-name-img-003.html
rename to testing/web-platform/tests/css/css-page/page-name-img-003-print.html
index 150e903ebcbe..26790f0e7a3f 100644
--- a/layout/reftests/css-page/page-name-img-003.html
+++ b/testing/web-platform/tests/css/css-page/page-name-img-003-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="page-name-img-003-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
   <body style="page:a">
     <img style="display: block; page: b" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAIAAAABc2X6AAAAa0lEQVR42u3QMREAAAwCMfybbl3AEu4NhCQ3abUAAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwOXwbunRwEDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDA3d78VrQ4ODmDDUAAAAASUVORK5CYII=">
     <div style="page:b">b</div>
diff --git a/layout/reftests/css-page/page-name-img-004-ref.html b/testing/web-platform/tests/css/css-page/page-name-img-004-print-ref.html
similarity index 92%
rename from layout/reftests/css-page/page-name-img-004-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-img-004-print-ref.html
index 70310a4c3346..fe55758bc017 100644
--- a/layout/reftests/css-page/page-name-img-004-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-img-004-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
     <div>a</div>
     <img style="display: block;" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAIAAAABc2X6AAAAa0lEQVR42u3QMREAAAwCMfybbl3AEu4NhCQ3abUAAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwOXwbunRwEDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDA3d78VrQ4ODmDDUAAAAASUVORK5CYII=">
diff --git a/layout/reftests/css-page/page-name-img-004.html b/testing/web-platform/tests/css/css-page/page-name-img-004-print.html
similarity index 71%
rename from layout/reftests/css-page/page-name-img-004.html
rename to testing/web-platform/tests/css/css-page/page-name-img-004-print.html
index e30c16059955..13fbeb01b5c3 100644
--- a/layout/reftests/css-page/page-name-img-004.html
+++ b/testing/web-platform/tests/css/css-page/page-name-img-004-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="page-name-img-004-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
   <body style="page:a">
     <div style="page: b">a</div>
     <img style="display: block; page: b" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAIAAAABc2X6AAAAa0lEQVR42u3QMREAAAwCMfybbl3AEu4NhCQ3abUAAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwOXwbunRwEDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDA3d78VrQ4ODmDDUAAAAASUVORK5CYII=">
diff --git a/layout/reftests/css-page/page-name-inline-block-001-ref.html b/testing/web-platform/tests/css/css-page/page-name-inline-block-001-print-ref.html
similarity index 81%
rename from layout/reftests/css-page/page-name-inline-block-001-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-inline-block-001-print-ref.html
index cfa156b14774..ffcf2c8964f2 100644
--- a/layout/reftests/css-page/page-name-inline-block-001-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-inline-block-001-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
     <div style="display: inline-block">
       <div>a</div>
diff --git a/layout/reftests/css-page/page-name-inline-block-001.html b/testing/web-platform/tests/css/css-page/page-name-inline-block-001-print.html
similarity index 50%
rename from layout/reftests/css-page/page-name-inline-block-001.html
rename to testing/web-platform/tests/css/css-page/page-name-inline-block-001-print.html
index 75371b269dc6..365a24146a4c 100644
--- a/layout/reftests/css-page/page-name-inline-block-001.html
+++ b/testing/web-platform/tests/css/css-page/page-name-inline-block-001-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="page-name-inline-block-001-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
   <body>
     <div style="display: inline-block">
       <div style="page: a">a</div>
diff --git a/layout/reftests/css-page/page-name-inline-block-002-ref.html b/testing/web-platform/tests/css/css-page/page-name-inline-block-002-print-ref.html
similarity index 85%
rename from layout/reftests/css-page/page-name-inline-block-002-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-inline-block-002-print-ref.html
index ec483e2e7947..0cbd721e4cfd 100644
--- a/layout/reftests/css-page/page-name-inline-block-002-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-inline-block-002-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
     <div style="display: inline-block">
       <div>a</div>
diff --git a/layout/reftests/css-page/page-name-inline-block-002.html b/testing/web-platform/tests/css/css-page/page-name-inline-block-002-print.html
similarity index 56%
rename from layout/reftests/css-page/page-name-inline-block-002.html
rename to testing/web-platform/tests/css/css-page/page-name-inline-block-002-print.html
index 22416a44a915..cb65afa924bb 100644
--- a/layout/reftests/css-page/page-name-inline-block-002.html
+++ b/testing/web-platform/tests/css/css-page/page-name-inline-block-002-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="page-name-inline-block-002-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
   <body>
     <div style="page: c; display: inline-block">
       <div style="page: a">a</div>
diff --git a/layout/reftests/css-page/page-name-inline-block-003-ref.html b/testing/web-platform/tests/css/css-page/page-name-inline-block-003-print-ref.html
similarity index 82%
rename from layout/reftests/css-page/page-name-inline-block-003-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-inline-block-003-print-ref.html
index 73b17681be5d..35db44b14e12 100644
--- a/layout/reftests/css-page/page-name-inline-block-003-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-inline-block-003-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
     <div style="display: inline-block">a</div>
     <div style="display: inline-block">b</div>
diff --git a/testing/web-platform/tests/css/css-page/page-name-inline-block-003-print.html b/testing/web-platform/tests/css/css-page/page-name-inline-block-003-print.html
new file mode 100644
index 000000000000..994f506999aa
--- /dev/null
+++ b/testing/web-platform/tests/css/css-page/page-name-inline-block-003-print.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <link rel="match" href="page-name-inline-block-003-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
+  <body>
+    <div style="page: a; display: inline-block">a</div>
+    <div style="page: b; display: inline-block">b</div>
+  </body>
+</html>
diff --git a/layout/reftests/css-page/page-name-margin-001-ref.html b/testing/web-platform/tests/css/css-page/page-name-margin-001-print-ref.html
similarity index 94%
rename from layout/reftests/css-page/page-name-margin-001-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-margin-001-print-ref.html
index c438cbf85876..60726e6e1545 100644
--- a/layout/reftests/css-page/page-name-margin-001-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-margin-001-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <style>
 @page {
     margin: 0;
diff --git a/layout/reftests/css-page/page-name-margin-001.html b/testing/web-platform/tests/css/css-page/page-name-margin-001-print.html
similarity index 71%
rename from layout/reftests/css-page/page-name-margin-001.html
rename to testing/web-platform/tests/css/css-page/page-name-margin-001-print.html
index ebbcb1db40fd..9514339e4545 100644
--- a/layout/reftests/css-page/page-name-margin-001.html
+++ b/testing/web-platform/tests/css/css-page/page-name-margin-001-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="page-name-margin-001-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
   <style>
 @page a {
     margin: 0;
diff --git a/layout/reftests/css-page/page-name-margin-002-ref.html b/testing/web-platform/tests/css/css-page/page-name-margin-002-print-ref.html
similarity index 90%
rename from layout/reftests/css-page/page-name-margin-002-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-margin-002-print-ref.html
index 0068bd6f1293..0e28b4c8b601 100644
--- a/layout/reftests/css-page/page-name-margin-002-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-margin-002-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <style>
 @page {
     margin: 0;
diff --git a/layout/reftests/css-page/page-name-margin-002.html b/testing/web-platform/tests/css/css-page/page-name-margin-002-print.html
similarity index 60%
rename from layout/reftests/css-page/page-name-margin-002.html
rename to testing/web-platform/tests/css/css-page/page-name-margin-002-print.html
index a7e4308e9884..0ab67f306927 100644
--- a/layout/reftests/css-page/page-name-margin-002.html
+++ b/testing/web-platform/tests/css/css-page/page-name-margin-002-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="page-name-margin-002-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
   <style>
 @page a {
     margin: 1in;
diff --git a/layout/reftests/css-page/page-name-orthogonal-writing-001-ref.html b/testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-001-print-ref.html
similarity index 68%
rename from layout/reftests/css-page/page-name-orthogonal-writing-001-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-001-print-ref.html
index f0ac73f874d4..60218fbb4718 100644
--- a/layout/reftests/css-page/page-name-orthogonal-writing-001-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-001-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged" style="writing-mode: vertical-rl">
+<html style="writing-mode: vertical-rl">
   <body>
     <div style="writing-mode: horizontal-tb">
       <div>a</div>
diff --git a/testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-001-print.html b/testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-001-print.html
new file mode 100644
index 000000000000..c84b3e5ee96a
--- /dev/null
+++ b/testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-001-print.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html style="writing-mode: vertical-rl">
+  <link rel="match" href="page-name-orthogonal-writing-001-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
+  <body>
+    <div style="writing-mode: horizontal-tb">
+      <div style="page: a">a</div>
+      <div style="page: b">b</div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/css-page/page-name-orthogonal-writing-002-ref.html b/testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-002-print-ref.html
similarity index 63%
rename from layout/reftests/css-page/page-name-orthogonal-writing-002-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-002-print-ref.html
index f1d3c64839c2..176d5abda5ed 100644
--- a/layout/reftests/css-page/page-name-orthogonal-writing-002-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-002-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged" style="writing-mode: vertical-rl">
+<html style="writing-mode: vertical-rl">
   <body>
     <div style="margin-block-end: 999in">a</div>
     <div>b</div>
diff --git a/testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-002-print.html b/testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-002-print.html
new file mode 100644
index 000000000000..a720090ba6e9
--- /dev/null
+++ b/testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-002-print.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html style="writing-mode: vertical-rl">
+  <link rel="match" href="page-name-orthogonal-writing-002-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
+  <body>
+    <div style="page: a">a</div>
+    <div style="page: b">b</div>
+  </body>
+</html>
diff --git a/layout/reftests/css-page/page-name-orthogonal-writing-003-ref.html b/testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-003-print-ref.html
similarity index 67%
rename from layout/reftests/css-page/page-name-orthogonal-writing-003-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-003-print-ref.html
index 77fee0e31e00..cae1f8d7d310 100644
--- a/layout/reftests/css-page/page-name-orthogonal-writing-003-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-003-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged" style="writing-mode: horizontal-tb">
+<html style="writing-mode: horizontal-tb">
   <body>
     <div style="writing-mode: vertical-rl">
       <div>a</div>
diff --git a/testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-003-print.html b/testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-003-print.html
new file mode 100644
index 000000000000..6d24c324081c
--- /dev/null
+++ b/testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-003-print.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html style="writing-mode: horizontal-tb">
+  <link rel="match" href="page-name-orthogonal-writing-003-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
+  <body>
+    <div style="writing-mode: vertical-rl">
+      <div style="page: a">a</div>
+      <div style="page: b">b</div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/css-page/page-name-orthogonal-writing-004-ref.html b/testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-004-print-ref.html
similarity index 88%
rename from layout/reftests/css-page/page-name-orthogonal-writing-004-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-004-print-ref.html
index 7a97341af047..6d69497386ba 100644
--- a/layout/reftests/css-page/page-name-orthogonal-writing-004-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-004-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
     <div style="writing-mode: vertical-rl">
       <div style="writing-mode: horizontal-tb">
diff --git a/layout/reftests/css-page/page-name-orthogonal-writing-004.html b/testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-004-print.html
similarity index 58%
rename from layout/reftests/css-page/page-name-orthogonal-writing-004.html
rename to testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-004-print.html
index ab2fc67646c3..8e6176584ddb 100644
--- a/layout/reftests/css-page/page-name-orthogonal-writing-004.html
+++ b/testing/web-platform/tests/css/css-page/page-name-orthogonal-writing-004-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="page-name-orthogonal-writing-004-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
   <body>
     <div style="writing-mode: vertical-rl">
       <div style="writing-mode: horizontal-tb">
diff --git a/layout/reftests/css-page/page-name-propagated-001-ref.html b/testing/web-platform/tests/css/css-page/page-name-propagated-001-print-ref.html
similarity index 81%
rename from layout/reftests/css-page/page-name-propagated-001-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-propagated-001-print-ref.html
index aff27b6e16ba..7cd7b54c2319 100644
--- a/layout/reftests/css-page/page-name-propagated-001-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-propagated-001-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
     <div>a</div>
     <div>
diff --git a/layout/reftests/css-page/page-name-propagated-001.html b/testing/web-platform/tests/css/css-page/page-name-propagated-001-print.html
similarity index 55%
rename from layout/reftests/css-page/page-name-propagated-001.html
rename to testing/web-platform/tests/css/css-page/page-name-propagated-001-print.html
index adabaec793f1..3efaf7695beb 100644
--- a/layout/reftests/css-page/page-name-propagated-001.html
+++ b/testing/web-platform/tests/css/css-page/page-name-propagated-001-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="page-name-propagated-001-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
   <body>
     <div style="page: a">a</div>
     <div style="page: b">
diff --git a/layout/reftests/css-page/page-name-propagated-002-ref.html b/testing/web-platform/tests/css/css-page/page-name-propagated-002-print-ref.html
similarity index 88%
rename from layout/reftests/css-page/page-name-propagated-002-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-propagated-002-print-ref.html
index f1fb01ac4576..d4191ae70c9d 100644
--- a/layout/reftests/css-page/page-name-propagated-002-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-propagated-002-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
     <div>a</div>
     <div>
diff --git a/layout/reftests/css-page/page-name-propagated-002.html b/testing/web-platform/tests/css/css-page/page-name-propagated-002-print.html
similarity index 62%
rename from layout/reftests/css-page/page-name-propagated-002.html
rename to testing/web-platform/tests/css/css-page/page-name-propagated-002-print.html
index 5878279ee4d9..d88596c12258 100644
--- a/layout/reftests/css-page/page-name-propagated-002.html
+++ b/testing/web-platform/tests/css/css-page/page-name-propagated-002-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="page-name-propagated-002-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
   <body>
     <div style="page: a">a</div>
     <div style="page: b">
diff --git a/layout/reftests/css-page/page-name-propagated-003-ref.html b/testing/web-platform/tests/css/css-page/page-name-propagated-003-print-ref.html
similarity index 82%
rename from layout/reftests/css-page/page-name-propagated-003-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-propagated-003-print-ref.html
index 98f7c3693b42..2394a1d09362 100644
--- a/layout/reftests/css-page/page-name-propagated-003-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-propagated-003-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
     <div>a</div>
     <div style="position: absolute; left: 100px">b</div>
diff --git a/layout/reftests/css-page/page-name-propagated-003.html b/testing/web-platform/tests/css/css-page/page-name-propagated-003-print.html
similarity index 61%
rename from layout/reftests/css-page/page-name-propagated-003.html
rename to testing/web-platform/tests/css/css-page/page-name-propagated-003-print.html
index b6f3d0ec8646..969bbe6e2d97 100644
--- a/layout/reftests/css-page/page-name-propagated-003.html
+++ b/testing/web-platform/tests/css/css-page/page-name-propagated-003-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="page-name-propagated-003-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
   <body>
     <div style="page: a">a</div>
     <div style="page: b">
diff --git a/layout/reftests/css-page/page-name-propagated-004-ref.html b/testing/web-platform/tests/css/css-page/page-name-propagated-004-print-ref.html
similarity index 88%
rename from layout/reftests/css-page/page-name-propagated-004-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-propagated-004-print-ref.html
index 7f2ed250a003..c405886644ab 100644
--- a/layout/reftests/css-page/page-name-propagated-004-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-propagated-004-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
     <div style="break-after: page">a</div>
     <div>
diff --git a/layout/reftests/css-page/page-name-propagated-004.html b/testing/web-platform/tests/css/css-page/page-name-propagated-004-print.html
similarity index 61%
rename from layout/reftests/css-page/page-name-propagated-004.html
rename to testing/web-platform/tests/css/css-page/page-name-propagated-004-print.html
index 8ba5fa50705c..49600ef6d5fd 100644
--- a/layout/reftests/css-page/page-name-propagated-004.html
+++ b/testing/web-platform/tests/css/css-page/page-name-propagated-004-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="page-name-propagated-004-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
   <body>
     <div style="page: a">a</div>
     <div style="page: b">
diff --git a/layout/reftests/css-page/page-name-propagated-005-ref.html b/testing/web-platform/tests/css/css-page/page-name-propagated-005-print-ref.html
similarity index 86%
rename from layout/reftests/css-page/page-name-propagated-005-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-propagated-005-print-ref.html
index 07d38eaf3e37..05cad793c72e 100644
--- a/layout/reftests/css-page/page-name-propagated-005-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-propagated-005-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
     <div>
       <div>
diff --git a/layout/reftests/css-page/page-name-propagated-005.html b/testing/web-platform/tests/css/css-page/page-name-propagated-005-print.html
similarity index 61%
rename from layout/reftests/css-page/page-name-propagated-005.html
rename to testing/web-platform/tests/css/css-page/page-name-propagated-005-print.html
index 2c3215e309da..12bd274f2fcd 100644
--- a/layout/reftests/css-page/page-name-propagated-005.html
+++ b/testing/web-platform/tests/css/css-page/page-name-propagated-005-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="page-name-propagated-005-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
   <body>
     <div style="page: b">
       <div style="page: c">
diff --git a/layout/reftests/css-page/page-name-propagated-006-ref.html b/testing/web-platform/tests/css/css-page/page-name-propagated-006-print-ref.html
similarity index 88%
rename from layout/reftests/css-page/page-name-propagated-006-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-propagated-006-print-ref.html
index 34246936a427..5b45ace9fe52 100644
--- a/layout/reftests/css-page/page-name-propagated-006-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-propagated-006-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
     <div>
       <div>
diff --git a/layout/reftests/css-page/page-name-propagated-006.html b/testing/web-platform/tests/css/css-page/page-name-propagated-006-print.html
similarity index 61%
rename from layout/reftests/css-page/page-name-propagated-006.html
rename to testing/web-platform/tests/css/css-page/page-name-propagated-006-print.html
index 97da7682a5bd..18be3827ce22 100644
--- a/layout/reftests/css-page/page-name-propagated-006.html
+++ b/testing/web-platform/tests/css/css-page/page-name-propagated-006-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="page-name-propagated-006-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
   <body>
     <div style="page: b">
       <div style="page: c">
diff --git a/layout/reftests/css-page/page-name-propagated-007-ref.html b/testing/web-platform/tests/css/css-page/page-name-propagated-007-print-ref.html
similarity index 84%
rename from layout/reftests/css-page/page-name-propagated-007-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-propagated-007-print-ref.html
index d9af37ced0ab..f51d28a574d5 100644
--- a/layout/reftests/css-page/page-name-propagated-007-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-propagated-007-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
     <div>a</div>
     <div style="break-after: page">b</div>
diff --git a/testing/web-platform/tests/css/css-page/page-name-propagated-007-print.html b/testing/web-platform/tests/css/css-page/page-name-propagated-007-print.html
new file mode 100644
index 000000000000..c27ad9f3263e
--- /dev/null
+++ b/testing/web-platform/tests/css/css-page/page-name-propagated-007-print.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <link rel="match" href="page-name-propagated-007-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
+  <body>
+    <div>a</div>
+    <div>
+      <div>b</div>
+      <div style="page: x">c</div>
+    </div>
+    <div>d</div>
+  </body>
+</html>
diff --git a/layout/reftests/css-page/page-name-propagated-008-ref.html b/testing/web-platform/tests/css/css-page/page-name-propagated-008-print-ref.html
similarity index 83%
rename from layout/reftests/css-page/page-name-propagated-008-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-propagated-008-print-ref.html
index 69dd6ead650a..dd53a0586a44 100644
--- a/layout/reftests/css-page/page-name-propagated-008-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-propagated-008-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
     <div style="break-after: page">a</div>
     <div style="break-after: page">b</div>
diff --git a/testing/web-platform/tests/css/css-page/page-name-propagated-008-print.html b/testing/web-platform/tests/css/css-page/page-name-propagated-008-print.html
new file mode 100644
index 000000000000..3f7fab4caa4f
--- /dev/null
+++ b/testing/web-platform/tests/css/css-page/page-name-propagated-008-print.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <link rel="match" href="page-name-propagated-008-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
+  <body>
+    <div>
+      <div style="page: a">a</div>
+      <div>b</div>
+    </div>
+    <div style="page: a">c</div>
+  </body>
+</html>
diff --git a/layout/reftests/css-page/page-name-propagated-009-ref.html b/testing/web-platform/tests/css/css-page/page-name-propagated-009-print-ref.html
similarity index 80%
rename from layout/reftests/css-page/page-name-propagated-009-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-propagated-009-print-ref.html
index 9486f7bdbd11..5faa6ea5c946 100644
--- a/layout/reftests/css-page/page-name-propagated-009-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-propagated-009-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <body>
     <div style="break-after: page">a</div>
     <div>b</div>
diff --git a/testing/web-platform/tests/css/css-page/page-name-propagated-009-print.html b/testing/web-platform/tests/css/css-page/page-name-propagated-009-print.html
new file mode 100644
index 000000000000..eb0d1dbe8909
--- /dev/null
+++ b/testing/web-platform/tests/css/css-page/page-name-propagated-009-print.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <link rel="match" href="page-name-propagated-009-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
+  <body>
+    <div>
+      <div style="page: a">a</div>
+      <div>b</div>
+    </div>
+    <div>c</div>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-page/page-name-siblings-001-print.html b/testing/web-platform/tests/css/css-page/page-name-siblings-001-print.html
new file mode 100644
index 000000000000..b4fa8457e7b6
--- /dev/null
+++ b/testing/web-platform/tests/css/css-page/page-name-siblings-001-print.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+  <link rel="match" href="page-name-siblings-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
+  <body>
+    <div style="page:b">a</div>
+    <div style="page:b">b</div>
+    <div>c</div>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-page/page-name-siblings-002-print.html b/testing/web-platform/tests/css/css-page/page-name-siblings-002-print.html
new file mode 100644
index 000000000000..28f5e0b57175
--- /dev/null
+++ b/testing/web-platform/tests/css/css-page/page-name-siblings-002-print.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <link rel="match" href="page-name-siblings-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
+  <body>
+    <div style="page:a">a</div>
+    <div style="page:b">
+      <div style="page:a">b</div>
+      <div>c</div>
+    </div>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-page/page-name-siblings-003-print.html b/testing/web-platform/tests/css/css-page/page-name-siblings-003-print.html
new file mode 100644
index 000000000000..44346a649ffb
--- /dev/null
+++ b/testing/web-platform/tests/css/css-page/page-name-siblings-003-print.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <link rel="match" href="page-name-siblings-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
+  <body>
+    <div style="page:a">
+      <div>a</div>
+    </div>
+    <div style="page:a">b</div>
+    <div style="page:b">c</div>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-page/page-name-siblings-004-print.html b/testing/web-platform/tests/css/css-page/page-name-siblings-004-print.html
new file mode 100644
index 000000000000..51e12ba2518e
--- /dev/null
+++ b/testing/web-platform/tests/css/css-page/page-name-siblings-004-print.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+  <link rel="match" href="page-name-siblings-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
+  <body>
+    <div>a</div>
+    <div style="page:auto">b</div>
+    <div style="page:b">c</div>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-page/page-name-siblings-005-print.html b/testing/web-platform/tests/css/css-page/page-name-siblings-005-print.html
new file mode 100644
index 000000000000..9ad77ad5dca2
--- /dev/null
+++ b/testing/web-platform/tests/css/css-page/page-name-siblings-005-print.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+  <link rel="match" href="page-name-siblings-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
+  <body style="page:a">
+    <div style="page:a">a</div>
+    <div style="page:auto">b</div>
+    <div style="page:b">c</div>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-page/page-name-siblings-print-ref.html b/testing/web-platform/tests/css/css-page/page-name-siblings-print-ref.html
new file mode 100644
index 000000000000..fefe86d8b798
--- /dev/null
+++ b/testing/web-platform/tests/css/css-page/page-name-siblings-print-ref.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+  <body>
+    <div>a</div>
+    <div style="break-after: page">b</div>
+    <div>c</div>
+  </body>
+</html>
diff --git a/layout/reftests/css-page/page-name-zero-height-001-ref.html b/testing/web-platform/tests/css/css-page/page-name-zero-height-001-print-ref.html
similarity index 92%
rename from layout/reftests/css-page/page-name-zero-height-001-ref.html
rename to testing/web-platform/tests/css/css-page/page-name-zero-height-001-print-ref.html
index ecd493a956d6..e78cb65df988 100644
--- a/layout/reftests/css-page/page-name-zero-height-001-ref.html
+++ b/testing/web-platform/tests/css/css-page/page-name-zero-height-001-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <style>div { line-height: 1.5; }</style>
   <body>
     <div style="break-after: page">a</div>
diff --git a/layout/reftests/css-page/page-name-zero-height-001.html b/testing/web-platform/tests/css/css-page/page-name-zero-height-001-print.html
similarity index 70%
rename from layout/reftests/css-page/page-name-zero-height-001.html
rename to testing/web-platform/tests/css/css-page/page-name-zero-height-001-print.html
index 80d6d666a9ec..8a108c9b4519 100644
--- a/layout/reftests/css-page/page-name-zero-height-001.html
+++ b/testing/web-platform/tests/css/css-page/page-name-zero-height-001-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="page-name-zero-height-001-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#using-named-pages"/>
   <style>div { line-height: 1.5; }</style>
   <body>
     <div style="page: a">a</div>
diff --git a/layout/reftests/css-page/pseudo-first-margin-001.html b/testing/web-platform/tests/css/css-page/pseudo-first-margin-001-print.html
similarity index 67%
rename from layout/reftests/css-page/pseudo-first-margin-001.html
rename to testing/web-platform/tests/css/css-page/pseudo-first-margin-001-print.html
index 7d3cb95d3a99..c2c04514f39b 100644
--- a/layout/reftests/css-page/pseudo-first-margin-001.html
+++ b/testing/web-platform/tests/css/css-page/pseudo-first-margin-001-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="pseudo-first-margin-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#first-pseudo"/>
   <style>
 @page :first {
     margin: 1cm;
diff --git a/layout/reftests/css-page/pseudo-first-margin-002.html b/testing/web-platform/tests/css/css-page/pseudo-first-margin-002-print.html
similarity index 69%
rename from layout/reftests/css-page/pseudo-first-margin-002.html
rename to testing/web-platform/tests/css/css-page/pseudo-first-margin-002-print.html
index 67a4f54eebca..a453b6ba32d7 100644
--- a/layout/reftests/css-page/pseudo-first-margin-002.html
+++ b/testing/web-platform/tests/css/css-page/pseudo-first-margin-002-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="pseudo-first-margin-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#first-pseudo"/>
   <style>
 @page b {
     margin: 0;
diff --git a/layout/reftests/css-page/pseudo-first-margin-003.html b/testing/web-platform/tests/css/css-page/pseudo-first-margin-003-print.html
similarity index 68%
rename from layout/reftests/css-page/pseudo-first-margin-003.html
rename to testing/web-platform/tests/css/css-page/pseudo-first-margin-003-print.html
index 13388717424b..9bb953bfa0a9 100644
--- a/layout/reftests/css-page/pseudo-first-margin-003.html
+++ b/testing/web-platform/tests/css/css-page/pseudo-first-margin-003-print.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
+  <link rel="match" href="pseudo-first-margin-print-ref.html"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#first-pseudo"/>
   <style>
 @page :first {
     margin: 2cm;
diff --git a/layout/reftests/css-page/pseudo-first-margin-ref.html b/testing/web-platform/tests/css/css-page/pseudo-first-margin-print-ref.html
similarity index 92%
rename from layout/reftests/css-page/pseudo-first-margin-ref.html
rename to testing/web-platform/tests/css/css-page/pseudo-first-margin-print-ref.html
index 99ee55b561e1..a9c11c23f84d 100644
--- a/layout/reftests/css-page/pseudo-first-margin-ref.html
+++ b/testing/web-platform/tests/css/css-page/pseudo-first-margin-print-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-paged">
+<html>
   <style>
 @page {
     margin: 0;