diff --git a/tools/tinderbox/build-seamonkey-util.pl b/tools/tinderbox/build-seamonkey-util.pl
index 9ad5199e510..f8bf62743b0 100644
--- a/tools/tinderbox/build-seamonkey-util.pl
+++ b/tools/tinderbox/build-seamonkey-util.pl
@@ -24,7 +24,7 @@ use Config;         # for $Config{sig_name} and $Config{sig_num}
 use File::Find ();
 use File::Copy;
 
-$::UtilsVersion = '$Revision: 1.299 $ ';
+$::UtilsVersion = '$Revision: 1.300 $ ';
 
 package TinderUtils;
 
@@ -1991,6 +1991,13 @@ sub run_all_tests {
                                             $app_args,
                                             "file://$startup_build_dir/../startup-test.html");
     }
+    if ($Settings::NeckoUnitTest and $test_result eq 'success') {
+        $test_result = FileBasedTest("Necko unit tests",
+                                     $build_dir, $binary_dir,
+                                     ["necko_unit_tests/test_all.sh"],
+                                     $Settings::NeckoUnitTestTimeout,
+                                     "FAIL", 0, 0);
+    }
     return $test_result;
 }
 
diff --git a/tools/tinderbox/tinder-defaults.pl b/tools/tinderbox/tinder-defaults.pl
index 9567f71246a..1751bf19096 100644
--- a/tools/tinderbox/tinder-defaults.pl
+++ b/tools/tinderbox/tinder-defaults.pl
@@ -67,6 +67,7 @@ $DHTMLPerformanceTest     = 0;  # Tdhtml
 $QATest                   = 0;  
 $XULWindowOpenTest        = 0;  # Txul
 $StartupPerformanceTest   = 0;  # Ts
+$NeckoUnitTest            = 1;
 @CompareLocaleDirs        = (); # Run compare-locales test on these directories
 # ("network","dom","toolkit","security/manager");
 $CompareLocalesAviary     = 0;  # Should the compare-locales commands use the
@@ -106,6 +107,7 @@ $DHTMLPerformanceTestTimeout      = 1200;  # entire test, seconds
 $QATestTimeout                    = 1200;   # entire test, seconds
 $LayoutPerformanceTestPageTimeout = 30000; # each page, ms
 $StartupPerformanceTestTimeout    = 15;    # seconds
+$NeckoUnitTestTimeout             = 30;    # seconds
 $XULWindowOpenTestTimeout	      = 150;   # seconds