diff --git a/t/AssetHelper/ChangeUrl.t b/t/AssetHelper/ChangeUrl.t
index 966080c0c..8af8186c0 100644
--- a/t/AssetHelper/ChangeUrl.t
+++ b/t/AssetHelper/ChangeUrl.t
@@ -23,6 +23,8 @@ use WebGUI::Session;
 use WebGUI::AssetHelper::ChangeUrl;
 use WebGUI::Test::Mechanize;
 
+$SIG{HUP} = sub { use Carp; confess "hup"; };
+
 #----------------------------------------------------------------------------
 # Init
 my $session         = WebGUI::Test->session;
diff --git a/t/AssetHelper/ExportHtml.t b/t/AssetHelper/ExportHtml.t
index 8025637ca..f06ebad75 100644
--- a/t/AssetHelper/ExportHtml.t
+++ b/t/AssetHelper/ExportHtml.t
@@ -83,7 +83,8 @@ $mech->submit_form_ok({
     fields  => {
     },
 });
-WebGUI::Test->waitForAllForks;
+
+ok(WebGUI::Test->waitForAllForks(10), "Forks finished");
 
 ok( -e File::Spec->catfile( $dir->dirname, 'top', 'index.html' ), 'top export exists' );
 ok( -e File::Spec->catfile( $dir->dirname, 'top', 'child', 'index.html' ), 'child export exists' );