diff --git a/core-dump-composer/src/main.rs b/core-dump-composer/src/main.rs
index 36194fd..2a95ad9 100644
--- a/core-dump-composer/src/main.rs
+++ b/core-dump-composer/src/main.rs
@@ -36,8 +36,8 @@ fn main() -> Result<(), anyhow::Error> {
     match result {
         Ok(inner_result) => inner_result,
         Err(_error) => {
-            println!("timeout");
-            process::exit(1);
+            error!("Timeout error during coredump processing.");
+            process::exit(32);
         }
     }
 }
diff --git a/core-dump-composer/tests/timeout.rs b/core-dump-composer/tests/timeout.rs
index 4d2d8f3..a4b27e1 100644
--- a/core-dump-composer/tests/timeout.rs
+++ b/core-dump-composer/tests/timeout.rs
@@ -65,8 +65,7 @@ fn timeout_scenario() -> Result<(), std::io::Error> {
         .output()
         .expect("Couldn't execute");
 
-    println!("{}", String::from_utf8_lossy(&cdc.stdout));
-    assert_eq!("timeout\n", String::from_utf8_lossy(&cdc.stdout));
-    assert_eq!(1, *&cdc.status.code().unwrap());
+    // FIXME: It would be nice to check the log output here.
+    assert_eq!(32, *&cdc.status.code().unwrap());
     Ok(())
 }