--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@@ -354,17 +354,17 @@ load 541869-1.xhtml
 load 541869-2.html
 load 543648-1.html
 load 559705.xhtml
 load 560441-1.xhtml
 load 560447-1.html
 load 564063-1.html
 load 567292-1.xhtml
 load 569018-1.html
-load 570038-1.html
+asserts(4) load 570038-1.html
 load 572003.xul
 load 572582-1.xhtml
 load 576649-1.html
 load 579655.html
 load 580129-1.html
 load 580494-1.html
 load 580834-1.xhtml
 load 589787.html

--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -1298,17 +1298,17 @@ random-if(d2d) == 478377-1.xul 478377-1-
 == 478614-6.html 478614-6-ref.html
 == 478614-7.html 478614-7-ref.html
 == 478811-1.html 478811-1-ref.html
 == 478811-2.html 478811-2-ref.html
 == 478811-3.html 478811-3-ref.html
 == 478811-4.html 478811-4-ref.html
 == 478956-1a.html 478956-1-ref.html
 == 478956-1b.html 478956-1-ref.html
-== 480017-1.html 480017-1-ref.html
+pref(layout.css.xul-display-values.content.enabled,true) == 480017-1.html 480017-1-ref.html
 == 480880-1a.html 480880-1-ref.html
 == 480880-1b.html 480880-1-ref.html
 == 480880-1c.html 480880-1-ref.html
 == 480880-1d.html 480880-1-ref.html
 == 480880-1e.html 480880-1-ref.html
 == 480880-2a.html about:blank
 == 480880-2b.html about:blank
 == 480880-2c.html about:blank

--- a/layout/style/test/test_flexbox_child_display_values.xhtml
+++ b/layout/style/test/test_flexbox_child_display_values.xhtml
@@ -136,25 +136,16 @@ function main() {
 
   // These values all compute to "block" in a flex container. Do them in a
   // loop, so that I don't have to type "block" a zillion times.
   var dispValsThatComputeToBlockInAFlexContainer = [
     "inline",
     "inline-block",
     "-moz-box",
     "-moz-inline-box",
-    "-moz-grid",
-    "-moz-inline-grid",
-    "-moz-grid-group",
-    "-moz-grid-line",
-    "-moz-stack",
-    "-moz-inline-stack",
-    "-moz-deck",
-    "-moz-popup",
-    "-moz-groupbox",
   ];
 
   dispValsThatComputeToBlockInAFlexContainer.forEach(
     function(aSpecifiedDisplay) {
       testDisplayValue(aSpecifiedDisplay, "block");
   });
 
   // Table-parts are special. When they're a child of a flex container,