diff --git a/nucleus/src/panic.rs b/nucleus/src/panic.rs
index c4750d0..0dce614 100644
--- a/nucleus/src/panic.rs
+++ b/nucleus/src/panic.rs
@@ -1,6 +1,7 @@
 #[cfg(not(test))]
 #[panic_handler]
 fn panicked(info: &core::panic::PanicInfo) -> ! {
+    // @todo This may fail to print if the panic message is too long for local print buffer.
     crate::println!("{}", info);
     crate::endless_sleep()
 }
@@ -8,6 +9,8 @@ fn panicked(info: &core::panic::PanicInfo) -> ! {
 #[cfg(test)]
 #[panic_handler]
 fn panicked(info: &core::panic::PanicInfo) -> ! {
-    crate::println!("[failed]\nError: {}\n", info);
+    crate::println!("\n[failed]\n");
+    // @todo This may fail to print if the panic message is too long for local print buffer.
+    crate::println!("\nError: {}\n", info);
     crate::qemu::semihosting::exit_failure()
 }
diff --git a/nucleus/src/tests.rs b/nucleus/src/tests.rs
index 8269f0b..58fe785 100644
--- a/nucleus/src/tests.rs
+++ b/nucleus/src/tests.rs
@@ -12,8 +12,8 @@ pub fn test_runner(tests: &[&dyn Fn()]) {
     println!("Running {} tests", tests.len());
     for test in tests {
         test();
-        println!("[ok]");
+        println!("\n[ok]\n");
     }
-    println!("[success]");
+    println!("\n[success]\n");
     qemu::semihosting::exit_success();
 }