--- a/dom/base/crashtests/crashtests.list
+++ b/dom/base/crashtests/crashtests.list
@@ -46,18 +46,18 @@ load 372554-1.html
 load 375399-1.html
 load 377360-1.xhtml
 load 377960-1.html
 load 377960-2.html
 load 384663-1.html
 load 386000-1.html
 load 386794-1.html
 skip-if(stylo) load 387460-1.html # bug 1323647
-asserts-if(stylo,3) load 395469-1.xhtml # bug 1324704
-asserts-if(stylo,4) load 395469-2.xhtml # bug 1324704
+load 395469-1.xhtml
+load 395469-2.xhtml
 load 398088-1.xul
 skip load 399712-1.html # sporadically times out (bug 473680)
 load 400763-1.html
 skip-if(stylo) load 401993-1.html # bug 1323648
 load 404869-1.xul
 load 407818.html
 load 410860-1.xml
 load 411882-1.xhtml

--- a/dom/html/crashtests/crashtests.list
+++ b/dom/html/crashtests/crashtests.list
@@ -4,17 +4,17 @@ load 285166-1.html
 load 294235-1.html
 load 307616-1.html
 load 324918-1.xhtml
 load 338649-1.xhtml
 load 339501-1.xhtml
 load 339501-2.xhtml
 load 378993-1.xhtml
 load 382568-1.html
-asserts-if(stylo,1) load 383137.xhtml # bug 1324704
+load 383137.xhtml
 load 388183-1.html
 load 395340-1.html # bug 1323652
 load 399694-1.html
 load 407053.html
 load 423371-1.html
 load 448564.html
 load 451123-1.html
 load 453406-1.html

--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@@ -151,17 +151,17 @@ load 374193-1.xhtml
 load 374297-1.html
 load 374297-2.html
 asserts-if(stylo,2) load 376223-1.xhtml # bug 1329454
 load 378325-1.html
 load 378682.html
 skip-if(stylo) load 379105-1.xhtml # bug 1323679
 load 379419-1.xhtml
 load 379768-1.html
-asserts-if(stylo,8) load 379799-1.html # bug 1324977
+asserts-if(stylo,6) load 379799-1.html # bug 1324977
 load 379920-1.svg
 load 379920-2.svg
 load 379975.html
 load 380096-1.html
 load 382204-1.html # bug 1323680
 load 383102-1.xhtml
 load 383129-1.html
 asserts-if(stylo,2) load 383806-1.xhtml # bug 1329454
@@ -428,17 +428,17 @@ skip load 802902.html # bug 901752
 load 806056-1.html
 load 806056-2.html
 load 812665.html
 load 813372-1.html
 load 817219.html
 load 818454.html
 load 822865.html
 load 824300.html
-asserts-if(stylo,1) load 824862.html # bug 1324704
+load 824862.html
 load 826163.html
 load 833604-1.html
 load 835056.html
 load 836990-1.html
 load 840480.html
 load 842114.html
 load 847242.html
 pref(layers.progressive-paint,false) pref(layers.low-precision-buffer,false) load 852293.html
@@ -483,10 +483,10 @@ load 1288946-1.html
 load 1288946-2a.html
 load 1288946-2b.html
 load 1297835.html
 load 1299736-1.html
 load 1308793.svg
 load 1308848-1.html
 load 1308848-2.html
 load 1338772-1.html
-load 1343937.html
+skip-if(stylo) load 1343937.html
 asserts(0-1) load 1343606.html # bug 1343948

--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -486,17 +486,17 @@ load 750066.html
 load 757413.xhtml
 load 757413-2.html
 load 762764-1.html
 load 762902.html
 load 765409.html
 asserts(0-200) load 765621.html # bug 703550
 asserts(0-200) load 767765.html # bug 407550, bug 871758, and various nscoord_MAX related asserts
 load 769120.html
-asserts(0-2) asserts-if(stylo,3-9) load 769303-1.html # bug 1123979 # bug 1324664
+asserts(0-2) load 769303-1.html # bug 1123979
 load 769303-2.html
 load 777838.html
 load 783228.html
 load 784600.html
 load 785555.html
 load 786740-1.html
 load 790260-1.html
 asserts(1) asserts-if(stylo,0) test-pref(font.size.inflation.emPerLine,15) load 791601.xhtml # Bug 871327
@@ -535,17 +535,17 @@ load 847130.xhtml
 load 847208.html
 asserts-if(Android,2) asserts-if(Android&&asyncPan,4) asserts-if(!Android,4) asserts-if(stylo,4) load 847209.html # bug 847368
 load 847211-1.html
 load 849603.html
 asserts(0-12) load 850931.html # bug 569193
 load 851396-1.html
 load 854263-1.html
 load 862185.html
-asserts-if(stylo,1) load 862947-1.html # bug 1324704
+load 862947-1.html
 load 863935.html
 load 866547-1.html
 needs-focus pref(accessibility.browsewithcaret,true) load 868906.html
 asserts(0-5) load 876074-1.html # bug 876749
 load 876155.html
 load 885009-1.html
 load 893496-1.html
 load 893523.html
@@ -554,17 +554,17 @@ asserts(0-3) load 914501.html # bug 1144
 load 914891.html
 load 915475.xhtml
 load 927558.html
 load 943509-1.html
 asserts(2-8) asserts-if(stylo,0) load 944909-1.html
 load 946167-1.html
 load 947158.html
 load 949932.html
