diff --git a/lib/igt_core.c b/lib/igt_core.c
index f9e92c9f..daef8c69 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -1705,15 +1705,17 @@ out:
 
 static void igt_alarm_handler(int signal)
 {
-	/* exit with timeout status */
-	igt_fail(IGT_EXIT_TIMEOUT);
+	igt_info("Timed out\n");
+
+	/* exit with failure status */
+	igt_fail(IGT_EXIT_FAILURE);
 }
 
 /**
  * igt_set_timeout:
  * @seconds: number of seconds before timeout
  *
- * Fail a test and exit with #IGT_EXIT_TIMEOUT status after the specified
+ * Fail a test and exit with #IGT_EXIT_FAILURE status after the specified
  * number of seconds have elapsed. If the current test has subtests and the
  * timeout occurs outside a subtest, subsequent subtests will be skipped and
  * marked as failed.
diff --git a/lib/tests/Makefile.sources b/lib/tests/Makefile.sources
index ecd73ae7..10e06174 100644
--- a/lib/tests/Makefile.sources
+++ b/lib/tests/Makefile.sources
@@ -21,6 +21,7 @@ TESTS = \
 
 # Test that exercise specific asserts in the test framework library and are
 # hence expected to fail.
+DISABLE_HARD_ERRORS=1
 XFAIL_TESTS = \
 	igt_no_exit \
 	igt_no_exit_list_only \