diff --git a/std/src/sys/pal/unix/mod.rs b/std/src/sys/pal/unix/mod.rs
index 6127bb98f80ef..0fbf37fda7fbf 100644
--- a/std/src/sys/pal/unix/mod.rs
+++ b/std/src/sys/pal/unix/mod.rs
@@ -169,15 +169,15 @@ pub unsafe fn init(argc: isize, argv: *const *const u8, sigpipe: u8) {
                 pub const SIG_DFL: u8 = 3;
             }
 
-            let (sigpipe_attr_specified, handler) = match sigpipe {
+            let (on_broken_pipe_used, handler) = match sigpipe {
                 sigpipe::DEFAULT => (false, Some(libc::SIG_IGN)),
                 sigpipe::INHERIT => (true, None),
                 sigpipe::SIG_IGN => (true, Some(libc::SIG_IGN)),
                 sigpipe::SIG_DFL => (true, Some(libc::SIG_DFL)),
                 _ => unreachable!(),
             };
-            if sigpipe_attr_specified {
-                ON_BROKEN_PIPE_FLAG_USED.store(true, crate::sync::atomic::Ordering::Relaxed);
+            if on_broken_pipe_used {
+                ON_BROKEN_PIPE_USED.store(true, crate::sync::atomic::Ordering::Relaxed);
             }
             if let Some(handler) = handler {
                 rtassert!(signal(libc::SIGPIPE, handler) != libc::SIG_ERR);
@@ -199,7 +199,7 @@ pub unsafe fn init(argc: isize, argv: *const *const u8, sigpipe: u8) {
     target_os = "vxworks",
     target_os = "vita",
 )))]
-static ON_BROKEN_PIPE_FLAG_USED: crate::sync::atomic::Atomic<bool> =
+static ON_BROKEN_PIPE_USED: crate::sync::atomic::Atomic<bool> =
     crate::sync::atomic::AtomicBool::new(false);
 
 #[cfg(not(any(
@@ -211,8 +211,8 @@ static ON_BROKEN_PIPE_FLAG_USED: crate::sync::atomic::Atomic<bool> =
     target_os = "vita",
     target_os = "nuttx",
 )))]
-pub(crate) fn on_broken_pipe_flag_used() -> bool {
-    ON_BROKEN_PIPE_FLAG_USED.load(crate::sync::atomic::Ordering::Relaxed)
+pub(crate) fn on_broken_pipe_used() -> bool {
+    ON_BROKEN_PIPE_USED.load(crate::sync::atomic::Ordering::Relaxed)
 }
 
 // SAFETY: must be called only once during runtime cleanup.
diff --git a/std/src/sys/process/unix/unix.rs b/std/src/sys/process/unix/unix.rs
index 62d6e0581e6c8..82ff94fb1e030 100644
--- a/std/src/sys/process/unix/unix.rs
+++ b/std/src/sys/process/unix/unix.rs
@@ -356,7 +356,7 @@ impl Command {
             // If -Zon-broken-pipe is not used, reset SIGPIPE to SIG_DFL for backward compatibility.
             //
             // -Zon-broken-pipe is an opportunity to change the default here.
-            if !crate::sys::pal::on_broken_pipe_flag_used() {
+            if !crate::sys::pal::on_broken_pipe_used() {
                 #[cfg(target_os = "android")] // see issue #88585
                 {
                     let mut action: libc::sigaction = mem::zeroed();
@@ -455,7 +455,7 @@ impl Command {
         use core::sync::atomic::{Atomic, AtomicU8, Ordering};
 
         use crate::mem::MaybeUninit;
-        use crate::sys::{self, cvt_nz, on_broken_pipe_flag_used};
+        use crate::sys::{self, cvt_nz, on_broken_pipe_used};
 
         if self.get_gid().is_some()
             || self.get_uid().is_some()
@@ -731,7 +731,7 @@ impl Command {
             // If -Zon-broken-pipe is not used, reset SIGPIPE to SIG_DFL for backward compatibility.
             //
             // -Zon-broken-pipe is an opportunity to change the default here.
-            if !on_broken_pipe_flag_used() {
+            if !on_broken_pipe_used() {
                 let mut default_set = MaybeUninit::<libc::sigset_t>::uninit();
                 cvt(sigemptyset(default_set.as_mut_ptr()))?;
                 cvt(sigaddset(default_set.as_mut_ptr(), libc::SIGPIPE))?;
diff --git a/std/tests/sync/oneshot.rs b/std/tests/sync/oneshot.rs
index 6a87c72b9cb5b..8c47f35ebfea3 100644
--- a/std/tests/sync/oneshot.rs
+++ b/std/tests/sync/oneshot.rs
@@ -127,6 +127,7 @@ fn recv_before_send() {
 }
 
 #[test]
+#[ignore = "Inherently flaky and has caused several CI failures"]
 fn recv_timeout_before_send() {
     let (sender, receiver) = oneshot::channel();
 
@@ -135,6 +136,8 @@ fn recv_timeout_before_send() {
         sender.send(99u128).unwrap();
     });
 
+    // FIXME(#152145): Under load, there's no guarantee that thread `t` has
+    // ever been scheduled and run before this timeout expires.
     match receiver.recv_timeout(Duration::from_secs(1)) {
         Ok(99) => {}
         _ => panic!("expected Ok(99)"),