-asserts-if(Android,0-1) asserts-if(stylo,1) load 964078.html # bug 989718, bug 1296477
+asserts-if(Android,0-1) asserts-if(stylo,4) load 964078.html # bug 989718, bug 1296477
 load 970710.html
 load 973701-1.xhtml
 load 973701-2.xhtml
 load 986899.html
 load 1001233.html
 load 1001258-1.html
 load 1003441.xul
 pref(layout.css.grid.enabled,true) load 1015562.html

--- a/layout/reftests/bugs/reftest-stylo.list
+++ b/layout/reftests/bugs/reftest-stylo.list
@@ -570,17 +570,17 @@ fails == 363874.html 363874.html
 == 364318-1.xhtml 364318-1.xhtml
 == 364861-1.html 364861-1.html
 fails == 364862-1.html 364862-1.html
 == 364968-1.xul 364968-1.xul
 fails == 364989-1.html 364989-1.html
 fails == 365173-1.html 365173-1.html
 == 366207-1.xul 366207-1.xul
 == 366616-1.xul 366616-1.xul
-fails asserts-if(stylo,30) skip-if(stylo) == 367220-1.html 367220-1.html # bug 1324704 # crash bug 1342106
+fails skip-if(stylo) == 367220-1.html 367220-1.html # crash bug 1342106
 == 367247-s-visible.html 367247-s-visible.html
 == 367247-s-hidden.html 367247-s-hidden.html
 == 367247-s-auto.html 367247-s-auto.html
 == 367247-l-visible.html 367247-l-visible.html
 == 367247-l-hidden.html 367247-l-hidden.html
 fails == 367247-l-scroll.html 367247-l-scroll.html
 == 367332-1a.html 367332-1a.html
 == 367332-1b.html 367332-1b.html
@@ -613,17 +613,17 @@ asserts(4-8) == 368155-negative-margins-
 == 368247-2.html 368247-2.html
 == 368504-1.html 368504-1.html
 fails == 368504-2.html 368504-2.html
 == 368504-3a.html 368504-3a.html
 == 368504-3b.html 368504-3b.html
 == 368504-4.html 368504-4.html
 == 368504-5.html 368504-5.html
 fails == 368504-6.html 368504-6.html
-fails asserts-if(stylo,2) == 368622-1.html 368622-1.html # bug 1324704
+== 368622-1.html 368622-1.html
 == 368651-1.html 368651-1.html
 == 369361-1.html 369361-1.html
 == 369361-2.html 369361-2.html
 == 369882.xul 369882.xul
 == 369975-1.html 369975-1.html
 == 370353-1.html 370353-1.html
 fails == 370422-1.html 370422-1.html
 == 370525-1.html 370525-1.html
@@ -1182,17 +1182,17 @@ fails == 449149-1b.html 449149-1b.html
 # Retry the above with XBL scopes
 fails pref(dom.use_xbl_scopes_for_remote_xul,true) == 449149-1a.html 449149-1a.html
 fails pref(dom.use_xbl_scopes_for_remote_xul,true) == 449149-1b.html 449149-1b.html
 == 449149-2.html 449149-2.html
 == 449171-1.html 449171-1.html
 fails == 449362-1.html 449362-1.html
 == 449519-1.html 449519-1.html
 == 450670-1.html 450670-1.html
-fails == 451168-1.html 451168-1.html
+== 451168-1.html 451168-1.html
 == 451876-1.html 451876-1.html
 == 451876-2.html 451876-2.html
 == 452915-1.html 452915-1.html
 == 452964-1.html 452964-1.html
 == 454361.html 454361.html
 == 455105-1.html 455105-1.html
 == 455105-2.html 455105-2.html
 fails == 455171-5.html 455171-5.html
@@ -1448,17 +1448,17 @@ fails == 523096-1.html 523096-1.html
 == 527464-1.html 527464-1.html
 == 528038-1a.html 528038-1a.html
 == 528038-1b.html 528038-1b.html
 == 528038-1c.html 528038-1c.html
 == 528038-1d.html 528038-1d.html
 == 528038-1e.html 528038-1e.html
 == 528038-1f.html 528038-1f.html
 == 528038-2.html 528038-2.html
-fails == 528096-1.html 528096-1.html
+== 528096-1.html 528096-1.html
 fails == 530686-1.html 530686-1.html
 == 531098-1.html 531098-1.html
 fails == 531200-1.html 531200-1.html
 == 531371-1.html 531371-1.html
 == 534526-1a.html 534526-1a.html
 fails == 534526-1b.html 534526-1b.html
 == 534804-1.html 534804-1.html
 == 534808-1.html 534808-1.html

--- a/layout/reftests/counter-style/reftest-stylo.list
+++ b/layout/reftests/counter-style/reftest-stylo.list
@@ -26,11 +26,11 @@ fails == descriptor-suffix-invalid.html 
 fails == descriptor-range-invalid.html descriptor-range-invalid.html
 fails == descriptor-pad-invalid.html descriptor-pad-invalid.html
 fails == descriptor-fallback.html descriptor-fallback.html
 fails == descriptor-symbols-invalid.html descriptor-symbols-invalid.html
 fails == name-case-sensitivity.html name-case-sensitivity.html
 fails == dependent-builtin.html dependent-builtin.html
 fails == redefine-builtin.html redefine-builtin.html
 fails == redefine-attr-mapping.html redefine-attr-mapping.html
