diff --git a/layout/reftests/w3c-css/submitted/shapes1/reftest.list b/layout/reftests/w3c-css/submitted/shapes1/reftest.list
index c55f681285a5..3c969317f64d 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/reftest.list
+++ b/layout/reftests/w3c-css/submitted/shapes1/reftest.list
@@ -1,14 +1,3 @@
-# Basic shape: polygon()
-== shape-outside-polygon-018.html shape-outside-polygon-018-ref.html
-== shape-outside-polygon-019.html shape-outside-polygon-019-ref.html
-== shape-outside-polygon-020.html shape-outside-polygon-020-ref.html
-== shape-outside-polygon-021.html shape-outside-polygon-021-ref.html
-== shape-outside-polygon-022.html shape-outside-polygon-022-ref.html
-== shape-outside-polygon-023.html shape-outside-polygon-023-ref.html
-== shape-outside-polygon-024.html shape-outside-polygon-024-ref.html
-== shape-outside-polygon-025.html shape-outside-polygon-025-ref.html
-fuzzy(0-101,0-2263) == shape-outside-polygon-032.html shape-outside-polygon-032-ref.html
-
# Tests of shape-outside layout behavior with too-wide inline elements
== float-retry-push-circle.html float-retry-push-ref.html
== float-retry-push-image.html float-retry-push-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-018-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-018-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-018-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-018-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-019-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-019-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-019-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-019-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-020-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-020-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-020-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-020-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-021-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-021-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-021-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-021-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-022-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-022-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-022-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-022-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-023-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-023-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-023-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-023-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-024-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-024-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-024-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-024-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-025-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-025-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-025-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-025-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-032-ref.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-032-ref.html
similarity index 100%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-032-ref.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-032-ref.html
diff --git a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-018.html b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-018.html
similarity index 96%
rename from layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-018.html
rename to testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-018.html
index b3f639739750..4509c1cb4e48 100644
--- a/layout/reftests/w3c-css/submitted/shapes1/shape-outside-polygon-018.html
+++ b/testing/web-platform/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-018.html
@@ -8,7 +8,7 @@
-
+