diff --git a/ps/global.c b/ps/global.c
index 5bddb8c8..11f058e5 100644
--- a/ps/global.c
+++ b/ps/global.c
@@ -515,5 +515,5 @@ catastrophic_failure(const char *filename,
 		     const char *message)
 {
   error_at_line(0, 0, filename, linenum, message);
-  abort();
+  exit(EXIT_FAILURE);
 }
diff --git a/testsuite/config/unix.exp b/testsuite/config/unix.exp
index 5331b0df..6b95655f 100644
--- a/testsuite/config/unix.exp
+++ b/testsuite/config/unix.exp
@@ -40,6 +40,7 @@ proc expect_pass { testname reg } {
     expect {
         -re "$reg" { pass "$testname" }
         default { fail "$testname" }
+		timeout { fail "$testname" }
     }
 }