-fails asserts-if(stylo,2) == disclosure-styles.html disclosure-styles.html # bug 1324704
+fails asserts-if(stylo,4) == disclosure-styles.html disclosure-styles.html # bug 1328319
 fails == symbols-function.html symbols-function.html
 fails == symbols-function-invalid.html symbols-function-invalid.html

--- a/layout/reftests/counters/reftest-stylo.list
+++ b/layout/reftests/counters/reftest-stylo.list
@@ -1,83 +1,83 @@
 # DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-fails asserts-if(stylo,12) == counter-name-case-sensitive.html counter-name-case-sensitive.html # bug 1324704
-fails asserts-if(stylo,12) == t1202-counter-00-b-test.html t1202-counter-00-b-test.html # bug 1324704
-asserts-if(stylo,12) == t1202-counter-01-b-test.html t1202-counter-01-b-test.html # bug 1324704
-fails asserts-if(stylo,12) == t1202-counter-02-b-test.html t1202-counter-02-b-test.html # bug 1324704
-fails asserts-if(stylo,12) == t1202-counter-03-b-test.html t1202-counter-03-b-test.html # bug 1324704
-fails asserts-if(stylo,12) == t1202-counter-04-b-test.html t1202-counter-04-b-test.html # bug 1324704
-fails asserts-if(stylo,12) == t1202-counter-05-b-test.html t1202-counter-05-b-test.html # bug 1324704
+== counter-name-case-sensitive.html counter-name-case-sensitive.html
+== t1202-counter-00-b-test.html t1202-counter-00-b-test.html
+t1202-counter-01-b-test.html t1202-counter-01-b-test.html
+asserts-if(stylo,4) == t1202-counter-02-b-test.html t1202-counter-02-b-test.html
+asserts-if(stylo,4) == t1202-counter-03-b-test.html t1202-counter-03-b-test.html
+asserts-if(stylo,4) == t1202-counter-04-b-test.html t1202-counter-04-b-test.html
+== t1202-counter-05-b-test.html t1202-counter-05-b-test.html
 fails == t1202-counter-06-b-test.html t1202-counter-06-b-test.html
-fails asserts-if(stylo,19) == t1202-counter-07-b-test.html t1202-counter-07-b-test.html
-fails asserts-if(stylo,19) == t1202-counter-08-b-test.html t1202-counter-08-b-test.html
+fails asserts-if(stylo,4) == t1202-counter-07-b-test.html t1202-counter-07-b-test.html
+fails asserts-if(stylo,4) == t1202-counter-08-b-test.html t1202-counter-08-b-test.html
 fails == t1202-counter-09-b-test.html t1202-counter-09-b-test.html
 fails == t1202-counter-10-b-test.html t1202-counter-10-b-test.html
 fails == t1202-counter-11-b-test.html t1202-counter-11-b-test.html
-fails asserts-if(stylo,12) == t1202-counter-12-b-test.html t1202-counter-12-b-test.html
+fails asserts-if(stylo,4) == t1202-counter-12-b-test.html t1202-counter-12-b-test.html
 fails == t1202-counter-13-b-test.html t1202-counter-13-b-test.html
-fails asserts-if(stylo,12) == t1202-counter-14-b-test.html t1202-counter-14-b-test.html
+fails asserts-if(stylo,4) == t1202-counter-14-b-test.html t1202-counter-14-b-test.html
 fails == t1202-counter-15-b-test.html t1202-counter-15-b-test.html
-fails asserts-if(stylo,12) == t1202-counter-16-f-test.html t1202-counter-16-f-test.html # bug 1324704
-fails asserts-if(stylo,12) == t1202-counters-00-b-test.html t1202-counters-00-b-test.html # bug 1324704
-fails asserts-if(stylo,12) == t1202-counters-01-b-test.html t1202-counters-01-b-test.html # bug 1324704
-fails asserts-if(stylo,12) == t1202-counters-02-b-test.html t1202-counters-02-b-test.html # bug 1324704
-fails asserts-if(stylo,12) == t1202-counters-03-b-test.html t1202-counters-03-b-test.html # bug 1324704
-fails asserts-if(stylo,12) == t1202-counters-04-b-test.html t1202-counters-04-b-test.html # bug 1324704
-fails asserts-if(stylo,12) == t1202-counters-05-b-test.html t1202-counters-05-b-test.html # bug 1324704
+== t1202-counter-16-f-test.html t1202-counter-16-f-test.html
+== t1202-counters-00-b-test.html t1202-counters-00-b-test.html
+== t1202-counters-01-b-test.html t1202-counters-01-b-test.html
+asserts-if(stylo,4) == t1202-counters-02-b-test.html t1202-counters-02-b-test.html
+asserts-if(stylo,4) == t1202-counters-03-b-test.html t1202-counters-03-b-test.html
+asserts-if(stylo,4) == t1202-counters-04-b-test.html t1202-counters-04-b-test.html
+== t1202-counters-05-b-test.html t1202-counters-05-b-test.html
 fails == t1202-counters-06-b-test.html t1202-counters-06-b-test.html
