diff --git a/content/base/crashtests/crashtests.list b/content/base/crashtests/crashtests.list
index 7f42ad33fda..0287e0181d3 100644
--- a/content/base/crashtests/crashtests.list
+++ b/content/base/crashtests/crashtests.list
@@ -19,13 +19,13 @@ load 338391-1.xhtml
 load 340733-1.html
 load 343730-1.xhtml
 load 343850-1.xhtml
-load 343889-1.html
+asserts(3) load 343889-1.html # bug 563536
 load 344434-1.xhtml
 load 348049-1.xhtml
 load 344882-1.html
 load 345837-1.xhtml
 load 349355-1.html
-load 354645-1.xul
+asserts(1) load 354645-1.xul # bug 512815
 load 360599-1.html
 load 366200-1.xhtml
 load 369216-1.html
@@ -41,12 +41,12 @@ skip load 399712-1.html # sporadically times out (bug 473680)
 load 398088-1.xul
 load 400763-1.html
 load 401993-1.html
-load 407818.html
+asserts(1) load 407818.html # bug 336104
 load 410860-1.xml
 load 416734-1.html
 load 418928-1.html
 load 420620-1.html
-load 424276-1.html
+asserts(2) load 424276-1.html # bug 462897
 load 426987-1.html
 load 443538-1.svg
 load 450383-1.html
@@ -60,7 +60,7 @@ load 493281-2.html
 load 490760-1.xhtml
 load 494810-1.html
 load 529670.html
-load 554230-1.xhtml
+asserts(1) load 554230-1.xhtml # bug 336104
 load 552651.html
 load 558973.html
 load 564079-1.html 
diff --git a/content/html/document/crashtests/crashtests.list b/content/html/document/crashtests/crashtests.list
index 1f59e576d5a..1b2ea08780e 100644
--- a/content/html/document/crashtests/crashtests.list
+++ b/content/html/document/crashtests/crashtests.list
@@ -1,9 +1,9 @@
 load 285166-1.html
 load 294235-1.html
 load 378993-1.xhtml
-load 388183-1.html
+asserts(1) load 388183-1.html # bug 336104
 load 395340-1.html
-load 399694-1.html
+asserts(1) load 399694-1.html # bug 336104
 load 407053.html
 load 448564.html
 load 468562-1.html
diff --git a/content/media/test/crashtests/crashtests.list b/content/media/test/crashtests/crashtests.list
index e3781dcab2a..f3a11ba879b 100644
--- a/content/media/test/crashtests/crashtests.list
+++ b/content/media/test/crashtests/crashtests.list
@@ -1,5 +1,5 @@
 load 459439-1.html
-load 466607-1.html
+asserts-if(MOZ_WIDGET_TOOLKIT=="windows",0-1) load 466607-1.html
 load 466945-1.html
 load 468763-1.html
 load 474744-1.html
diff --git a/content/xbl/crashtests/crashtests.list b/content/xbl/crashtests/crashtests.list
index 1a63e3d16b7..871e519853d 100644
--- a/content/xbl/crashtests/crashtests.list
+++ b/content/xbl/crashtests/crashtests.list
@@ -5,7 +5,7 @@ load 232095-1.xul
 load 277523-1.xhtml
 load 277950-1.xhtml
 load 336744-1.html
-load 336960-1.html
+asserts(0-1) load 336960-1.html # maybe bug 429586
 load 342954-1.xhtml
 load 342954-2.xhtml
 load 368276-1.xhtml
diff --git a/docshell/base/crashtests/crashtests.list b/docshell/base/crashtests/crashtests.list
index aa125c72742..56e6e173a43 100644
--- a/docshell/base/crashtests/crashtests.list
+++ b/docshell/base/crashtests/crashtests.list
@@ -3,7 +3,7 @@ load 369126-1.html
 load 403574-1.xhtml
 load 430124-1.html
 load 430628-1.html
-load 432114-1.html
-load 432114-2.html
+asserts(1-4) load 432114-1.html # bug 336104 and others
+asserts(0-1) load 432114-2.html # bug 336104
 load 436900-1.html
 load 500328-1.html
