diff --git a/mozilla/client.mk b/mozilla/client.mk
index 985fe4f49f0..9971b1e72b5 100644
--- a/mozilla/client.mk
+++ b/mozilla/client.mk
@@ -198,6 +198,7 @@ MODULES_core :=                                 \
   mozilla/storage                               \
   mozilla/db/sqlite3                            \
   mozilla/db/morkreader                         \
+  mozilla/testing/crashtest                     \
   mozilla/testing/mochitest                     \
   $(NULL)
 
diff --git a/mozilla/tools/buildbot-configs/testing/unittest/master.cfg b/mozilla/tools/buildbot-configs/testing/unittest/master.cfg
index ab730ecfaf5..3f0e00a918e 100644
--- a/mozilla/tools/buildbot-configs/testing/unittest/master.cfg
+++ b/mozilla/tools/buildbot-configs/testing/unittest/master.cfg
@@ -140,9 +140,12 @@ linuxFactory.addStep(MozillaCheck,
         warnOnWarnings=True,
         timeout=60*40,
         workdir="mozilla/objdir")
-linuxFactory.addStep(MozillaReftest, warnOnWarnings=True,
+linuxFactory.addStep(MozillaUnixReftest, warnOnWarnings=True,
         workdir="mozilla/layout/reftests",
         env=MozillaEnvironments['linux'])
+linuxFactory.addStep(MozillaUnixCrashtest, warnOnWarnings=True,
+         workdir="mozilla/testing/crashtest",
+         env=MozillaEnvironments['linux'])
 linuxFactory.addStep(MozillaMochitest, warnOnWarnings=True,
         workdir="mozilla/objdir/_tests/testing/mochitest",
         env=MozillaEnvironments['linux'])
@@ -187,9 +190,12 @@ centosFactory.addStep(MozillaCheck,
         warnOnWarnings=True,
         timeout=60*40,
         workdir="mozilla/objdir")
-centosFactory.addStep(MozillaReftest, warnOnWarnings=True,
+centosFactory.addStep(MozillaUnixReftest, warnOnWarnings=True,
         workdir="mozilla/layout/reftests",
         env=MozillaEnvironments['centos'])
+centosFactory.addStep(MozillaUnixCrashtest, warnOnWarnings=True,
+        workdir="mozilla/testing/crashtest",
+        env=MozillaEnvironments['centos'])
 centosFactory.addStep(ShellCommand, warnOnWarnings=True,
         workdir="/home/buildbot/.mozilla/firefox/vrttezm8.default",
         description=["Removing places.sqlite"],
@@ -247,6 +253,9 @@ osxFactory.addStep(MozillaCheck,
 osxFactory.addStep(MozillaOSXReftest, warnOnWarnings=True,
         workdir="mozilla/layout/reftests",
         env=MozillaEnvironments['osx'])
+osxFactory.addStep(MozillaOSXCrashtest, warnOnWarnings=True,
+        workdir="mozilla/testing/crashtest",
+        env=MozillaEnvironments['osx'])
 osxFactory.addStep(ShellCommand, warnOnWarnings=True,
         workdir="/Users/buildbot/Library/Application Support/Firefox/Profiles/w6f47xh6.default",
         description=["Removing places.sqlite"],
@@ -320,6 +329,9 @@ winxpFactory.addStep(MozillaCheck, warnOnWarnings=True,
 winxpFactory.addStep(MozillaWin32Reftest, warnOnWarnings=True,
         workdir="mozilla/layout/reftests",
         env=MozillaEnvironments['vc8'])
+winxpFactory.addStep(MozillaWin32Crashtest, warnOnWarnings=True,
+        workdir="mozilla/testing/crashtest",
+        env=MozillaEnvironments['vc8'])
 winxpFactory.addStep(ShellCommand, warnOnWarnings=True,
         workdir="C:\\Documents and Settings\\buildbot\\Application Data\\Mozilla\\Firefox\\Profiles\\d5rmqan4.debug",
         description=["Removing places.sqlite"],
@@ -385,6 +397,9 @@ win2k3Factory.addStep(MozillaCheck, warnOnWarnings=True,
 win2k3Factory.addStep(MozillaWin32Reftest, warnOnWarnings=True,
         workdir="mozilla/layout/reftests",
         env=MozillaEnvironments['mozbuild'])
+win2k3Factory.addStep(MozillaWin32Crashtest, warnOnWarnings=True,
+        workdir="mozilla/testing/crashtest",
+        env=MozillaEnvironments['mozbuild'])
 win2k3Factory.addStep(ShellCommand, warnOnWarnings=True,
         workdir="C:\\Documents and Settings\\buildbot\\Application Data\\Mozilla\\Firefox\\Profiles\\pvng3zov.debug",
         description=["Removing places.sqlite"],
diff --git a/mozilla/tools/buildbot-configs/testing/unittest/mozbuild.py b/mozilla/tools/buildbot-configs/testing/unittest/mozbuild.py
index 9f1f7525e77..79c677f8c13 100644
--- a/mozilla/tools/buildbot-configs/testing/unittest/mozbuild.py
+++ b/mozilla/tools/buildbot-configs/testing/unittest/mozbuild.py
@@ -238,18 +238,11 @@ class MozillaCheck(ShellCommand):
             return WARNINGS
         return SUCCESS
     
-
 class MozillaReftest(ShellCommand):
-    name = "reftest"
     warnOnFailure = True
+    name = "reftest"
     description = ["reftest"]
     descriptionDone = ["reftest complete"]
-    command = ["../../objdir/dist/bin/run-mozilla.sh",
-               "../../objdir/dist/bin/firefox",
-               "-P",
-               "default",
-               "-reftest",
-               "reftest.list"]
    
     def createSummary(self, log):
         testCount = 0
@@ -271,8 +264,8 @@ class MozillaReftest(ShellCommand):
                 knownFailCount += 1
             else:
                 passCount += 1
-        summary = "TinderboxPrint: reftest<br/>" + str(passCount) + "/" + \
-            str(failCount) + "/" + str(knownFailCount) + "\n"
+        summary = "TinderboxPrint: " + self.name + "<br/>" + str(passCount) + \
+            "/" + str(failCount) + "/" + str(knownFailCount) + "\n"
         self.addCompleteLog('summary', summary)
     
     def evaluateCommand(self, cmd):
@@ -283,6 +276,13 @@ class MozillaReftest(ShellCommand):
             return WARNINGS
         return SUCCESS
     
+class MozillaUnixReftest(MozillaReftest):
+    command = ["../../objdir/dist/bin/run-mozilla.sh",
+               "../../objdir/dist/bin/firefox",
+               "-P",
+               "default",
+               "-reftest",
+               "reftest.list"]
 
 class MozillaOSXReftest(MozillaReftest):
     command = ["../../objdir/dist/Minefield.app/Contents/MacOS/firefox",
@@ -293,7 +293,31 @@ class MozillaOSXReftest(MozillaReftest):
                "reftest.list"]
 
 class MozillaWin32Reftest(MozillaReftest):
-    command = ['..\\..\\objdir\\dist\\bin\\firefox.exe -P debug -reftest reftest.list']
+    command = [r'..\..\objdir\dist\bin\firefox.exe -P debug -reftest reftest.list']
+
+class MozillaCrashtest(MozillaReftest):
+    name = "crashtest"
+    description = ["crashtest"]
+    descriptionDone = ["crashtest complete"]
+
+class MozillaUnixCrashtest(MozillaCrashtest):
+    command = ["../../objdir/dist/bin/run-mozilla.sh",
+               "../../objdir/dist/bin/firefox",
+               "-P",
+               "default",
+               "-reftest",
+               "crashtest.list"]
+
+class MozillaOSXCrashtest(MozillaCrashtest):
+    command = ["../../objdir/dist/Minefield.app/Contents/MacOS/firefox",
+               "-console",
+               "-P",
+               "default",
+               "-reftest",
+               "crashtest.list"]
+
+class MozillaWin32Crashtest(MozillaCrashtest):
+    command = [r'..\..\objdir\dist\bin\firefox.exe -P debug -reftest crashtest.list']
 
 class MozillaMochitest(ShellCommand):
     name = "mochitest"