-fails asserts-if(stylo,19) == t1202-counters-07-b-test.html t1202-counters-07-b-test.html
-fails asserts-if(stylo,19) == t1202-counters-08-b-test.html t1202-counters-08-b-test.html
+fails asserts-if(stylo,4) == t1202-counters-07-b-test.html t1202-counters-07-b-test.html
+fails asserts-if(stylo,4) == t1202-counters-08-b-test.html t1202-counters-08-b-test.html
 fails == t1202-counters-09-b-test.html t1202-counters-09-b-test.html
 fails == t1202-counters-10-b-test.html t1202-counters-10-b-test.html
 fails == t1202-counters-11-b-test.html t1202-counters-11-b-test.html
-fails asserts-if(stylo,12) == t1202-counters-12-b-test.html t1202-counters-12-b-test.html
+fails asserts-if(stylo,4) == t1202-counters-12-b-test.html t1202-counters-12-b-test.html
 fails == t1202-counters-13-b-test.html t1202-counters-13-b-test.html
-fails asserts-if(stylo,12) == t1202-counters-14-b-test.html t1202-counters-14-b-test.html
+fails asserts-if(stylo,4) == t1202-counters-14-b-test.html t1202-counters-14-b-test.html
 fails == t1202-counters-15-b-test.html t1202-counters-15-b-test.html
-fails asserts-if(stylo,4) == t1202-counters-16-c-test.html t1202-counters-16-c-test.html # bug 1324704
-fails asserts-if(stylo,4) == t1202-counters-17-d-test.html t1202-counters-17-d-test.html # bug 1324704
-fails asserts-if(stylo,12) == t1202-counters-18-f-test.html t1202-counters-18-f-test.html # bug 1324704
-fails asserts-if(stylo,2) == t1204-implied-00-b-test.html t1204-implied-00-b-test.html # bug 1324704
-fails asserts-if(stylo,2) == t1204-implied-01-c-test.html t1204-implied-01-c-test.html # bug 1324704
-fails asserts-if(stylo,4) == t1204-implied-02-d-test.html t1204-implied-02-d-test.html # bug 1324704
-fails asserts-if(stylo,4) == t1204-increment-00-c-o-test.html t1204-increment-00-c-o-test.html # bug 1324704
-fails asserts-if(stylo,4) == t1204-increment-01-c-o-test.html t1204-increment-01-c-o-test.html # bug 1324704
-fails asserts-if(stylo,5) == t1204-increment-02-c-o-test.html t1204-increment-02-c-o-test.html # bug 1324704
-fails asserts-if(stylo,2) == t1204-multiple-00-c-test.html t1204-multiple-00-c-test.html # bug 1324704
-fails asserts-if(stylo,2) == t1204-multiple-01-c-test.html t1204-multiple-01-c-test.html # bug 1324704
-fails asserts-if(stylo,16) == t1204-order-00-c-test.html t1204-order-00-c-test.html # bug 1324704
-fails asserts-if(stylo,9) == t1204-order-01-d-test.html t1204-order-01-d-test.html # bug 1324704
-fails asserts-if(stylo,3) == t1204-reset-00-c-o-test.html t1204-reset-00-c-o-test.html # bug 1324704
-fails asserts-if(stylo,3) == t1204-reset-01-c-o-test.html t1204-reset-01-c-o-test.html # bug 1324704
-fails asserts-if(stylo,5) == t1204-reset-02-c-o-test.html t1204-reset-02-c-o-test.html # bug 1324704
-fails asserts-if(stylo,1) == t1204-root-e-test.html t1204-root-e-test.html # bug 1324704
-fails asserts-if(stylo,12) == t120401-scope-00-b-test.html t120401-scope-00-b-test.html # bug 1324704
-fails asserts-if(stylo,14) == t120401-scope-01-c-test.html t120401-scope-01-c-test.html # bug 1324704
-fails asserts-if(stylo,6) == t120401-scope-02-c-test.html t120401-scope-02-c-test.html # bug 1324704
-fails asserts-if(stylo,6) == t120401-scope-03-c-test.html t120401-scope-03-c-test.html # bug 1324704
-fails asserts-if(stylo,4) == t120401-scope-04-d-test.html t120401-scope-04-d-test.html # bug 1324704
-fails asserts-if(stylo,1) == t120403-content-none-00-c-test.html t120403-content-none-00-c-test.html # bug 1324704
-fails asserts-if(stylo,1) == t120403-display-none-00-c-test.html t120403-display-none-00-c-test.html # bug 1324704
-fails asserts-if(stylo,1) == t120403-visibility-00-c-test.html t120403-visibility-00-c-test.html # bug 1324704
+== t1202-counters-16-c-test.html t1202-counters-16-c-test.html
+== t1202-counters-17-d-test.html t1202-counters-17-d-test.html
+== t1202-counters-18-f-test.html t1202-counters-18-f-test.html
+== t1204-implied-00-b-test.html t1204-implied-00-b-test.html
+== t1204-implied-01-c-test.html t1204-implied-01-c-test.html
+== t1204-implied-02-d-test.html t1204-implied-02-d-test.html
+== t1204-increment-00-c-o-test.html t1204-increment-00-c-o-test.html
+== t1204-increment-01-c-o-test.html t1204-increment-01-c-o-test.html
+== t1204-increment-02-c-o-test.html t1204-increment-02-c-o-test.html
+== t1204-multiple-00-c-test.html t1204-multiple-00-c-test.html
+== t1204-multiple-01-c-test.html t1204-multiple-01-c-test.html
+== t1204-order-00-c-test.html t1204-order-00-c-test.html
+== t1204-order-01-d-test.html t1204-order-01-d-test.html
+== t1204-reset-00-c-o-test.html t1204-reset-00-c-o-test.html
+== t1204-reset-01-c-o-test.html t1204-reset-01-c-o-test.html
+== t1204-reset-02-c-o-test.html t1204-reset-02-c-o-test.html
+== t1204-root-e-test.html t1204-root-e-test.html
+== t120401-scope-00-b-test.html t120401-scope-00-b-test.html
+== t120401-scope-01-c-test.html t120401-scope-01-c-test.html
+== t120401-scope-02-c-test.html t120401-scope-02-c-test.html
+== t120401-scope-03-c-test.html t120401-scope-03-c-test.html
+== t120401-scope-04-d-test.html t120401-scope-04-d-test.html
+== t120403-content-none-00-c-test.html t120403-content-none-00-c-test.html
+== t120403-display-none-00-c-test.html t120403-display-none-00-c-test.html
+== t120403-visibility-00-c-test.html t120403-visibility-00-c-test.html
 == text-boundaries-subpixel.html text-boundaries-subpixel.html
 fails == counter-hebrew-test.html counter-hebrew-test.html
 fails == counters-hebrew-test.html counters-hebrew-test.html
