diff --git a/repos/base/run/log.run b/repos/base/run/log.run
index 545809a..0ff1213 100644
--- a/repos/base/run/log.run
+++ b/repos/base/run/log.run
@@ -22,10 +22,11 @@ install_config {
 
 build_boot_image "core ld.lib.so init test-log"
 
-append qemu_args "-nographic "
+# append qemu_args "-nographic "
 append xen_args  { sdl="0" }
 
-run_genode_until "Test done.*\n" 20
+run_genode_until forever
+#run_genode_until "Test done.*\n" 20
 
 grep_output {\[init -\> test-log}
 
diff --git a/tool/run/boot_dir/nova b/tool/run/boot_dir/nova
index 73f0e4d..a59a7df 100644
--- a/tool/run/boot_dir/nova
+++ b/tool/run/boot_dir/nova
@@ -3,7 +3,7 @@ proc binary_name_core_o    { } { return "core-nova.o" }
 proc binary_name_timer     { } { return "nova_timer_drv" }
 
 proc kernel_files { } { return hypervisor }
-proc kernel_output { } { return "novga serial" }
+proc kernel_output { } { return "serial spinner" }
 
 proc run_boot_string { } {
 	return "\nHypervisor reports "
@@ -129,15 +129,15 @@ proc run_boot_dir {binaries} {
 		# puts $fh "terminal_output console"
 
 		puts $fh "menuentry 'Genode on NOVA' {"
-		puts $fh " insmod multiboot2"
+		puts $fh " insmod multiboot"
 		puts $fh " insmod gzio"
-		puts $fh " multiboot2 /boot/bender $serial_bender_opt"
+		puts $fh " multiboot /boot/bender $serial_bender_opt"
 		if {[apply_microcode]} {
-			puts $fh " module2 /boot/microcode serial"
-			puts $fh " module2 /boot/micro.code micro.code"
+			puts $fh " module /boot/microcode serial"
+			puts $fh " module /boot/micro.code micro.code"
 		}
-		puts $fh " module2 /boot/hypervisor hypervisor iommu novpid [kernel_output]"
-		puts $fh " module2 /boot/image.elf.gz image.elf"
+		puts $fh " module /boot/hypervisor hypervisor iommu novpid [kernel_output]"
+		puts $fh " module /boot/image.elf.gz image.elf"
 		puts $fh "}"
 		close $fh
 	}