diff --git a/xCAT-test/unit/genesis_openembedded_console.t b/xCAT-test/unit/genesis_openembedded_console.t
index 2de444666..9b4a7e8c9 100644
--- a/xCAT-test/unit/genesis_openembedded_console.t
+++ b/xCAT-test/unit/genesis_openembedded_console.t
@@ -31,7 +31,7 @@ is(
       ) >> 8,
     0,
     'plain console builds with strict warnings'
-) or BAIL_OUT('unable to build the console test binary');
+) or die('unable to build the console test binary');
 
 sub write_file {
     my ( $path, $contents ) = @_;
diff --git a/xCAT-test/unit/xcat_probe_package_payload.t b/xCAT-test/unit/xcat_probe_package_payload.t
index 453dc3b46..e3449223d 100644
--- a/xCAT-test/unit/xcat_probe_package_payload.t
+++ b/xCAT-test/unit/xcat_probe_package_payload.t
@@ -138,7 +138,7 @@ sub copy_tree {
     my ($source, $destination) = @_;
     my $rc = system('cp', '-R', $source, $destination);
     is($rc, 0, "copied $source into the package fixture")
-        or BAIL_OUT("unable to create package fixture from $source");
+        or die("unable to create package fixture from $source");
 }
 
 sub run_command {