-fails asserts-if(stylo,7) == counter-reset-integer-range.html counter-reset-integer-range.html # bug 1324704
-fails asserts-if(stylo,4) == counter-ua-limits-00.html counter-ua-limits-00.html # bug 1324704
-fails asserts-if(stylo,4) == counter-ua-limits-01.html counter-ua-limits-01.html # bug 1324704
-fails asserts-if(stylo,4) == counter-ua-limits-02.html counter-ua-limits-02.html # bug 1324704
-fails asserts-if(stylo,4) == counter-ua-limits-03.html counter-ua-limits-03.html # bug 1324704
+== counter-reset-integer-range.html counter-reset-integer-range.html
+== counter-ua-limits-00.html counter-ua-limits-00.html
+== counter-ua-limits-01.html counter-ua-limits-01.html
+== counter-ua-limits-02.html counter-ua-limits-02.html
+== counter-ua-limits-03.html counter-ua-limits-03.html
 == counter-ua-limits-list-00.html counter-ua-limits-list-00.html
 == counter-ua-limits-list-01.html counter-ua-limits-list-01.html
 fails == multiple-thai-counters.html multiple-thai-counters.html
 fails == counter-suffix.html counter-suffix.html
 fails == counter-cjk-decimal.html counter-cjk-decimal.html
-fails asserts-if(stylo,32) == counter-japanese-informal.html counter-japanese-informal.html
-fails asserts-if(stylo,32) == counter-japanese-formal.html counter-japanese-formal.html
-fails asserts-if(stylo,32) == counter-korean-hangul-formal.html counter-korean-hangul-formal.html
-fails asserts-if(stylo,32) == counter-korean-hanja-informal.html counter-korean-hanja-informal.html
-fails asserts-if(stylo,32) == counter-korean-hanja-formal.html counter-korean-hanja-formal.html
-fails asserts-if(stylo,32) == counter-simp-chinese-informal.html counter-simp-chinese-informal.html
-fails asserts-if(stylo,32) == counter-simp-chinese-formal.html counter-simp-chinese-formal.html
-fails asserts-if(stylo,32) == counter-trad-chinese-informal.html counter-trad-chinese-informal.html
-fails asserts-if(stylo,32) == counter-trad-chinese-formal.html counter-trad-chinese-formal.html
-fails asserts-if(stylo,38) == counter-ethiopic-numeric.html counter-ethiopic-numeric.html
+asserts-if(stylo,4) == counter-japanese-informal.html counter-japanese-informal.html
+asserts-if(stylo,4) == counter-japanese-formal.html counter-japanese-formal.html
+asserts-if(stylo,4) == counter-korean-hangul-formal.html counter-korean-hangul-formal.html
+asserts-if(stylo,4) == counter-korean-hanja-informal.html counter-korean-hanja-informal.html
+asserts-if(stylo,4) == counter-korean-hanja-formal.html counter-korean-hanja-formal.html
+asserts-if(stylo,4) == counter-simp-chinese-informal.html counter-simp-chinese-informal.html
+asserts-if(stylo,4) == counter-simp-chinese-formal.html counter-simp-chinese-formal.html
+asserts-if(stylo,4) == counter-trad-chinese-informal.html counter-trad-chinese-informal.html
+asserts-if(stylo,4) == counter-trad-chinese-formal.html counter-trad-chinese-formal.html
+asserts-if(stylo,4) == counter-ethiopic-numeric.html counter-ethiopic-numeric.html