diff --git a/dom/base/crashtests/crashtests.list b/dom/base/crashtests/crashtests.list
index 50b8b7805d4..21d858df587 100644
--- a/dom/base/crashtests/crashtests.list
+++ b/dom/base/crashtests/crashtests.list
@@ -19,4 +19,4 @@ load 462947.html
 load 439206-1.html
 load 473284.xul
 load 502617.html
-load 504224.html
+asserts(1) load 504224.html # bug 564098
diff --git a/editor/composer/src/crashtests/crashtests.list b/editor/composer/src/crashtests/crashtests.list
index 03ef582fd9e..fecc571c0c7 100644
--- a/editor/composer/src/crashtests/crashtests.list
+++ b/editor/composer/src/crashtests/crashtests.list
@@ -1,5 +1,5 @@
 load 351236-1.html
-load 407062-1.html
-skip-if(MOZ_WIDGET_TOOLKIT=="windows") load 428844-1.html # bug 471185
-load 461049-1.html
-load removing-editable-xslt.html
+asserts(2) load 407062-1.html # bug 336104
+asserts(1-2) skip-if(MOZ_WIDGET_TOOLKIT=="windows") load 428844-1.html # bug 471185; assertion bug 336104
+asserts(1) load 461049-1.html # bug 336104
+asserts(2) asserts-if(MOZ_WIDGET_TOOLKIT=="windows",0-2) load removing-editable-xslt.html # bug 336104, bug 500847
diff --git a/editor/libeditor/base/crashtests/crashtests.list b/editor/libeditor/base/crashtests/crashtests.list
index 71ad6cc734e..6f8482eaca7 100644
--- a/editor/libeditor/base/crashtests/crashtests.list
+++ b/editor/libeditor/base/crashtests/crashtests.list
@@ -1,5 +1,5 @@
-load 382527-1.html
+asserts(2) load 382527-1.html # bug 336104
 load 402172-1.html
-load 407256-1.html
+asserts(1) load 407256-1.html # bug 336104
 load 430624-1.html
 load 459613.html
diff --git a/editor/libeditor/html/crashtests/crashtests.list b/editor/libeditor/html/crashtests/crashtests.list
index 9740eee6cb6..bfc73dac756 100644
--- a/editor/libeditor/html/crashtests/crashtests.list
+++ b/editor/libeditor/html/crashtests/crashtests.list
@@ -1,9 +1,9 @@
 load 336081-1.xhtml # asserts (no bug?)
 load 382778-1.html
 load 407074-1.html
-load 407277-1.html
+asserts(1) load 407277-1.html # bug 336104
 load 418923-1.html
-load 420439.html
+asserts(1) load 420439.html # bug 336104
 load 428489-1.html
 load 431086-1.xhtml
 load 448329-1.html
@@ -11,6 +11,6 @@ load 448329-2.html
 load 448329-3.html
 load 456727-1.html
 load 456727-2.html
-load 467647-1.html
-load 503709-1.xhtml
-load 535632-1.xhtml
+asserts(1) load 467647-1.html # bug 382210
+asserts(1) load 503709-1.xhtml # bug 336104
+asserts(1) load 535632-1.xhtml # bug 336104
diff --git a/editor/libeditor/text/crashtests/crashtests.list b/editor/libeditor/text/crashtests/crashtests.list
index d5d24b06384..89d452f4061 100644
--- a/editor/libeditor/text/crashtests/crashtests.list
+++ b/editor/libeditor/text/crashtests/crashtests.list
@@ -1 +1 @@
-load 403965-1.xhtml
+asserts(2) load 403965-1.xhtml # bug 336104
diff --git a/gfx/src/thebes/crashtests/crashtests.list b/gfx/src/thebes/crashtests/crashtests.list
index b32021eec9a..8048f699b15 100644
--- a/gfx/src/thebes/crashtests/crashtests.list
+++ b/gfx/src/thebes/crashtests/crashtests.list
@@ -1,4 +1,4 @@
 load 306902-1.xml
 load 383872-1.svg
