rename from layout/reftests/flexbox/flexbox-attributes-no-box-horizontal-ref.xhtml
rename to layout/reftests/box/flexbox-attributes-no-box-horizontal-ref.xhtml

rename from layout/reftests/flexbox/flexbox-attributes-no-box-horizontal.xhtml
rename to layout/reftests/box/flexbox-attributes-no-box-horizontal.xhtml

rename from layout/reftests/flexbox/flexbox-attributes-no-box-vertical-ref.xhtml
rename to layout/reftests/box/flexbox-attributes-no-box-vertical-ref.xhtml

rename from layout/reftests/flexbox/flexbox-attributes-no-box-vertical.xhtml
rename to layout/reftests/box/flexbox-attributes-no-box-vertical.xhtml

rename from layout/reftests/flexbox/flexbox-attributes-no-input-horizontal-ref.xhtml
rename to layout/reftests/box/flexbox-attributes-no-input-horizontal-ref.xhtml

rename from layout/reftests/flexbox/flexbox-attributes-no-input-horizontal.xhtml
rename to layout/reftests/box/flexbox-attributes-no-input-horizontal.xhtml

rename from layout/reftests/flexbox/flexbox-attributes-no-input-vertical-ref.xhtml
rename to layout/reftests/box/flexbox-attributes-no-input-vertical-ref.xhtml

rename from layout/reftests/flexbox/flexbox-attributes-no-input-vertical.xhtml
rename to layout/reftests/box/flexbox-attributes-no-input-vertical.xhtml

rename from layout/reftests/flexbox/reftest.list
rename to layout/reftests/box/reftest.list

--- a/layout/reftests/reftest.list
+++ b/layout/reftests/reftest.list
@@ -21,16 +21,19 @@ include backgrounds/reftest.list
 include bidi/reftest.list
 
 # border-image
 skip-if(Android) include border-image/reftest.list
 
 # border-radius/
 include border-radius/reftest.list
 
+# -moz-box tests
+include box/reftest.list
+
 # box-ordinal/
 include box-ordinal/reftest.list
 
 # box-properties/
 include box-properties/reftest.list
 
 # box-shadow/
 skip-if(Android) include box-shadow/reftest.list
@@ -135,19 +138,16 @@ include editor/reftest.list
 include generated-content/reftest.list
 
 # first-letter/
 skip-if(Android) include first-letter/reftest.list
 
 # first-line/
 include first-line/reftest.list
 
-# flexbox/
-include flexbox/reftest.list
-
 # floats/
 include floats/reftest.list
 
 # font-face
 include font-face/reftest.list
 
 # font features (opentype)
 include font-features/reftest.list