diff --git a/layout/reftests/w3c-css/submitted/shapes1/reftest.list b/layout/reftests/w3c-css/submitted/shapes1/reftest.list
index 1b86378c9df6..8099186d13ab 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/reftest.list
+++ b/layout/reftests/w3c-css/submitted/shapes1/reftest.list
@@ -1,26 +1,3 @@
-# Basic shape: ellipse()
-== shape-outside-ellipse-032.html shape-outside-ellipse-032-ref.html
-== shape-outside-ellipse-033.html shape-outside-ellipse-033-ref.html
-== shape-outside-ellipse-034.html shape-outside-ellipse-034-ref.html
-== shape-outside-ellipse-035.html shape-outside-ellipse-035-ref.html
-== shape-outside-ellipse-036.html shape-outside-ellipse-036-ref.html
-== shape-outside-ellipse-037.html shape-outside-ellipse-037-ref.html
-== shape-outside-ellipse-038.html shape-outside-ellipse-038-ref.html
-== shape-outside-ellipse-039.html shape-outside-ellipse-039-ref.html
-== shape-outside-ellipse-040.html shape-outside-ellipse-040-ref.html
-== shape-outside-ellipse-041.html shape-outside-ellipse-040-ref.html
-== shape-outside-ellipse-042.html shape-outside-ellipse-042-ref.html
-== shape-outside-ellipse-043.html shape-outside-ellipse-042-ref.html
-== shape-outside-ellipse-044.html shape-outside-ellipse-044-ref.html
-== shape-outside-ellipse-045.html shape-outside-ellipse-045-ref.html
-== shape-outside-ellipse-046.html shape-outside-ellipse-046-ref.html
-== shape-outside-ellipse-047.html shape-outside-ellipse-047-ref.html
-== shape-outside-ellipse-048.html shape-outside-ellipse-048-ref.html
-== shape-outside-ellipse-049.html shape-outside-ellipse-049-ref.html
-== shape-outside-ellipse-050.html shape-outside-ellipse-050-ref.html
-== shape-outside-ellipse-051.html shape-outside-ellipse-051-ref.html
-fuzzy(0-108,0-81) == shape-outside-ellipse-052.html shape-outside-ellipse-052-ref.html
-
 # Basic shape: inset()
 == shape-outside-inset-016.html shape-outside-inset-016-ref.html
 == shape-outside-inset-017.html shape-outside-inset-017-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-032-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-032-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-032-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-032-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-033-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-033-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-033-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-033-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-034-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-034-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-034-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-034-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-035-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-035-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-035-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-035-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-036-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-036-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-036-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-036-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-037-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-037-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-037-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-037-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-038-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-038-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-038-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-038-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-039-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-039-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-039-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-039-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-040-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-040-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-040-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-040-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-042-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-042-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-042-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-042-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-044-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-044-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-044-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-044-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-045-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-045-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-045-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-045-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-046-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-046-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-046-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-046-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-047-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-047-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-047-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-047-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-048-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-048-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-048-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-048-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-049-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-049-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-049-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-049-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-050-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-050-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-050-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-050-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-051-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-051-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-051-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-051-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-052-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-052-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-052-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-052-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-032.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-032.html