--- a/layout/reftests/css-grid/reftest-stylo.list
+++ b/layout/reftests/css-grid/reftest-stylo.list
@@ -191,17 +191,17 @@ fails == grid-fragmentation-012.html gri
 fails == grid-fragmentation-013.html grid-fragmentation-013.html
 fails == grid-fragmentation-014.html grid-fragmentation-014.html
 fails asserts(0-10) == grid-fragmentation-015.html grid-fragmentation-015.html
 fails == grid-fragmentation-016.html grid-fragmentation-016.html
 fails == grid-fragmentation-017.html grid-fragmentation-017.html
 fails == grid-fragmentation-018.html grid-fragmentation-018.html
 fails == grid-fragmentation-019.html grid-fragmentation-019.html
 fails == grid-fragmentation-020.html grid-fragmentation-020.html
-fails asserts-if(stylo,93) == grid-fragmentation-021.html grid-fragmentation-021.html # bug 1324704
+fails == grid-fragmentation-021.html grid-fragmentation-021.html
 fails == grid-fragmentation-022.html grid-fragmentation-022.html
 fails == grid-fragmentation-023.html grid-fragmentation-023.html
 fails == grid-fragmentation-024.html grid-fragmentation-024.html
 fails == grid-fragmentation-025.html grid-fragmentation-025.html
 fails == grid-fragmentation-026.html grid-fragmentation-026.html
 fails == grid-fragmentation-027.html grid-fragmentation-027.html
 fails == grid-fragmentation-028.html grid-fragmentation-028.html
 fails == grid-fragmentation-029.html grid-fragmentation-029.html

--- a/layout/reftests/first-letter/reftest-stylo.list
+++ b/layout/reftests/first-letter/reftest-stylo.list
@@ -19,17 +19,17 @@ fails == parent-style-1.html parent-styl
 == quote-1c.html quote-1c.html
 == quote-1c.html quote-1c.html
 == quote-1d.html quote-1d.html
 == quote-1d.html quote-1d.html
 == quote-1e.html quote-1e.html
 == quote-1e.html quote-1e.html
 == quote-1f.html quote-1f.html
 fails == dynamic-1.html dynamic-1.html
-fails random-if(d2d) == dynamic-2.html dynamic-2.html
+random-if(d2d) == dynamic-2.html dynamic-2.html
 == dynamic-3a.html dynamic-3a.html
 == dynamic-3b.html dynamic-3b.html
 == 23605-1.html 23605-1.html
 == 23605-2.html 23605-2.html
 == 23605-3.html 23605-3.html
 == 23605-4.html 23605-4.html
 == 23605-5.html 23605-5.html
 == 23605-6.html 23605-6.html

--- a/layout/reftests/generated-content/reftest-stylo.list
+++ b/layout/reftests/generated-content/reftest-stylo.list
@@ -1,18 +1,18 @@
 # DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
 # All tests in this file have fuzz on OS X 10.10 due to bug 1220052.
 
-fails == display-types-01.html display-types-01.html
-fails == dynamic-attr-01.html dynamic-attr-01.html
+== display-types-01.html display-types-01.html
+== dynamic-attr-01.html dynamic-attr-01.html
 fails == dynamic-button-01a.html dynamic-button-01a.html
 fails == dynamic-button-01b.html dynamic-button-01b.html
 fails == dynamic-fieldset-01a.html dynamic-fieldset-01a.html
 fails == dynamic-fieldset-01b.html dynamic-fieldset-01b.html
 == dynamic-restyle-01.html dynamic-restyle-01.html
 == dynamic-table-cell-01a.html dynamic-table-cell-01a.html
 == dynamic-table-cell-01b.html dynamic-table-cell-01b.html
-fails == floated-01.html floated-01.html
+== floated-01.html floated-01.html
 == images-01.html images-01.html
-fails == positioned-01.html positioned-01.html
+== positioned-01.html positioned-01.html
 fuzzy-if(OSX==1010,1,10) == quotes-001.xml quotes-001.xml
-fails == table-ignoring-whitespace-01.html table-ignoring-whitespace-01.html
-fails == table-parts-01.html table-parts-01.html
+== table-ignoring-whitespace-01.html table-ignoring-whitespace-01.html
+== table-parts-01.html table-parts-01.html

--- a/layout/reftests/mathml/reftest-stylo.list
+++ b/layout/reftests/mathml/reftest-stylo.list
@@ -45,17 +45,17 @@ fails == mfenced-9.html mfenced-9.html
 fails == mfenced-10.html mfenced-10.html
 fails == mfenced-11.html mfenced-11.html
 fails == mfenced-12.html mfenced-12.html
 fails == mi-mathvariant-1.xhtml mi-mathvariant-1.xhtml
 fails == mi-mathvariant-2.xhtml mi-mathvariant-2.xhtml
 fails == mi-mathvariant-3.html mi-mathvariant-3.html
 fails == non-spacing-accent-1.xhtml non-spacing-accent-1.xhtml
 fails == overbar-width-1.xhtml overbar-width-1.xhtml
-fails == quotes-1.xhtml quotes-1.xhtml
+== quotes-1.xhtml quotes-1.xhtml
 fails == stretchy-underbar-1.xhtml stretchy-underbar-1.xhtml
 fails == stretchy-munderover-1a.html stretchy-munderover-1a.html
 fails == stretchy-munderover-1b.html stretchy-munderover-1b.html
 fails == stretchy-munderover-1c.html stretchy-munderover-1c.html
 fails == stretchy-munderover-1d.html stretchy-munderover-1d.html
 fails == stretchy-munderover-1e.html stretchy-munderover-1e.html
 fails == stretchy-munderover-2a.html stretchy-munderover-2a.html
 fails == stretchy-munderover-2b.html stretchy-munderover-2b.html

