--- a/layout/reftests/w3c-css/submitted/shapes1/reftest-stylo.list
+++ b/layout/reftests/w3c-css/submitted/shapes1/reftest-stylo.list
@@ -1,38 +1,38 @@
 # DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
 default-preferences pref(layout.css.shape-outside.enabled,true)
 
 # <shape-box> only
 == shape-outside-margin-box-001.html shape-outside-margin-box-001.html
 == shape-outside-margin-box-002.html shape-outside-margin-box-002.html
-fails == shape-outside-border-box-001.html shape-outside-border-box-001.html
-fails == shape-outside-border-box-002.html shape-outside-border-box-002.html
-fails == shape-outside-padding-box-001.html shape-outside-padding-box-001.html
-fails == shape-outside-padding-box-002.html shape-outside-padding-box-002.html
-fails == shape-outside-content-box-001.html shape-outside-content-box-001.html
-fails == shape-outside-content-box-002.html shape-outside-content-box-002.html
+== shape-outside-border-box-001.html shape-outside-border-box-001.html
+== shape-outside-border-box-002.html shape-outside-border-box-002.html
+== shape-outside-padding-box-001.html shape-outside-padding-box-001.html
+== shape-outside-padding-box-002.html shape-outside-padding-box-002.html
+== shape-outside-content-box-001.html shape-outside-content-box-001.html
+== shape-outside-content-box-002.html shape-outside-content-box-002.html
 
 # <shape-box> with border-radius
-fails == shape-outside-margin-box-border-radius-001.html shape-outside-margin-box-border-radius-001.html
-fails == shape-outside-margin-box-border-radius-002.html shape-outside-margin-box-border-radius-002.html
-fails == shape-outside-margin-box-border-radius-003.html shape-outside-margin-box-border-radius-003.html
-fails == shape-outside-margin-box-border-radius-004.html shape-outside-margin-box-border-radius-004.html
-fails == shape-outside-margin-box-border-radius-005.html shape-outside-margin-box-border-radius-005.html
-fails == shape-outside-margin-box-border-radius-006.html shape-outside-margin-box-border-radius-006.html
-fails == shape-outside-margin-box-border-radius-007.html shape-outside-margin-box-border-radius-007.html
-fails == shape-outside-margin-box-border-radius-008.html shape-outside-margin-box-border-radius-008.html
-fails == shape-outside-border-box-border-radius-001.html shape-outside-border-box-border-radius-001.html
-fails == shape-outside-border-box-border-radius-002.html shape-outside-border-box-border-radius-002.html
-fails == shape-outside-border-box-border-radius-003.html shape-outside-border-box-border-radius-003.html
-fails == shape-outside-border-box-border-radius-004.html shape-outside-border-box-border-radius-004.html
-fails == shape-outside-border-box-border-radius-005.html shape-outside-border-box-border-radius-005.html
-fails == shape-outside-border-box-border-radius-006.html shape-outside-border-box-border-radius-006.html
-fails == shape-outside-border-box-border-radius-007.html shape-outside-border-box-border-radius-007.html
-fails == shape-outside-border-box-border-radius-008.html shape-outside-border-box-border-radius-008.html
+== shape-outside-margin-box-border-radius-001.html shape-outside-margin-box-border-radius-001.html
+== shape-outside-margin-box-border-radius-002.html shape-outside-margin-box-border-radius-002.html
+== shape-outside-margin-box-border-radius-003.html shape-outside-margin-box-border-radius-003.html
+== shape-outside-margin-box-border-radius-004.html shape-outside-margin-box-border-radius-004.html
+== shape-outside-margin-box-border-radius-005.html shape-outside-margin-box-border-radius-005.html
+== shape-outside-margin-box-border-radius-006.html shape-outside-margin-box-border-radius-006.html
+== shape-outside-margin-box-border-radius-007.html shape-outside-margin-box-border-radius-007.html
+== shape-outside-margin-box-border-radius-008.html shape-outside-margin-box-border-radius-008.html
+== shape-outside-border-box-border-radius-001.html shape-outside-border-box-border-radius-001.html
+== shape-outside-border-box-border-radius-002.html shape-outside-border-box-border-radius-002.html
+== shape-outside-border-box-border-radius-003.html shape-outside-border-box-border-radius-003.html
+== shape-outside-border-box-border-radius-004.html shape-outside-border-box-border-radius-004.html
+== shape-outside-border-box-border-radius-005.html shape-outside-border-box-border-radius-005.html
+== shape-outside-border-box-border-radius-006.html shape-outside-border-box-border-radius-006.html
+== shape-outside-border-box-border-radius-007.html shape-outside-border-box-border-radius-007.html
+== shape-outside-border-box-border-radius-008.html shape-outside-border-box-border-radius-008.html
 fails == shape-outside-border-box-border-radius-009.html shape-outside-border-box-border-radius-009.html
 fails == shape-outside-border-box-border-radius-010.html shape-outside-border-box-border-radius-010.html
 fails == shape-outside-border-box-border-radius-011.html shape-outside-border-box-border-radius-011.html
 fails == shape-outside-border-box-border-radius-012.html shape-outside-border-box-border-radius-012.html
