diff --git a/.gitignore b/.gitignore
index 39bd96a03..950cf6ca3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 
 # Integration test output by QEMU.
 integration-test-debugcon.log
+ovmf-firmware-debugcon.log
diff --git a/xtask/src/qemu.rs b/xtask/src/qemu.rs
index 90c2081ca..b5667a17a 100644
--- a/xtask/src/qemu.rs
+++ b/xtask/src/qemu.rs
@@ -357,12 +357,6 @@ pub fn run_qemu(arch: UefiArch, opt: &QemuOpt) -> Result<()> {
 
     cmd.args(["-device", "virtio-rng-pci"]);
 
-    if arch == UefiArch::IA32 || arch == UefiArch::X86_64 {
-        cmd.args(["-debugcon", "file:./integration-test-debugcon.log"]);
-        cmd.args(["-chardev", "file,id=fw,path=./ovmf-firmware-debugcon.log"]);
-        cmd.args(["-device", "isa-debugcon,chardev=fw,iobase=0x402"]);
-    }
-
     // Set the boot menu timeout to zero. On aarch64 in particular this speeds
     // up the boot a lot. Note that we have to enable the menu here even though
     // we are skipping right past it, otherwise `splash-time` is ignored in
@@ -419,14 +413,14 @@ pub fn run_qemu(arch: UefiArch, opt: &QemuOpt) -> Result<()> {
             // Map the QEMU exit signal to port f4.
             cmd.args(["-device", "isa-debug-exit,iobase=0xf4,iosize=0x04"]);
 
-            // OVMF debug builds can output information to a serial `debugcon`.
-            // Only enable when debugging UEFI boot.
-            // cmd.args([
-            //     "-debugcon",
-            //     "file:debug.log",
-            //     "-global",
-            //     "isa-debugcon.iobase=0x402",
-            // ]);
+            // We also add a debugcon logger next to the serial one, as
+            // it sumplifies debugging in some rare cases.
+            cmd.args(["-debugcon", "file:./integration-test-debugcon.log"]);
+
+            // Debugging messages from the OVMF firmware.
+            // More info: https://github.com/tianocore/edk2/blob/62390a89c5eb477594b74b5e1911d65998a8abe2/OvmfPkg/README#L90
+            cmd.args(["-chardev", "file,id=fw,path=./ovmf-firmware-debugcon.log"]);
+            cmd.args(["-device", "isa-debugcon,chardev=fw,iobase=0x402"]);
         }
     }