--- a/layout/style/crashtests/crashtests.list
+++ b/layout/style/crashtests/crashtests.list
@@ -9,17 +9,17 @@ load 330998-1.html
 load 363950.html
 load 368175-1.html
 load 368740.html
 load 379788-1.html
 load 383979-1.xhtml
 load 383979-2.html
 load 386939-1.html
 load 391034-1.xhtml
-asserts-if(stylo,1) load 397022-1.html # bug 1324704
+load 397022-1.html
 load 399289-1.svg
 load 404470-1.html
 load 411603-1.html
 load 412588-1.html
 load 413274-1.xhtml
 load 416461-1.xul
 load 418007-1.xhtml
 load 431705-1.xul

--- a/layout/style/test/stylo-failures.md
+++ b/layout/style/test/stylo-failures.md
@@ -105,17 +105,17 @@ Any line which doesn't follow the format
   * Events:
     * test_animations_event_handler_attribute.html [10]
     * test_animations_event_order.html [11]
 * test_bug798843_pref.html: conditional opentype svg support [7]
 * test_computed_style.html `gradient`: -moz-prefixed radient value [9]
 * url value in style attribute bug 1310886
   * test_computed_style.html `url` [11]
   * test_parse_url.html [4]
-  * test_value_storage.html `url` [92]
+  * test_value_storage.html `url` [89]
   * test_shorthand_property_getters.html `url` [3]
 * auto value for min-{width,height} servo/servo#15045
 * test_compute_data_with_start_struct.html `timing-function`: incorrectly computing keywords to bezier function servo/servo#15086 [2]
 * test_condition_text.html: @-moz-document, CSSOM support of @media, @support [7]
 * @counter-style support:
   * test_counter_descriptor_storage.html [1]
   * test_counter_style.html [1]
   * test_rule_insertion.html `@counter-style` [4]
@@ -262,19 +262,19 @@ Any line which doesn't follow the format
     * test_value_storage.html `touch-action` [14]
 * Unimplemented SVG properties:
   * stroke properties
     * test_value_storage.html `on 'stroke` [6]
     * test_compute_data_with_start_struct.html `initial and other values of stroke-dasharray are different` [2]
 * Properties implemented but not in geckolib:
   * counter-reset property:
     * test_bug829816.html [8]
-    * test_value_storage.html `counter-reset` [30]
+    * test_value_storage.html `counter-reset` [2]
   * counter-increment property:
-    * test_value_storage.html `counter-increment` [30]
+    * test_value_storage.html `counter-increment` [2]
   * clip property: servo/servo#15729
     * test_value_storage.html `should be idempotent for 'clip` [4]
   * font-feature-settings property
     * test_compute_data_with_start_struct.html `font-feature-settings` [2]
     * test_inherit_computation.html `font-feature-settings` [8]
     * test_inherit_storage.html `font-feature-settings` [12]
     * test_initial_computation.html `font-feature-settings` [4]
     * test_initial_storage.html `font-feature-settings` [6]
@@ -344,18 +344,18 @@ Any line which doesn't follow the format
     * test_value_storage.html `'color'` [36]
     * ... `rgb(100, 100.0, 100)` [1]
   * color interpolation hint not supported servo/servo#15166
     * test_value_storage.html `'linear-gradient` [50]
   * two-keyword form of background-repeat/mask-repeat servo/servo#14954
     * test_value_storage.html `background-repeat` [14]
     * ... `mask-repeat` [24]
   * lack glue for function values of content property bug 1296477
-    * test_rule_insertion.html `decimal counter` [3]
-    * test_value_storage.html `'content` [40]
+    * test_rule_insertion.html `decimal counter` [1]
+    * test_value_storage.html `'content` [12]
   * SVG-in-OpenType values not supported servo/servo#15211
     * test_value_storage.html `context-` [2]
   * writing-mode: sideways-{lr,rl} and SVG values servo/servo#15213
     * test_logical_properties.html `sideways` [1224]
     * test_value_storage.html `writing-mode` [8]
 * Incorrect parsing
   * calc() doesn't support dividing expression servo/servo#15192
     * test_value_storage.html `calc(50px/` [7]
@@ -458,31 +458,28 @@ Any line which doesn't follow the format
   * test_units_length.html [5]
   * test_units_time.html [1]
 * insertRule / deleteRule don't work bug 1336863
   * test_rule_insertion.html [7]
 * @-moz-document support
   * test_rule_serialization.html [2]
   * test_moz_document_rules.html [13]
 * getComputedStyle style doesn't contain custom properties bug 1336891
-  * test_variable_serialization_computed.html [36]
+  * test_variable_serialization_computed.html [35]
   * test_variables.html `custom property name` [2]
 * test_css_supports.html: issues around @supports syntax servo/servo#15482 [8]
 * test_author_specified_style.html: support serializing color as author specified [33]
 * browser_newtab_share_rule_processors.js: agent style sheet sharing [1]
 
 ## Assertions
 
 * Content glue not implemented