-fails == shape-outside-padding-box-border-radius-001.html shape-outside-padding-box-border-radius-001.html
-fails == shape-outside-padding-box-border-radius-002.html shape-outside-padding-box-border-radius-002.html
-fails == shape-outside-content-box-border-radius-001.html shape-outside-content-box-border-radius-001.html
-fails == shape-outside-content-box-border-radius-002.html shape-outside-content-box-border-radius-002.html
+== shape-outside-padding-box-border-radius-001.html shape-outside-padding-box-border-radius-001.html
+== shape-outside-padding-box-border-radius-002.html shape-outside-padding-box-border-radius-002.html
+== shape-outside-content-box-border-radius-001.html shape-outside-content-box-border-radius-001.html
+== shape-outside-content-box-border-radius-002.html shape-outside-content-box-border-radius-002.html

--- a/layout/style/test/stylo-failures.md
+++ b/layout/style/test/stylo-failures.md
@@ -108,17 +108,17 @@ to mochitest command.
 * @counter-style support:
   * test_counter_descriptor_storage.html [1]
   * test_counter_style.html [1]
   * test_rule_insertion.html `@counter-style` [4]
   * ... `cjk-decimal` [1]
   * test_value_storage.html `symbols(` [30]
   * ... `list-style-type` [60]
   * ... `'list-style'` [30]
-  * ... `'content`: various value as list-style-type in counter functions [13]
+  * ... `'content`: various value as list-style-type in counter functions [12]
 * test_default_computed_style.html: support of getDefaultComputedStyle [1]
 * Unimplemented \@font-face descriptors:
   * font-display bug 1355345
     * test_descriptor_storage.html `font-display` [5]
     * test_font_face_parser.html `font-display` [15]
   * test_font_face_parser.html `font-language-override`: bug 1355364 [8]
   * ... `font-feature-settings`: bug 1355366 [10]
 * test_font_face_parser.html `font-weight`: keyword values should be preserved in \@font-face [4]
@@ -190,22 +190,17 @@ to mochitest command.
   * font-variant-{alternates,east-asian,ligatures,numeric} properties servo/servo#15957
     * test_compute_data_with_start_struct.html `font-variant` [8]
     * test_inherit_computation.html `font-variant` [20]
     * test_inherit_storage.html `font-variant` [36]
     * test_initial_computation.html `font-variant` [10]
     * test_initial_storage.html `font-variant` [18]
     * test_value_storage.html `font-variant` [332]
   * shape-outside property servo/servo#15958
-    * test_compute_data_with_start_struct.html `shape-outside` [2]
-    * test_inherit_computation.html `shape-outside` [2]
-    * test_inherit_storage.html `shape-outside` [2]
-    * test_initial_computation.html `shape-outside` [4]
-    * test_initial_storage.html `shape-outside` [4]
-    * test_value_storage.html `shape-outside` [121]
+    * test_value_storage.html `shape-outside` [2]
   * touch-action property
     * test_compute_data_with_start_struct.html `touch-action` [2]
     * test_inherit_computation.html `touch-action` [2]
     * test_inherit_storage.html `touch-action` [2]
     * test_initial_computation.html `touch-action` [4]
     * test_initial_storage.html `touch-action` [4]
     * test_value_storage.html `touch-action` [14]
 * Unimplemented SVG properties: