diff --git a/common/kernel.c b/common/kernel.c
index d99db0b0..043842b8 100644
--- a/common/kernel.c
+++ b/common/kernel.c
@@ -51,10 +51,7 @@ static void __noreturn echo_loop(void) {
 }
 
 void kernel_main(void) {
-    printk("\nKTF - Kernel Test Framework!\n\n");
-
-    if (kernel_cmdline)
-        printk("Command line: %s\n", kernel_cmdline);
+    printk("\nKTF - Kernel Test Framework!\n");
 
     zap_boot_mappings();
     if (opt_debug) {
diff --git a/common/setup.c b/common/setup.c
index b71f1d93..022f0575 100644
--- a/common/setup.c
+++ b/common/setup.c
@@ -150,6 +150,8 @@ void __noreturn __text_init kernel_start(uint32_t multiboot_magic,
 
     /* Parse commandline parameters */
     cmdline_parse(kernel_cmdline);
+    if (!string_empty(kernel_cmdline))
+        printk("Command line: %s\n", kernel_cmdline);
 
     /* Initialize console early */
     init_console();