diff --git a/layout/reftests/box-sizing/reftest.list b/layout/reftests/box-sizing/reftest.list
index db1e69a6655e..c9cd667acea3 100644
--- a/layout/reftests/box-sizing/reftest.list
+++ b/layout/reftests/box-sizing/reftest.list
@@ -1,16 +1,32 @@
 == intrinsic-1a.html intrinsic-1-ref.html
+skip-if(!webrender) pref(layers.advanced.border-layers,true) == intrinsic-1a.html intrinsic-1-ref.html
 == intrinsic-1b.html intrinsic-1-ref.html
+skip-if(!webrender) pref(layers.advanced.border-layers,true) == intrinsic-1b.html intrinsic-1-ref.html
 == intrinsic-1c.html intrinsic-1-ref.html
+skip-if(!webrender) pref(layers.advanced.border-layers,true) == intrinsic-1c.html intrinsic-1-ref.html
 == intrinsic-1d.html intrinsic-1-ref.html
+skip-if(!webrender) pref(layers.advanced.border-layers,true) == intrinsic-1d.html intrinsic-1-ref.html
 == intrinsic-1e.html intrinsic-1-ref.html
+skip-if(!webrender) pref(layers.advanced.border-layers,true) == intrinsic-1e.html intrinsic-1-ref.html
 == intrinsic-1f.html intrinsic-1-ref.html
+skip-if(!webrender) pref(layers.advanced.border-layers,true) == intrinsic-1f.html intrinsic-1-ref.html
 == intrinsic-1g.html intrinsic-1-ref.html
+skip-if(!webrender) pref(layers.advanced.border-layers,true) == intrinsic-1g.html intrinsic-1-ref.html
 == intrinsic-1h.html intrinsic-1-ref.html
+skip-if(!webrender) pref(layers.advanced.border-layers,true) == intrinsic-1h.html intrinsic-1-ref.html
 == intrinsic-1i.html intrinsic-1-ref.html
+skip-if(!webrender) pref(layers.advanced.border-layers,true) == intrinsic-1i.html intrinsic-1-ref.html
 == intrinsic-1j.html intrinsic-1-ref.html
+skip-if(!webrender) pref(layers.advanced.border-layers,true) == intrinsic-1j.html intrinsic-1-ref.html
 == intrinsic-1k.html intrinsic-1-ref.html
+skip-if(!webrender) pref(layers.advanced.border-layers,true) == intrinsic-1k.html intrinsic-1-ref.html
 == intrinsic-1l.html intrinsic-1-ref.html
+skip-if(!webrender) pref(layers.advanced.border-layers,true) == intrinsic-1l.html intrinsic-1-ref.html
 == intrinsic-1m.html intrinsic-1-ref.html
+skip-if(!webrender) pref(layers.advanced.border-layers,true) == intrinsic-1m.html intrinsic-1-ref.html
 == intrinsic-1n.html intrinsic-1-ref.html
+skip-if(!webrender) pref(layers.advanced.border-layers,true) == intrinsic-1n.html intrinsic-1-ref.html
 == intrinsic-1o.html intrinsic-1-ref.html
+skip-if(!webrender) pref(layers.advanced.border-layers,true) == intrinsic-1o.html intrinsic-1-ref.html
 == computed-size-reporting.html computed-size-reporting-ref.html
+skip-if(!webrender) pref(layers.advanced.border-layers,true) == computed-size-reporting.html computed-size-reporting-ref.html
diff --git a/layout/reftests/css-sizing/reftest.list b/layout/reftests/css-sizing/reftest.list
index 87ee274319bf..a486e97715b1 100644
--- a/layout/reftests/css-sizing/reftest.list
+++ b/layout/reftests/css-sizing/reftest.list
@@ -1,4 +1,7 @@
 == min-intrinsic-with-percents-across-img-cases.html min-intrinsic-with-percents-across-img-cases-ref.html
 == min-intrinsic-with-percents-across-elements.html min-intrinsic-with-percents-across-elements-ref.html
+skip-if(!webrender) pref(layers.advanced.border-layers,true) == min-intrinsic-with-percents-across-elements.html min-intrinsic-with-percents-across-elements-ref.html
 == min-intrinsic-with-max-width-percents-across-form-controls.html min-intrinsic-with-max-width-percents-across-form-controls-ref.html
+skip-if(!webrender) pref(layers.advanced.border-layers,true) == min-intrinsic-with-max-width-percents-across-form-controls.html min-intrinsic-with-max-width-percents-across-form-controls-ref.html
 == min-intrinsic-with-width-percents-across-form-controls.html min-intrinsic-with-width-percents-across-form-controls-ref.html
+skip-if(!webrender) pref(layers.advanced.border-layers,true) == min-intrinsic-with-width-percents-across-form-controls.html min-intrinsic-with-width-percents-across-form-controls-ref.html
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index d3e36e0cbc6d..c192e0d9d723 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -4667,6 +4667,8 @@ pref("layers.bufferrotation.enabled", true);
 pref("layers.componentalpha.enabled", true);
 pref("layers.draw-mask-debug", false);
 
+pref("layers.advanced.border-layers", false);
+
 pref("gfx.content.always-paint", false);
 
 #ifdef ANDROID