diff --git a/.github/workflows/nightly_toolchain.toml b/.github/workflows/nightly_toolchain.toml
index a962cf540..a96790bb0 100644
--- a/.github/workflows/nightly_toolchain.toml
+++ b/.github/workflows/nightly_toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2025-06-01"
+channel = "nightly"
 targets = ["aarch64-unknown-uefi", "i686-unknown-uefi", "x86_64-unknown-uefi"]
diff --git a/uefi-test-runner/src/proto/driver.rs b/uefi-test-runner/src/proto/driver.rs
index f6bacff21..7a6b1e75d 100644
--- a/uefi-test-runner/src/proto/driver.rs
+++ b/uefi-test-runner/src/proto/driver.rs
@@ -12,7 +12,7 @@ use uefi::proto::driver::ComponentName1;
 /// `ComponentName`.
 trait ComponentNameInterface: Sized {
     fn open(handle: Handle) -> Result<Self>;
-    fn supported_languages(&self) -> core::result::Result<LanguageIter, LanguageError>;
+    fn supported_languages(&self) -> core::result::Result<LanguageIter<'_>, LanguageError>;
     fn driver_name(&self, language: &str) -> Result<&CStr16>;
     fn controller_name(
         &self,
diff --git a/uefi/src/mem/memory_map/mod.rs b/uefi/src/mem/memory_map/mod.rs
index 8fab63344..4c0c08797 100644
--- a/uefi/src/mem/memory_map/mod.rs
+++ b/uefi/src/mem/memory_map/mod.rs
@@ -107,7 +107,7 @@ mod tests_mmap_artificial {
     use super::*;
     use core::mem::{size_of, size_of_val};
 
-    fn buffer_to_map(buffer: &mut [MemoryDescriptor]) -> MemoryMapRefMut {
+    fn buffer_to_map(buffer: &mut [MemoryDescriptor]) -> MemoryMapRefMut<'_> {
         let mmap_len = size_of_val(buffer);
         let mmap = {
             unsafe { core::slice::from_raw_parts_mut(buffer.as_mut_ptr().cast::<u8>(), mmap_len) }
diff --git a/xtask/src/cargo.rs b/xtask/src/cargo.rs
index af6e3fe80..461a399fb 100644
--- a/xtask/src/cargo.rs
+++ b/xtask/src/cargo.rs
@@ -322,6 +322,16 @@ impl Cargo {
                     rustflags.push_str(" --verbose");
                     cmd.env("RUSTFLAGS", rustflags);
                 }
+
+                // Skip the uefi-macros compilation "ui" tests on the nightly
+                // toolchain. These tests are sensitive to compiler version, and
+                // sometimes the output on nightly doesn't match the stable
+                // toolchain.
+                let toolchain = env::var("RUSTUP_TOOLCHAIN").unwrap_or_default();
+                if toolchain.starts_with("nightly-") {
+                    println!("skipping uefi-macros ui tests for toolchain {toolchain}");
+                    tool_args.extend(["--skip", "ui"]);
+                }
             }
         };
         cmd.arg(action);