-load 423110-1.xhtml
+asserts(8) load 423110-1.xhtml
 load 445711.html
diff --git a/layout/base/crashtests/crashtests.list b/layout/base/crashtests/crashtests.list
index 30eaceea5ee..0bdcd96b44b 100644
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@@ -30,7 +30,7 @@ load 234851-2.html
 load 241300-1.html
 load 243159-1.html
 load 243159-2.xhtml
-load 243519-1.html
+asserts(1) load 243519-1.html # bug 536692
 load 244490-1.html
 load 254367-1.html
 load 265027-1.html
@@ -38,11 +38,11 @@ load 265736-1.html
 load 265736-2.html
 load 265899-1.html
 load 265973-1.html
-load 265986-1.html
+asserts(8) asserts-if(MOZ_WIDGET_TOOLKIT=="windows",10) load 265986-1.html
 load 265999-1.html
 load 266222-1.html
-load 266360-1.html
-load 266445-1.html
+asserts(7) load 266360-1.html
+asserts(4) load 266445-1.html
 load 268157-1.html
 load 269566-1.html
 load 272647-1.html
@@ -105,7 +105,7 @@ load 347898-1.html
 load 348126-1.html
 load 348688-1.html
 load 348708-1.xhtml
-load 348729-1.html
+asserts(2) load 348729-1.html
 load 349095-1.xhtml
 load 350128-1.xhtml
 load 350267-1.html
@@ -135,7 +135,7 @@ load 374193-1.xhtml
 load 374297-1.html
 load 374297-2.html
 load 376223-1.xhtml
-load 378325-1.html
+asserts(1) load 378325-1.html
 load 379105-1.xhtml
 load 379419-1.xhtml
 load 379768-1.html
@@ -163,7 +163,7 @@ load 393326-2.html
 load 393661-1.html
 load 393801-1.html
 load 394014-1.html
-load 394014-2.html
+asserts(0-1) load 394014-2.html # bug 429586
 load 394150-1.xhtml
 load 397011-1.xhtml
 load 398510-1.xhtml
@@ -201,7 +201,7 @@ load 409513.html
 load 410967.html
 load 411870-1.html
 load 412651-1.html
-load 413587-1.svg
+asserts(2) load 413587-1.svg
 load 414058-1.html
 load 414175-1.xul
 load 420031-1.html
@@ -229,7 +229,7 @@ load 444967-1.html
 load 446328.html
 load 448488-1.html
 load 450319-1.xhtml
-load 453894-1.xhtml
+asserts(3) load 453894-1.xhtml
 load 454751-1.xul
 load 455063-1.html
 load 455063-2.html
diff --git a/layout/forms/crashtests/crashtests.list b/layout/forms/crashtests/crashtests.list
index d59a3f5558f..2351db857ea 100644
--- a/layout/forms/crashtests/crashtests.list
+++ b/layout/forms/crashtests/crashtests.list
@@ -20,11 +20,11 @@ load 367587-1.html
 load 370703-1.html
 load 370940-1.html
 load 373586-1.xhtml
-load 378413-1.xhtml
+asserts(8-10) load 378413-1.xhtml
 load 380116-1.xhtml
 load 382212-1.xhtml
 load 382610-1.html
-load 383887-1.html
+asserts-if(MOZ_WIDGET_TOOLKIT=="windows",1) load 383887-1.html
 load 386554-1.html
 load 388374-1.xhtml
 load 388374-2.html
diff --git a/layout/generic/crashtests/crashtests.list b/layout/generic/crashtests/crashtests.list
index 957f6659bd2..2fd76be4ea0 100644
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -3,7 +3,7 @@ load 25888-2.html
 load 37757-1.html
 load 225868-1.html
 load 264937-1.html
-load 265867-1.html
+asserts(9) load 265867-1.html
 load 265867-2.html
 load 289864-1.html
 load 295292-1.html
@@ -12,7 +12,7 @@ load 302260-1.html
 load 307979-1.html
 load 310556-1.xhtml
 load 322780-1.xul
