deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/parsing/shape-margin-invalid.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[shape-margin-invalid.html]
-  [e.style['shape-margin'\] = "none" should not set the property value]
-    expected: FAIL
-
-  [e.style['shape-margin'\] = "10" should not set the property value]
-    expected: FAIL
-

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/parsing/shape-margin-valid.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-margin-valid.html]
-  [e.style['shape-margin'\] = "0" should set the property value]
-    expected: FAIL
-

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-radial-gradient-002.html]
-  [CSS Test: Left float with radial gradient and percentage shape margin]
-    expected: FAIL
-

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-radial-gradient-003.html]
-  [CSS Test: Left float with radial gradient shape, shape margin, and shape-image-threshold]
-    expected: FAIL
-

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-006.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-image-006.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-007.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-image-007.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-008.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-image-008.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-009.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-image-009.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-010.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-image-010.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-011.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-image-011.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-018.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-image-018.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-019.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-image-019.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-020.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-image-020.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-021.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-image-021.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-022.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-image-022.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-023.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-image-023.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-017.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-circle-017.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-018.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-circle-018.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-019.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-circle-019.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-020.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-circle-020.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-021.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-circle-021.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-022.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-circle-022.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-024.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-circle-024.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-025.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-circle-025.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-026.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-circle-026.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-027.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-circle-027.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-028.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-circle-028.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-029.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-circle-029.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-015.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-ellipse-015.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-017.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-ellipse-017.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-018.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-ellipse-018.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-019.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-ellipse-019.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-020.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-ellipse-020.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-021.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-ellipse-021.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-022.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-ellipse-022.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-023.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-ellipse-023.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-024.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-ellipse-024.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-025.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-ellipse-025.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-010.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-inset-010.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-011.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-inset-011.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-012.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-inset-012.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-013.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-inset-013.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-014.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-inset-014.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-015.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[shape-outside-inset-015.html]
-  expected: FAIL

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-margin-000.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[shape-margin-000.html]
-  [10px - inline]
-    expected: FAIL
-
-  [10% - inline]
-    expected: FAIL
-
-  [10px - computed]
-    expected: FAIL
-
-  [10% - computed]
-    expected: FAIL
-

--- a/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-margin-001.html.ini
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-margin-001.html.ini
@@ -1,79 +1,9 @@
 [shape-margin-001.html]
-  [10cm - inline]
-    expected: FAIL
-
-  [10mm - inline]
-    expected: FAIL
-
-  [10in - inline]
-    expected: FAIL
-
-  [10pt - inline]
-    expected: FAIL
-
-  [10pc - inline]
-    expected: FAIL
-
-  [10em - inline]
-    expected: FAIL
-
-  [10ex - inline]
-    expected: FAIL
-
-  [10ch - inline]
-    expected: FAIL
-
-  [10rem - inline]
-    expected: FAIL
-
-  [10vw - inline]
-    expected: FAIL
-
-  [10vh - inline]
-    expected: FAIL
-
-  [10vmin - inline]
-    expected: FAIL
-
-  [10vmax - inline]
-    expected: FAIL
-
   [10cm - computed]
     expected: FAIL
 
   [10mm - computed]
     expected: FAIL
 
-  [10in - computed]
-    expected: FAIL
-
-  [10pt - computed]
-    expected: FAIL
-
-  [10pc - computed]
-    expected: FAIL
-
-  [10em - computed]
-    expected: FAIL
-
   [10ex - computed]
     expected: FAIL
-
-  [10ch - computed]
-    expected: FAIL
-
-  [10rem - computed]
-    expected: FAIL
-
-  [10vw - computed]
-    expected: FAIL
-
-  [10vh - computed]
-    expected: FAIL
-
-  [10vmin - computed]
-    expected: FAIL
-
-  [10vmax - computed]
-    expected: FAIL
-

--- a/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-margin-002.html.ini
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-margin-002.html.ini
@@ -1,25 +1,9 @@
 [shape-margin-002.html]
   [10.12345px - inline]
     expected: FAIL
 
-  [.5px - inline]
-    expected: FAIL
-
-  [+15px - inline]
-    expected: FAIL
-
-  [+10.678px - inline]
-    expected: FAIL
-
   [10.12345px - computed]
     expected: FAIL
 
-  [.5px - computed]
-    expected: FAIL
-
-  [+15px - computed]
-    expected: FAIL
-
   [+10.678px - computed]
     expected: FAIL
-

--- a/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-margin-003.html.ini
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-margin-003.html.ini
@@ -1,43 +1,12 @@
 [shape-margin-003.html]
-  [calc(10in) - inline style]
-    expected: FAIL
-
-  [calc(10in + 20px) - inline style]
-    expected: FAIL
-
-  [calc(30%) - inline style]
-    expected: FAIL
-
-  [calc(100%/4) - inline style]
-    expected: FAIL
-
-  [calc(25%*3) - inline style]
-    expected: FAIL
-
-  [calc(25%*3 - 10in) - inline style]
-    expected: FAIL
-
   [calc((12.5%*6 + 10in) / 4) - inline style]
     expected: FAIL
 
-  [calc(10in) - computed style]
-    expected: FAIL
-
-  [calc(10in + 20px) - computed style]
-    expected: FAIL
-
   [calc(30%) - computed style]
     expected: FAIL
 
   [calc(100%/4) - computed style]
     expected: FAIL
 
   [calc(25%*3) - computed style]
     expected: FAIL
-
-  [calc(25%*3 - 10in) - computed style]
-    expected: FAIL
-
-  [calc((12.5%*6 + 10in) / 4) - computed style]
-    expected: FAIL
-

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-margin-004.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[shape-margin-004.html]
-  [-20px - computed - invalid]
-    expected: FAIL
-
-  [-.4567px - computed - invalid]
-    expected: FAIL
-
-  [nonLength - computed - invalid]
-    expected: FAIL
-
-  [10 - computed - invalid]
-    expected: FAIL
-

--- a/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-margin-005.html.ini
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-margin-005.html.ini
@@ -1,10 +1,3 @@
 [shape-margin-005.html]
-  [shape-margin can be assigned 'inherit' value]
-    expected: FAIL
-
   [shape-margin is not inherited and defaults to 0px]
     expected: FAIL
-
-  [shape-margin is not inherited]
-    expected: FAIL
-

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-013.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-013.html]
-  [CSS Test: Shape from image - shape-margin]
-    expected: FAIL
-

deleted file mode 100644
--- a/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-019.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-019.html]
-  [CSS Test: Shape from image - alpha channel, opacity > 0 + shape-margin]
-    expected: FAIL
-