diff --git a/src/probestack.rs b/src/probestack.rs
index 933a60dd9..70b33b8be 100644
--- a/src/probestack.rs
+++ b/src/probestack.rs
@@ -56,7 +56,7 @@ extern "C" {
 // emitted for the function.
 //
 // This is the ELF version.
-#[cfg(not(target_vendor = "apple"))]
+#[cfg(not(any(target_vendor = "apple", target_os = "uefi")))]
 macro_rules! define_rust_probestack {
     ($body: expr) => {
         concat!(
@@ -76,7 +76,7 @@ macro_rules! define_rust_probestack {
 }
 
 // Same as above, but for Mach-O.
-#[cfg(target_vendor = "apple")]
+#[cfg(any(target_vendor = "apple", target_os = "uefi"))]
 macro_rules! define_rust_probestack {
     ($body: expr) => {
         concat!(
diff --git a/testcrate/tests/count_leading_zeros.rs b/testcrate/tests/count_leading_zeros.rs
index b50a7ce84..022b2d852 100644
--- a/testcrate/tests/count_leading_zeros.rs
+++ b/testcrate/tests/count_leading_zeros.rs
@@ -1,5 +1,3 @@
-#![feature(compiler_builtins_lib)]
-
 extern crate compiler_builtins;
 
 use compiler_builtins::int::__clzsi2;
diff --git a/testcrate/tests/generated.rs b/testcrate/tests/generated.rs
index ee575cba8..a296db22d 100644
--- a/testcrate/tests/generated.rs
+++ b/testcrate/tests/generated.rs
@@ -1,4 +1,3 @@
-#![feature(compiler_builtins_lib)]
 #![feature(lang_items)]
 #![allow(bad_style)]
 #![allow(unused_imports)]