-load 323386-1.html
+asserts(2) asserts-if(MOZ_WIDGET_TOOLKIT=="gtk2",12) load 323386-1.html
 load 323389-1.html
 load 323389-2.html
 load 323493-1.html
@@ -58,7 +58,7 @@ load 369150-2.html
 load 369227-1.xhtml
 load 369547-1.html
 load 370699-1.html
-load 370794-1.html
+asserts(1) load 370794-1.html
 load 370866-1.xhtml
 load 370884-1.xhtml
 load 371348-1.xhtml
@@ -68,13 +68,13 @@ load 372376-1.xhtml
 load 373859-1.html
 load 373868-1.xhtml
 load 379217-1.xhtml
-load 379217-2.xhtml
+asserts(2) load 379217-2.xhtml
 load 379917-1.xhtml
 load 380012-1.html
 load 381152-1.html
 load 381786-1.html
-load 382129-1.xhtml
-load 382131-1.html
+asserts-if(MOZ_WIDGET_TOOLKIT=="gtk2",1) load 382129-1.xhtml
+asserts-if(MOZ_WIDGET_TOOLKIT=="gtk2",1) load 382131-1.html
 load 382199-1.html
 load 382208-1.xhtml
 load 382262-1.html
@@ -190,7 +190,7 @@ load 418932-1.html
 load 420000-1.html
 load 420785-1.xhtml
 load 421404-1.html
-load 421671.html
+asserts(0-1) load 421671.html
 load 422283-1.html
 load 422301-1.html
 load 423055-1.html
@@ -229,7 +229,7 @@ load 444861-1.html
 load 445288.html
 load 448903-1.html
 load 448996-1.html
-load 451315-1.html
+asserts(3) load 451315-1.html
 load 451317-1.html
 load 451334-1.html
 load 452157-1.html
@@ -246,7 +246,7 @@ load 461294-1.html
 load 463350-1.html
 load 463350-2.html
 load 463350-3.html
-load 463741-1.html
+asserts(4) load 463741-1.html
 load 465651-1.html
 load 467487-1.html
 load 467493-1.html
@@ -266,7 +266,7 @@ load 477731-1.html
 load 477928.html
 load 478170-1.html
 load 478185-1.html
-load 479938-1.html
+asserts(1) load 479938-1.html
 load 480345-1.html
 load 489462-1.html
 load 493111-1.html
@@ -285,7 +285,7 @@ load 505912-1.html
 load 509749-1.html
 load 511482.html
 load 513394-1.html
-load 514800-1.html
+asserts(1) load 514800-1.html
 load 515811-1.html
 load 517968.html
 load 520340.html
diff --git a/layout/mathml/crashtests/crashtests.list b/layout/mathml/crashtests/crashtests.list
index 2920040a5af..8559010f82d 100644
--- a/layout/mathml/crashtests/crashtests.list
+++ b/layout/mathml/crashtests/crashtests.list
@@ -32,7 +32,7 @@ load 375562-1.xhtml
 load 377824-1.xhtml
 load 379418-1.xhtml
 load 385226-1.xhtml
-load 393760-1.xhtml
+asserts(2-3) load 393760-1.xhtml
 load 397518-1.xhtml
 load 400475-1.xhtml
 load 402400-1.xhtml
diff --git a/layout/style/crashtests/crashtests.list b/layout/style/crashtests/crashtests.list
index a10c7ebae10..dc1d1b69d41 100644
--- a/layout/style/crashtests/crashtests.list
+++ b/layout/style/crashtests/crashtests.list
@@ -17,7 +17,7 @@ load 399289-1.svg
 load 404470-1.html
 load 411603-1.html
 load 412588-1.html
-load 413274-1.xhtml
+asserts-if(MOZ_WIDGET_TOOLKIT=="windows",2) load 413274-1.xhtml
 load 416461-1.xul
 load 418007-1.xhtml
 load 431705-1.xul
@@ -29,7 +29,7 @@ load 444237-1.html
 load 444848-1.html 
 load 447776-1.html
 load 447783-1.html
-load 448161-1.html
+asserts(1) load 448161-1.html
 load 448161-2.html
 load 452150-1.xhtml
 load 456196.html
diff --git a/layout/svg/crashtests/crashtests.list b/layout/svg/crashtests/crashtests.list
index 13cf822d438..b1e80b3acca 100644
--- a/layout/svg/crashtests/crashtests.list
+++ b/layout/svg/crashtests/crashtests.list
@@ -48,7 +48,7 @@ load 384637-1.svg
 load 384728-1.svg
 load 385246-1.svg
 load 385246-2.svg
-load 385840-1.svg # asserts (bug 385845)
+asserts(1) load 385840-1.svg # bug 385845
 load 385852-1.svg
 load 386475-1.xhtml
 load 386566-1.svg
diff --git a/layout/tables/crashtests/crashtests.list b/layout/tables/crashtests/crashtests.list
index 641905fb905..e9f03f14c46 100644
--- a/layout/tables/crashtests/crashtests.list
+++ b/layout/tables/crashtests/crashtests.list
@@ -80,7 +80,7 @@ load 399209-1.xhtml
 load 403249-1.html
 load 403579-1.html
 load 404301-1.xhtml
-load 408753-1.xhtml
+asserts(2) load 408753-1.xhtml
 load 410426-1.html
 load 411582.xhtml
 load 413091.xhtml
@@ -88,7 +88,7 @@ load 413180-1.html
 load 416845-1.xhtml
 load 416845-2.xhtml
 load 416845-3.html   
-load 420654-1.xhtml
+asserts(12) load 420654-1.xhtml
 load 423514-1.xhtml
 load 430374.html
 load 444431-1.html
diff --git a/layout/xul/base/src/crashtests/crashtests.list b/layout/xul/base/src/crashtests/crashtests.list
index f27f91bd816..dc28eafb0a8 100644
--- a/layout/xul/base/src/crashtests/crashtests.list
+++ b/layout/xul/base/src/crashtests/crashtests.list
@@ -12,7 +12,7 @@ load 291702-2.xul
 load 291702-3.xul
 load 294371-1.xul
 load 311457-1.html
-load 321056-1.xhtml
+asserts(1) load 321056-1.xhtml
 load 326834-1.html
 load 322786-1.xul
 load 326879-1.xul
@@ -49,11 +49,11 @@ load 400779-1.xhtml
 load 402912-1.xhtml
 load 408904-1.xul
 load 412479-1.xhtml
-load 415394-1.xhtml
+asserts(3) load 415394-1.xhtml
 load 420424-1.xul
 load 430356-1.xhtml
 load 431738.xhtml
-load 432058-1.xul
+asserts(1) load 432058-1.xul
 load 432068-1.xul
 load 432068-2.xul
 load 433296-1.xul
diff --git a/modules/libpr0n/test/crashtests/crashtests.list b/modules/libpr0n/test/crashtests/crashtests.list
index 339feef843b..1b5bc098419 100644
--- a/modules/libpr0n/test/crashtests/crashtests.list
+++ b/modules/libpr0n/test/crashtests/crashtests.list
@@ -8,5 +8,5 @@ load invalid-size.gif
 load invalid-size-second-frame.gif
 
 # Animated gifs with a very large canvas, but tiny actual content.
-load delaytest.html?523528-1.gif
+asserts(2) load delaytest.html?523528-1.gif
 load delaytest.html?523528-2.gif
diff --git a/view/crashtests/crashtests.list b/view/crashtests/crashtests.list
index c75fc4d9d1f..b8f2df063db 100644
--- a/view/crashtests/crashtests.list
+++ b/view/crashtests/crashtests.list
@@ -2,7 +2,7 @@ load 38589-1.xul
 load 64049-1.html
 load 281743-1.html
 load 323497-1.html
-load 382756-1.xul
-load 387745-1.svg
+asserts-if(MOZ_WIDGET_TOOLKIT=="gtk2",2) load 382756-1.xul
+asserts-if(MOZ_WIDGET_TOOLKIT=="gtk2",2) load 387745-1.svg
 load 429315-1.html
 load 507563-1.html