-  * assertion in frame constructor bug 1324704
-    * test_rule_insertion.html asserts [1]
   * assertion in computed style bug 1337635
-    * test_value_cloning.html asserts [12]
-    * test_value_computation.html asserts [24]
-    * test_value_storage.html asserts [44]
+    * test_value_cloning.html asserts [4]
+    * test_value_computation.html asserts [11]
   * assertion for unsupported or non-animatable property bug 1343710
     * test_animations.html asserts [24]
 
 ## Need Gecko change
 
 * Servo is correct but Gecko is wrong
   * unitless zero as angle bug 1234357
     * test_property_syntax_errors.html `linear-gradient(0,` [8]

--- a/layout/tables/crashtests/crashtests.list
+++ b/layout/tables/crashtests/crashtests.list
@@ -131,29 +131,29 @@ load 534716-1.html
 load 563009-1.html
 load 563009-2.html
 load 563009-3.html
 load 573354-1.xhtml
 load 576890-1.html
 load 576890-2.html
 load 576890-3.html
 load 580481-1.xhtml
-asserts(1) asserts-if(stylo,0) load 595758-1.xhtml # Bug 714667
+asserts(1) load 595758-1.xhtml # Bug 714667
 load 595758-2.xhtml
 load 678447-1.html
 load 691824-1.xhtml
 load 695430-1.html
 load 696640-1.html
 load 696640-2.html
 load 705996-1.html
 load 705996-2.html
 load 707622-1.html
 load 710098-1.html
 load 711864-1.html
-asserts-if(gtkWidget&&browserIsRemote,5) asserts-if(stylo,1-7) load 759249-1.html # Bug 1195474 # bug 1324704
+asserts-if(gtkWidget&&browserIsRemote,5) load 759249-1.html # Bug 1195474
 load 759249-2.html
 load 814713.html
 load 1027611-1.html
 load 1031934.html
 load 1183896.html
 load 1223282.html
 load 1223232.html
 load 1243623-1.html

--- a/parser/htmlparser/tests/crashtests/crashtests.list
+++ b/parser/htmlparser/tests/crashtests/crashtests.list
@@ -45,13 +45,13 @@ load 525229-1.html
 load 536097-1.html
 load 555462.html
 load 563514-1.html
 load 574884-1.html
 load 574884-2.html
 load 591330-1.html
 load 650501-1.xhtml
 load 696651-1.html
-asserts-if(stylo,2) load view-source:699347-1.xml # bug 1324704
+load view-source:699347-1.xml
 load 721313-1.html
-asserts-if(stylo,5) load view-source:742414-1.html # bug 1324704
+load view-source:742414-1.html
 load 981279-1.html
 load 982285-1.html

--- a/parser/htmlparser/tests/reftest/reftest-stylo.list
+++ b/parser/htmlparser/tests/reftest/reftest-stylo.list
@@ -1,27 +1,27 @@
 # DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
 == bug535530-1.html bug535530-1.html
-fails asserts-if(stylo,15) == view-source:bug535530-2.html view-source:bug535530-2.html # bug 1335312
+fails == view-source:bug535530-2.html view-source:bug535530-2.html
 == bug566280-1.html bug566280-1.html
 == bug569229-1.xml bug569229-1.xml
 == bug577418-1.html bug577418-1.html
 == bug582788-1.html bug582788-1.html
 fails == bug582940-1.html bug582940-1.html
 == bug592656-1.html bug592656-1.html
 == bug599320-1.html bug599320-1.html
 == bug608373-1.html bug608373-1.html
-fails asserts-if(stylo,25) == view-source:bug482921-1.html view-source:bug482921-1.html # bug 1324704
-fails asserts-if(stylo,26) == view-source:bug482921-2.xhtml view-source:bug482921-2.xhtml # bug 1324704
+fails == view-source:bug482921-1.html view-source:bug482921-1.html
+fails == view-source:bug482921-2.xhtml view-source:bug482921-2.xhtml
 == bug659763-1.html bug659763-1.html
 == bug659763-2.html bug659763-2.html
 == bug659763-3.html bug659763-3.html
 == bug659763-4.html bug659763-4.html
 == bug659763-5.html bug659763-5.html
 == bug659763-6.html bug659763-6.html
-fails asserts-if(stylo,10) == view-source:bug673094-1.html view-source:bug673094-1.html # bug 1324704
+fails == view-source:bug673094-1.html view-source:bug673094-1.html
 == bug696651-1.html bug696651-1.html
 == bug696651-2.html bug696651-2.html
-fails asserts-if(stylo,4) == view-source:bug700260-1.html view-source:bug700260-1.html # bug 1324704
-fails asserts-if(stylo,2) == view-source:bug704667-1.html view-source:bug704667-1.html # bug 1324704
-fails asserts-if(stylo,28) == view-source:bug731234-1.html view-source:bug731234-1.html # bug 1324704
+fails == view-source:bug700260-1.html view-source:bug700260-1.html
+fails == view-source:bug704667-1.html view-source:bug704667-1.html
+fails == view-source:bug731234-1.html view-source:bug731234-1.html
 == bug820508-1.html bug820508-1.html
-fails asserts-if(stylo,2) == view-source:bug910588-1.html view-source:bug910588-1.html # bug 1324704
+fails == view-source:bug910588-1.html view-source:bug910588-1.html