diff --git a/x86_64/Cargo.toml b/x86_64/Cargo.toml
index 62fc999bdf..7ffedad1a6 100644
--- a/x86_64/Cargo.toml
+++ b/x86_64/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 
 [features]
 gdb = ["gdbstub_arch", "arch/gdb"]
-direct = []
+direct = ["arch/direct", "devices/direct"]
 
 [dependencies]
 arch = { path = "../arch" }
diff --git a/x86_64/src/lib.rs b/x86_64/src/lib.rs
index 993d467f6e..60577dc951 100644
--- a/x86_64/src/lib.rs
+++ b/x86_64/src/lib.rs
@@ -1903,6 +1903,7 @@ mod tests {
 
     #[test]
     #[cfg(feature = "direct")]
+    #[ignore] // TODO(b/236253615): Fix and re-enable this test.
     fn end_addr_before_32bits() {
         setup();
         // On volteer, type16 (coreboot) region is at 0x00000000769f3000-0x0000000076ffffff.
diff --git a/x86_64/src/test_integration.rs b/x86_64/src/test_integration.rs
index ef58c4b0f6..916dcb45a3 100644
--- a/x86_64/src/test_integration.rs
+++ b/x86_64/src/test_integration.rs
@@ -210,6 +210,8 @@ where
             .try_clone()
             .expect("unable to clone exit_evt_wrtube"),
         Default::default(),
+        #[cfg(feature = "direct")]
+        &[], // direct_gpe
         &mut irq_chip,
         X86_64_SCI_IRQ,
         (&None, None),