similarity index 95%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-032.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-032.html
index d0c92b9df0bd..0917d096c81a 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-032.html
+++ b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-032.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-032-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-032-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape ellipse(40px 60px at left top) value.">
   <style>
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-033.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-033.html
similarity index 96%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-033.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-033.html
index 2e2fa577b22d..d761a48f0728 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-033.html
+++ b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-033.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-033-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-033-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape ellipse(40px 60px at right bottom) value.">
   <style>
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-034.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-034.html
similarity index 95%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-034.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-034.html
index fb4d1331e69f..f32747015e8c 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-034.html
+++ b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-034.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-034-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-034-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape ellipse(40px 60px at right top)">
   <style>
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-035.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-035.html
similarity index 96%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-035.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-035.html
index bc3814a244a1..c98eb061e3c7 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-035.html
+++ b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-035.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-035-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-035-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape ellipse(40px 60px at left bottom) value.">
   <style>
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-036.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-036.html
similarity index 94%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-036.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-036.html
index 9a14e65ba25c..dd2194ead8f7 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-036.html
+++ b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-036.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-036-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-036-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape ellipse() value.">
   <style>
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-037.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-037.html
similarity index 95%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-037.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-037.html
index 6015d2de0dd5..70c9a0335793 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-037.html
+++ b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-037.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-037-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-037-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape ellipse(closest-side farthest-side at left 40px top 60px) border-box">
   <style>
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-038.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-038.html
similarity index 95%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-038.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-038.html
index 2d16fae743a9..190ae662a939 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-038.html
+++ b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-038.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-038-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-038-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape ellipse() value.">
   <style>
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-039.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-039.html
similarity index 95%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-039.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-039.html
index ca5078533900..5a76fbd76288 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-039.html
+++ b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-039.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-039-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-039-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape ellipse(closest-side farthest-side at right 40px top 60px) border-box">
   <style>
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-040.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-040.html
similarity index 94%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-040.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-040.html
index a5b0ce730cb4..70db3c0ae37c 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-040.html
+++ b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-040.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-040-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-040-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the left float shape defines an empty float area by the basic shape ellipse(0% 0%) value.">
   <style>
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-041.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-041.html
similarity index 95%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-041.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-041.html
index 2050e502dfac..304382ef206c 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-041.html
+++ b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-041.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-040-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-040-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the left float shape defines an empty float area by the basic shape ellipse(0% 0closest-side closest-side at top left) value.">
   <style>
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-042.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-042.html
similarity index 94%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-042.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-042.html
index 5febab893915..4056a8617d59 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-042.html
+++ b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-042.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-042-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-042-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the right float shape defines an empty float area by the basic shape ellipse(0% 0%) value.">
   <style>
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-043.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-043.html
similarity index 95%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-043.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-043.html
index 4920dc040d7e..3cd8896568f2 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-043.html
+++ b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-043.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-042-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-042-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the right float shape defines an empty float area by the basic shape ellipse(0% 0closest-side closest-side at top right) value.">
   <style>
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-044.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-044.html
similarity index 94%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-044.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-044.html
index 0590b1320326..4e5cb5420494 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-044.html
+++ b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-044.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-044-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-044-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape ellipse(100% 100%) value.">
   <style>
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-045.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-045.html
similarity index 95%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-045.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-045.html
index 89c786f1abbd..0c56b7484e30 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-045.html
+++ b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-045.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-045-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-045-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape ellipse(100% 100%) value.">
   <style>
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-046.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-046.html
similarity index 95%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-046.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-046.html
index 98885fb49b5c..cb531521646d 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-046.html
+++ b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-046.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-046-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-046-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape ellipse(closest-side farthest-side at top 40px right 60px) border-box">
   <style>
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-047.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-047.html
similarity index 95%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-047.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-047.html
index 48f49a25aa06..85f8ee4c1377 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-047.html
+++ b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-047.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-047-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-047-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape ellipse(closest-side farthest-side at top 40px right 60px) border-box">
   <style>
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-048.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-048.html
similarity index 95%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-048.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-048.html
index f1b36447b064..5d993266e961 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-048.html
+++ b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-048.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-048-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-048-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape ellipse(closest-side farthest-side at left 40px top 60px) border-box">
   <style>
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-049.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-049.html
similarity index 95%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-049.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-049.html
index 5a5919aa6639..612ba938d130 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-049.html
+++ b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-049.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-049-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-049-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape ellipse(closest-side farthest-side at left 40px top 60px) border-box">
   <style>
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-050.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-050.html
similarity index 95%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-050.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-050.html
index 698cf2d40b67..84371638ea8f 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-050.html
+++ b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-050.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-050-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-050-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape ellipse(closest-side farthest-side at left 40px top 60px) border-box">
   <style>
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-051.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-051.html
similarity index 95%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-051.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-051.html
index b3bf1b960ebe..cca37cf9fbd7 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-051.html
+++ b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-051.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-051-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-051-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape ellipse(closest-side farthest-side at left 40px top 60px) border-box">
   <style>
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-052.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-052.html
similarity index 96%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-052.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-052.html
index 33f7a8fe34fd..25f89533de20 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-ellipse-052.html
+++ b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-052.html
@@ -6,7 +6,7 @@
         <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#funcdef-ellipse">
         <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
         <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin-property">
-        <link rel="match" href="shape-outside-ellipse-052-ref.html">
+        <link rel="match" href="reference/shape-outside-ellipse-052-ref.html">
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The test verifies that text wraps around a
                                      left float with a shape-outside defined as